diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-22 00:06:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-04-22 00:06:19 -0300 |
| commit | 45a1b262edf175ecf5dd43e51c8ee72f9d78265b (patch) | |
| tree | c96780037991d6d44cefc8a149e9b88c6bfc6d67 /core | |
| parent | c034be9e8f973eb6c1dbb77fb4528fad379ddbfd (diff) | |
| parent | 69e1fada8bdc9588d0a3d8bc3403fa809d809a84 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/quvi/PKGBUILD
community/tasks/PKGBUILD
community/xwax/PKGBUILD
core/udev/PKGBUILD
extra/libplist/PKGBUILD
extra/mirage/PKGBUILD
extra/rdesktop/PKGBUILD
staging/gpsd/PKGBUILD
testing/pygobject/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/pacman/PKGBUILD | 8 | ||||
| -rw-r--r-- | core/pacman/pacman.conf.x86_64 | 6 | ||||
| -rw-r--r-- | core/udev/PKGBUILD | 18 |
3 files changed, 18 insertions, 14 deletions
diff --git a/core/pacman/PKGBUILD b/core/pacman/PKGBUILD index 4343ce5ac..4bf78b019 100644 --- a/core/pacman/PKGBUILD +++ b/core/pacman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 116411 2011-03-23 16:23:20Z dan $ +# $Id: PKGBUILD 120035 2011-04-18 16:49:22Z dan $ # Maintainer: Dan McGee <dan@archlinux.org> pkgname=pacman -pkgver=3.5.1 +pkgver=3.5.2 pkgrel=1 pkgdesc="A library-based package manager with dependency support" arch=('i686' 'x86_64' 'mips64el') @@ -19,9 +19,9 @@ source=(ftp://ftp.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz pacman.conf pacman.conf.x86_64 makepkg.conf) -md5sums=('6e609a6cf0af2a49a0f8b35fc2459131' +md5sums=('b4f1fdbc17100923071ebe8fe9377be5' 'e99eb721b6b704f68c5f47468507c102' - '28e6a1f97ed3c47a3961ad00d2a43822' + 'f8b939d9b2beb79a0436961a2d707d7c' 'a8684989d3dfad5a6e1bcf95af3e571b') # keep an upgrade path for older installations diff --git a/core/pacman/pacman.conf.x86_64 b/core/pacman/pacman.conf.x86_64 index a5bb2db61..6f0423647 100644 --- a/core/pacman/pacman.conf.x86_64 +++ b/core/pacman/pacman.conf.x86_64 @@ -74,7 +74,11 @@ Include = /etc/pacman.d/mirrorlist Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, -# enable the multilib repository here. +# enable the multilib repositories as required here. + +#[multilib-testing] +#Include = /etc/pacman.d/mirrorlist + #[multilib] #Include = /etc/pacman.d/mirrorlist diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 9494fe18c..d5b3c6560 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 118043 2011-04-05 07:31:37Z jgc $ +# $Id: PKGBUILD 118985 2011-04-09 21:29:33Z tpowa $ # Maintainer: Aaron Griffin <aaron@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Bächler <thomas@archlinux.org> pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=166 -pkgrel=2 -arch=(i686 x86_64 'mips64el') +pkgver=167 +pkgrel=1 +arch=(i686 x86_64 mips64el) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') groups=('base') @@ -19,11 +19,6 @@ source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.ta 81-arch.rules load-modules.sh cdsymlinks.sh) -md5sums=('4db27d73fdbe94f47fd89fdd105c2dfb' - '4427855146513a4703ab5c7eb8a0156e' - 'f17c99779173ddc79f866cf3a5de5e68' - 'f91fddc67609b45b244a624977c4247b' - '2e808ee78d237c478b57af2a68d43769') build() { cd $srcdir/$pkgbase-$pkgver @@ -110,3 +105,8 @@ package_udev-compat() { install -d -m755 ${pkgdir}/lib/${pkgbase}/rules.d install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules ${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules } +md5sums=('4b37e1222f06c14c24147de346aa0bad' + '4427855146513a4703ab5c7eb8a0156e' + 'f17c99779173ddc79f866cf3a5de5e68' + 'f91fddc67609b45b244a624977c4247b' + '2e808ee78d237c478b57af2a68d43769') |