diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-02 18:49:04 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-02 18:49:04 -0300 |
commit | 48b4fc34e4c4877ffd359d3108042b64e0b81f5d (patch) | |
tree | ee0e75ac215c59576b2eccdd29afbf844de74f96 /libre | |
parent | c260e0851bb73d38cf385ed615e8a82da0e57b4f (diff) | |
parent | e255c7718242a8443fae4501c8ebcc86617811d0 (diff) |
Merge branch 'master' of gparabola:abslibre-mips64el
Conflicts:
extra/gstreamer/PKGBUILD
Diffstat (limited to 'libre')
-rw-r--r-- | libre/linux-libre-kmod-alx/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts-kmod-alx/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre-lts/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/linux-libre-lts/linux-libre-lts.install | 2 | ||||
-rw-r--r-- | libre/linux-libre/PKGBUILD | 4 | ||||
-rw-r--r-- | libre/linux-libre/linux-libre.install | 2 | ||||
-rw-r--r-- | libre/parabola-keyring/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/texlive-bin-libre/PKGBUILD | 4 |
8 files changed, 17 insertions, 17 deletions
diff --git a/libre/linux-libre-kmod-alx/PKGBUILD b/libre/linux-libre-kmod-alx/PKGBUILD index 64b57eed5..294c5afbf 100644 --- a/libre/linux-libre-kmod-alx/PKGBUILD +++ b/libre/linux-libre-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.6.4 +_kernver=3.6.5 _kernrel=1 pkgname=('linux-libre-kmod-alx') _pkgver=2012-10-03 pkgver=20121003 -pkgrel=3 +pkgrel=4 pkgdesc='Atheros alx ethernet device driver for linux-libre kernel' arch=('i686' 'x86_64') url='http://linuxwireless.org/' diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD index 24a7919e1..ffda9f21f 100644 --- a/libre/linux-libre-lts-kmod-alx/PKGBUILD +++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD @@ -1,11 +1,11 @@ # Maintainer: André Silva <emulatorman@lavabit.com> -_kernver=3.0.49 +_kernver=3.0.50 _kernrel=1 pkgname=('linux-libre-lts-kmod-alx') _pkgver=2012-10-03 pkgver=20121003 -pkgrel=4 +pkgrel=5 pkgdesc='Atheros alx ethernet device driver for linux-libre-lts kernel' arch=('i686' 'x86_64') url='http://linuxwireless.org/' diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD index 1a0d031c1..1bcdb57fd 100644 --- a/libre/linux-libre-lts/PKGBUILD +++ b/libre/linux-libre-lts/PKGBUILD @@ -7,10 +7,10 @@ pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.0 -_sublevel=49 +_sublevel=50 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.48 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.49 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.0.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('5f64180fe7df4e574dac5911b78f5067' - '29c9749f200e1679f52118b239fa4491' + '8c0723e49160ecd399205f9bbb8ee076' 'aed25ab047e1c0b020a1516c235c6a74' '7d37e8ce0f4bd5a957172b12ae742ea0' 'c072b17032e80debc6a8626299245d46' @@ -44,7 +44,7 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067' 'f36222e7ce20c8e4dc27376f9be60f6c' '670931649c60fcb3ef2e0119ed532bd4' '8a71abc4224f575008f974a099b5cf6f' - 'e584ba40e137198ed196e58772838262') + 'fba8d3ccd4a7e5b1132c9e20f60df1df') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install index e718a1f5f..c961f9a99 100644 --- a/libre/linux-libre-lts/linux-libre-lts.install +++ b/libre/linux-libre-lts/linux-libre-lts.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-lts -KERNEL_VERSION=3.0.49-1-LIBRE-LTS +KERNEL_VERSION=3.0.50-1-LIBRE-LTS # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index d8b3ca460..e2f77ab4c 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -10,7 +10,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.6 -_sublevel=4 +_sublevel=5 pkgver=${_basekernel}.${_sublevel} pkgrel=1 _lxopkgver=${_basekernel}.4 # nearly always the same as pkgver @@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'module-init-wait-3.6.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('a2312edd0265b5b07bd4b50afae2b380' - '71451d3fdb67db17581393a061bf9516' + 'a126c193c6fbb3acff00c426493897df' 'e4a3a4677e1fac6ecf0e0fb44c41ca08' '68fc36a4efb6ade0eca409b9444fef0c' 'e49ac236dfeef709f91a3d993ea7b62c' diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install index 681b322af..30b5abc90 100644 --- a/libre/linux-libre/linux-libre.install +++ b/libre/linux-libre/linux-libre.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.6.4-1-LIBRE +KERNEL_VERSION=3.6.5-1-LIBRE # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index fb048355c..5a8b77e33 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: André Silva <emulatorman@lavabit.com> pkgname=parabola-keyring -pkgver=20121024 +pkgver=20121101 pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') @@ -16,5 +16,5 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('7aebac7b4735117617f718058e0602f5' - '3b0183f30e786ea7197427199f9fa4f6') +md5sums=('c663f7bfc154423b96e00683d1ea4e4e' + 'f7362e866e14da48c6900debb9e283f5') diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD index 1f68715c6..326b8d20b 100644 --- a/libre/texlive-bin-libre/PKGBUILD +++ b/libre/texlive-bin-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 165207 2012-08-13 08:28:02Z remy $ +# $Id: PKGBUILD 169309 2012-10-19 08:03:07Z eric $ # Maintainer: Rémy Oudompheng <remy@archlinux.org> # Contributor: francois <francois.archlinux.org> # Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu> @@ -6,7 +6,7 @@ pkgname=texlive-bin-libre pkgver=2012.0 -pkgrel=4 +pkgrel=5 pkgdesc="TeX Live binaries" license=('GPL') arch=('i686' 'x86_64' 'mips64el') |