diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-02 18:53:10 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-02 18:53:10 +0100 |
commit | 588ef662386ce30b28688e95f11f7fc7a52f8e25 (patch) | |
tree | a62b104d7b70d82767fbde6aeb782b1359302459 /extra/system-config-printer | |
parent | 9ea487ed90ebf891571ea8fffd34c154cbf981df (diff) | |
parent | b479098a1b8d7cb545339cb225a7cde4988b2748 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/kdesvn/PKGBUILD
community/lwm/PKGBUILD
community/sakura/PKGBUILD
extra/openmpi/PKGBUILD
extra/qt/PKGBUILD
Diffstat (limited to 'extra/system-config-printer')
-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 3573da9ec..cfc17bbf9 100644 --- a/extra/system-config-printer/PKGBUILD +++ b/extra/system-config-printer/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 151381 2012-02-25 21:27:16Z andrea $ +# $Id: PKGBUILD 151614 2012-02-28 09:40:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=system-config-printer pkgname=('system-config-printer-common' 'system-config-printer-gnome') pkgver=1.3.8 -pkgrel=2 +pkgrel=3 pkgdesc="A CUPS printer configuration tool and status applet" url="http://cyberelk.net/tim/software/system-config-printer/" arch=('i686' 'x86_64' 'mips64el') @@ -33,7 +33,7 @@ build() { package_system-config-printer-common() { pkgdesc='Pygtk CUPS Configuration' - depends=('udev' 'pycups' 'dbus-python' 'pysmbc') + depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl') 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') @@ -78,7 +78,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' 'python-pycurl') + depends=('system-config-printer-common' 'gnome-icon-theme' 'python-notify') optdependence=('gnome-keyring: password management') cd "${srcdir}"/${pkgbase}-${pkgver} |