Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre

4 files changed, 11 insertions, 24 deletions

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index a3e757401..a62382800 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -17,10 +17,10 @@
 # * Disabled ContentHandlers and other Google/Yahoo! related services
 
 pkgname=icecat
-pkgver=3.6.13
+pkgver=3.6.14
 _pkgver=3.6
-pkgrel=2
-_xulver=1.9.2.13
+pkgrel=1
+_xulver=1.9.2.14
 pkgdesc="GNU version of the Firefox browser. SafeBrowsing and other Google services disabled!"
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/gnuzilla/"
@@ -105,16 +105,8 @@ package() {
 
   msg2 "And provide better ones..."
   install -m644 ${srcdir}/*.xml ${pkgdir}${ICECATDIR}/searchplugins/
-
-  msg2 "Installing the privacy extension"
-  install -d ${pkgdir}${ICECATDIR}/extensions/privacy_features\@gnuzilla.gnu.org
-
-  cd ${pkgdir}${ICECATDIR}/extensions/privacy_features\@gnuzilla.gnu.org
-  unzip ../privacy_ext.xpi
-
-  rm -f ../privacy_ext.xpi
 }
-md5sums=('1c268e5f803a3989552158932940468c'
+md5sums=('367ae51a84b290fff548721bf83bb8b4'
          'df304f6eb858922a0703bac7903aecc8'
          'e81ad01dbc16ba28bf92ba4b7c309ca7'
          'd93fe402b87cd000a869e1fd6badc6c9'
diff --git a/libre/kernel26-libre/PKGBUILD b/libre/kernel26-libre/PKGBUILD
index af73d75e9..eb727bbae 100644
--- a/libre/kernel26-libre/PKGBUILD
+++ b/libre/kernel26-libre/PKGBUILD
@@ -6,7 +6,7 @@ pkgbase="kernel26-libre"
 pkgname=('kernel26-libre' 'kernel26-libre-headers' 'kernel26-libre-docs') # Build stock -LIBRE kernel
 _kernelname=${pkgname#kernel26-libre}
 _basekernel=2.6.37
-pkgver=${_basekernel}.1
+pkgver=${_basekernel}.2
 pkgrel=1
 makedepends=('xmlto' 'docbook-xsl')
 _patchname="patch-${pkgver}-${pkgrel}-LIBRE"
@@ -41,7 +41,6 @@ build() {
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
   fi
-
   # get kernel version  
   make prepare
   # load configuration
@@ -111,10 +110,6 @@ package_kernel26-libre() {
   rm -rf ${pkgdir}/lib/firmware
   # gzip -9 all modules to safe 100MB of space
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
-
-# this should trick external modules to find -ARCH while uname remains -LIBRE
-  msg "Linking -LIBRE local version to -ARCH..."
-  ln -s /lib/modules/${_kernver} ${pkgdir}/lib/modules/${_kernver%-LIBRE}-ARCH
 }
 
 package_kernel26-libre-headers() {
@@ -247,9 +242,9 @@ find $pkgdir -type d -exec chmod 755 {} \;
 # remove a file already in kernel26 package
 rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
 }
-md5sums=('e88329f0b1a8c8527b5cab36530b2d57'
-         'e5b28b5bed7ef1a898d528cf0d75220d'
-         '5266c8554fe93d3dbfb1699f0d86f129'
-         'bdc02636e0acc27b942898a4fc66163f'
+md5sums=('3678f16c9a4c1797bd661775934105d3'
+         'b9f58bf92c2fcc844eaa52d2470219e8'
+         '02bbb64c1c48d9ec1fc80b60cdf19b4d'
+         'ab6eec9bbf7e530620461c558a3b312c'
          '25584700a0a679542929c4bed31433b6'
          '1bff12f1ba69206b1abee2bba4b7619c')
diff --git a/libre/kernel26-libre/config.i686 b/libre/kernel26-libre/config.i686
index 50ad703a0..e56d00e3e 100644
--- a/libre/kernel26-libre/config.i686
+++ b/libre/kernel26-libre/config.i686
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/i386 2.6.37 Kernel Configuration
-# Fri Feb 18 16:45:06 2011
+# Fri Feb 25 08:50:19 2011
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
diff --git a/libre/kernel26-libre/config.x86_64 b/libre/kernel26-libre/config.x86_64
index a4c1457b1..98e71b66b 100644
--- a/libre/kernel26-libre/config.x86_64
+++ b/libre/kernel26-libre/config.x86_64
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/x86_64 2.6.37 Kernel Configuration
-# Fri Feb 18 18:18:04 2011
+# Fri Feb 25 07:39:32 2011
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set