diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-27 12:52:56 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-11-27 12:52:56 -0300 |
| commit | 78e579460b6f67a777a72232903eb7eaf84c945f (patch) | |
| tree | 13403c8933fd3ea439b3d5734a5a3d0d7b04e386 /core | |
| parent | 45109aea7693acc9077824a431e17110d21ed6b3 (diff) | |
| parent | c008601effc878e60852f7928ddadcf5a16eb851 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/spacefm/PKGBUILD
extra/eina/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
Diffstat (limited to 'core')
| -rw-r--r-- | core/btrfs-progs/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/btrfs-progs/initcpio-install-btrfs | 1 | ||||
| -rw-r--r-- | core/cronie/PKGBUILD | 6 | ||||
| -rw-r--r-- | core/curl/PKGBUILD | 8 | ||||
| -rw-r--r-- | core/glib2/PKGBUILD | 6 |
5 files changed, 14 insertions, 13 deletions
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD index 8dc1ad4fe..d67238d11 100644 --- a/core/btrfs-progs/PKGBUILD +++ b/core/btrfs-progs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 169609 2012-10-24 12:46:01Z tomegun $ +# $Id: PKGBUILD 172000 2012-11-26 02:40:48Z dreisner $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Tobias Powalowski <tpowa@archlinux.org> pkgname=btrfs-progs pkgver=0.19.20121005 -pkgrel=2 +pkgrel=4 pkgdesc="btrfs filesystem utilities" arch=(i686 x86_64 mips64el) depends=('glibc' 'e2fsprogs') @@ -18,7 +18,7 @@ source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz initcpio-hook-btrfs) install=btrfs-progs.install md5sums=('7fb014324954ee073b039dc0066de960' - 'd7ad825b0b25f2be73289a20e7afcdb7' + '7241ba3a4286d08da0d50b7176941112' 'b09688a915a0ec8f40e2f5aacbabc9ad') build() { diff --git a/core/btrfs-progs/initcpio-install-btrfs b/core/btrfs-progs/initcpio-install-btrfs index aa06e55ac..f7b0285b3 100644 --- a/core/btrfs-progs/initcpio-install-btrfs +++ b/core/btrfs-progs/initcpio-install-btrfs @@ -3,6 +3,7 @@ build() { add_module btrfs add_binary btrfs + add_binary btrfsck add_runscript } diff --git a/core/cronie/PKGBUILD b/core/cronie/PKGBUILD index eb0250f18..ebac97c6d 100644 --- a/core/cronie/PKGBUILD +++ b/core/cronie/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname='cronie' -pkgver=1.4.8 -pkgrel=4 +pkgver=1.4.9 +pkgrel=1 pkgdesc='Daemon that runs specified programs at scheduled times and related tools' url='https://fedorahosted.org/cronie/' license=('custom:BSD') @@ -17,7 +17,7 @@ source=("https://fedorahosted.org/releases/c/r/${pkgname}/${pkgname}-${pkgver}.t 'service' 'pam.d' 'rc.d') -sha1sums=('1d2ce3a6ca2a6f96ff31921e4060be3199dc10f3' +sha1sums=('40405cb30b62bd60323e4daf5198f26f0e65c4c4' '0f279b8fb820340267d578dc85511c980715f91e' '3038a05476829f72fc4918bee9176b273ce10340' '5eff7fb31f6bc0a924243ff046704726cf20c221' diff --git a/core/curl/PKGBUILD b/core/curl/PKGBUILD index 1ff818a9e..8c391b2b8 100644 --- a/core/curl/PKGBUILD +++ b/core/curl/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 168697 2012-10-14 14:55:36Z dreisner $ +# $Id: PKGBUILD 171938 2012-11-24 17:37:34Z dreisner $ # Maintainer: Dave Reisner <dreisner@archlinux.org> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Eric Belanger <eric@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=curl -pkgver=7.28.0 +pkgver=7.28.1 pkgrel=1 pkgdesc="An URL retrieval utility and library" arch=('i686' 'x86_64' 'mips64el') @@ -16,8 +16,8 @@ depends=('ca-certificates' 'libssh2' 'openssl' 'zlib') options=('!libtool') source=("http://curl.haxx.se/download/$pkgname-$pkgver.tar.gz"{,.asc} curlbuild.h) -md5sums=('cbdc0a79bdf6e657dd387c3d88d802e3' - '7359e07276cdaff6317bbc39e6d5899c' +md5sums=('252ef351c0fc307b2d8ea1ee31542072' + 'e3cea743ef286f5aff1f1d27137e9828' '751bd433ede935c8fae727377625a8ae') ptrsize=$(cpp <<<'__SIZEOF_POINTER__' | sed '/^#/d') diff --git a/core/glib2/PKGBUILD b/core/glib2/PKGBUILD index ec1d6b68b..d3ed8a1ae 100644 --- a/core/glib2/PKGBUILD +++ b/core/glib2/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 170938 2012-11-13 17:02:45Z heftig $ +# $Id: PKGBUILD 172032 2012-11-26 16:57:06Z jgc $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=glib2 pkgver=2.34.2 -pkgrel=1 +pkgrel=2 pkgdesc="Common C routines used by GTK+ and other libs" url="http://www.gtk.org/" arch=(i686 x86_64 'mips64el') license=('LGPL') depends=('pcre' 'libffi') -makedepends=('pkg-config' 'python2') +makedepends=('pkg-config' 'python2' 'libxslt' 'docbook-xml') optdepends=('python2: for gdbus-codegen') options=('!libtool' '!docs' '!emptydirs') source=(http://ftp.gnome.org/pub/GNOME/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz |