diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-18 10:38:15 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-18 10:38:15 -0300 |
commit | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (patch) | |
tree | 452fb18314fb6d4393552d1ef1190a3168353f44 /extra/system-config-printer/PKGBUILD | |
parent | bb3524a1ba0370174d0c586ae94cd503b562a207 (diff) | |
parent | 9e3985ed7c9851da65023a0ab3d0739cce1858e2 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/gambas2/PKGBUILD
community-staging/gambas3/PKGBUILD
community-staging/libextractor/PKGBUILD
community-staging/pdf2djvu/PKGBUILD
community/dante/PKGBUILD
community/gnunet/PKGBUILD
community/luafilesystem/PKGBUILD
community/luajit/PKGBUILD
community/python-mpi4py/PKGBUILD
community/python-psutil/PKGBUILD
extra/gnome-python-desktop/PKGBUILD
extra/pycrypto/PKGBUILD
extra/pygobject/PKGBUILD
extra/pygobject2/PKGBUILD
extra/pyopenssl/PKGBUILD
extra/python/PKGBUILD
extra/vde2/PKGBUILD
gnome-unstable/clutter-gtk/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/gcr/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-keyring/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
staging/kdebase-workspace/PKGBUILD
testing/iputils/PKGBUILD
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php-fpm.service
testing/php/rc.d.php-fpm
Diffstat (limited to 'extra/system-config-printer/PKGBUILD')
-rw-r--r-- | extra/system-config-printer/PKGBUILD | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD index 202e1e42c..0c5bfaece 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 167929 2012-10-03 20:43:11Z andrea $ +# $Id: PKGBUILD 169045 2012-10-17 10:21:29Z allan $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') pkgver=1.3.11 -pkgrel=1 +pkgrel=2 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') @@ -37,7 +37,7 @@ build() { package_system-config-printer-common() { pkgdesc='Pygtk CUPS Configuration' - depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python2-pycurl' 'libusb-compat') + depends=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat') optdepends=('system-config-printer-gnome: for the GTK frontend' 'kdeadmin-system-config-printer-kde: for the administration tool in KDE System Settings') replaces=('system-config-printer') @@ -82,7 +82,7 @@ package_system-config-printer-common() { package_system-config-printer-gnome() { pkgdesc='A CUPS printer configuration tool and status applet - GTK frontend' - depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify') + depends=('system-config-printer-common' 'gnome-icon-theme' 'python2-notify') optdependence=('gnome-keyring: password management') cd "${srcdir}"/${pkgbase}-${pkgver} |