summaryrefslogtreecommitdiff
path: root/core/util-linux
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-31 10:59:28 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-31 10:59:28 -0300
commit36f1b1bb12934e4fd9012c0ee5d4e3c885a2d433 (patch)
tree397141926cac78871a3e9d53cd8fb824bc1b9cd3 /core/util-linux
parent0858e3f6c7deaae69a94818c0d317a767aa3d481 (diff)
parent5827948456201df72a1bd73e87977c569129fb27 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/percona-server/PKGBUILD community/xmlrpc-c/PKGBUILD core/util-linux/PKGBUILD extra/colord/PKGBUILD extra/epiphany/PKGBUILD extra/evolution-data-server/PKGBUILD extra/evolution/PKGBUILD extra/gcr/PKGBUILD extra/gdm/PKGBUILD extra/gnome-color-manager/PKGBUILD extra/gnome-control-center/PKGBUILD extra/gnome-dictionary/PKGBUILD extra/gnome-font-viewer/PKGBUILD extra/gnome-screenshot/PKGBUILD extra/gnome-search-tool/PKGBUILD extra/gnome-system-log/PKGBUILD extra/gobject-introspection/PKGBUILD extra/grilo/PKGBUILD extra/gtkmm3/PKGBUILD extra/gvfs/PKGBUILD extra/json-glib/PKGBUILD extra/libgnome-keyring/PKGBUILD extra/nautilus-open-terminal/PKGBUILD extra/pidgin/PKGBUILD extra/pygobject/PKGBUILD extra/rest/PKGBUILD extra/rhythmbox/PKGBUILD extra/seahorse/PKGBUILD extra/totem/PKGBUILD extra/xorg-xinit/PKGBUILD extra/yelp/PKGBUILD
Diffstat (limited to 'core/util-linux')
-rw-r--r--core/util-linux/PKGBUILD7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index 2f7df668f..890fbef6b 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,15 +1,16 @@
-# $Id: PKGBUILD 168750 2012-10-15 14:14:40Z tomegun $
+# $Id: PKGBUILD 169791 2012-10-29 11:02:48Z tomegun $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Contributor: judd <jvinet@zeroflux.org>
pkgname=util-linux
pkgver=2.22.1
-pkgrel=1
+pkgrel=2
pkgdesc="Miscellaneous system utilities for Linux"
url="http://www.kernel.org/pub/linux/utils/util-linux/"
arch=('i686' 'x86_64' 'mips64el')
groups=('base')
-depends=('pam' 'shadow')
+depends=('pam' 'shadow' 'coreutils' 'glibc')
+# makedepends=('bc') # for check() only, change this to checkdepends for pacman 4.1
makedepends=('bc' 'git') # for check() only, change this to checkdepends for pacman 4.1
conflicts=('util-linux-ng' 'eject')
provides=("util-linux-ng=${pkgver}" 'eject')