summaryrefslogtreecommitdiff
path: root/extra/system-config-printer
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-04 12:27:54 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-10-04 12:27:54 -0300
commit39b243b89b29a461bba953d0130b32513477efdd (patch)
tree66e5d5eb3abbd71786bd14bba2a20a9bc5228d73 /extra/system-config-printer
parent399a563eb2c30475d66ced8203aff23d65e540e8 (diff)
parentc3ff6b4da8966c22dcbf0f5d8a957b875242789f (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community-staging/hedgewars/PKGBUILD community-testing/alex/PKGBUILD community-testing/gtk2hs-buildtools/PKGBUILD community-testing/haddock/PKGBUILD community-testing/happy/PKGBUILD community-testing/haskell-bytestring-show/PKGBUILD community-testing/haskell-cairo/PKGBUILD community-testing/haskell-dataenc/PKGBUILD community-testing/haskell-ghc-paths/PKGBUILD community-testing/haskell-glib/PKGBUILD community-testing/haskell-gtk/PKGBUILD community-testing/haskell-haskeline/PKGBUILD community-testing/haskell-hslogger/PKGBUILD community-testing/haskell-html/PKGBUILD community-testing/haskell-pango/PKGBUILD community-testing/haskell-quickcheck/PKGBUILD community-testing/haskell-regex-base/PKGBUILD community-testing/haskell-regex-compat/PKGBUILD community-testing/haskell-regex-posix/PKGBUILD community-testing/haskell-stm/PKGBUILD community-testing/haskell-syb/PKGBUILD community-testing/haskell-tar/PKGBUILD community-testing/haskell-terminfo/PKGBUILD community-testing/haskell-utf8-string/PKGBUILD community-testing/haskell-x11-xft/PKGBUILD community-testing/haskell-x11/PKGBUILD community-testing/haskell-xhtml/PKGBUILD community-testing/hedgewars/PKGBUILD community-testing/xmobar/PKGBUILD community-testing/xmonad-contrib/PKGBUILD community-testing/xmonad/PKGBUILD community/osdbattery/PKGBUILD community/packeth/PKGBUILD extra/kdenetwork/PKGBUILD gnome-unstable/eog/PKGBUILD gnome-unstable/gnome-keyring/PKGBUILD gnome-unstable/libgweather/PKGBUILD gnome-unstable/libpeas/PKGBUILD gnome-unstable/mutter/PKGBUILD staging/kdebindings-python/PKGBUILD staging/mesa/PKGBUILD testing/btrfs-progs/PKGBUILD testing/btrfs-progs/initcpio-install-btrfs testing/ghc/PKGBUILD testing/ghc/build.mk testing/haskell-http/PKGBUILD testing/haskell-mtl/PKGBUILD testing/haskell-network/PKGBUILD testing/haskell-parsec/PKGBUILD testing/haskell-random/PKGBUILD testing/haskell-text/PKGBUILD testing/haskell-transformers/PKGBUILD testing/haskell-zlib/PKGBUILD testing/kactivities/PKGBUILD testing/kdeaccessibility-jovie/PKGBUILD testing/kdeaccessibility-kaccessible/PKGBUILD testing/kdeaccessibility-kmag/PKGBUILD testing/kdeaccessibility-kmousetool/PKGBUILD testing/kdeaccessibility-kmouth/PKGBUILD testing/kdeadmin/PKGBUILD testing/kdeartwork/PKGBUILD testing/kdebase-konsole/PKGBUILD testing/kdebase-workspace/PKGBUILD testing/kdebase/PKGBUILD testing/kdebindings-kimono/PKGBUILD testing/kdebindings-korundum/PKGBUILD testing/kdebindings-kross/PKGBUILD testing/kdebindings-perlkde/PKGBUILD testing/kdebindings-perlqt/PKGBUILD testing/kdebindings-python/PKGBUILD testing/kdebindings-qtruby/PKGBUILD testing/kdebindings-qyoto/PKGBUILD testing/kdebindings-smokegen/PKGBUILD testing/kdebindings-smokekde/PKGBUILD testing/kdebindings-smokeqt/PKGBUILD testing/kdeedu-analitza/PKGBUILD testing/kdeedu-blinken/PKGBUILD testing/kdeedu-cantor/PKGBUILD testing/kdeedu-kalgebra/PKGBUILD testing/kdeedu-kalzium/PKGBUILD testing/kdeedu-kanagram/PKGBUILD testing/kdeedu-kbruch/PKGBUILD testing/kdeedu-kgeography/PKGBUILD testing/kdeedu-khangman/PKGBUILD testing/kdeedu-kig/PKGBUILD testing/kdeedu-kiten/PKGBUILD testing/kdeedu-klettres/PKGBUILD testing/kdeedu-kmplot/PKGBUILD testing/kdeedu-kstars/PKGBUILD testing/kdeedu-ktouch/PKGBUILD testing/kdeedu-kturtle/PKGBUILD testing/kdeedu-kwordquiz/PKGBUILD testing/kdeedu-marble/PKGBUILD testing/kdeedu-pairs/PKGBUILD testing/kdeedu-parley/PKGBUILD testing/kdeedu-rocs/PKGBUILD testing/kdeedu-step/PKGBUILD testing/kdegames/PKGBUILD testing/kdegraphics-gwenview/PKGBUILD testing/kdegraphics-kamera/PKGBUILD testing/kdegraphics-kcolorchooser/PKGBUILD testing/kdegraphics-kgamma/PKGBUILD testing/kdegraphics-kolourpaint/PKGBUILD testing/kdegraphics-kruler/PKGBUILD testing/kdegraphics-ksaneplugin/PKGBUILD testing/kdegraphics-ksnapshot/PKGBUILD testing/kdegraphics-mobipocket/PKGBUILD testing/kdegraphics-okular/PKGBUILD testing/kdegraphics-strigi-analyzer/PKGBUILD testing/kdegraphics-svgpart/PKGBUILD testing/kdegraphics-thumbnailers/PKGBUILD testing/kdemultimedia-audiocd-kio/PKGBUILD testing/kdemultimedia-dragonplayer/PKGBUILD testing/kdemultimedia-ffmpegthumbs/PKGBUILD testing/kdemultimedia-juk/PKGBUILD testing/kdemultimedia-kmix/PKGBUILD testing/kdemultimedia-kscd/PKGBUILD testing/kdemultimedia-mplayerthumbs/PKGBUILD testing/kdenetwork/PKGBUILD testing/kdepim-runtime/PKGBUILD testing/kdepim/PKGBUILD testing/kdepimlibs/PKGBUILD testing/kdeplasma-addons/PKGBUILD testing/kdesdk-kate/PKGBUILD testing/kdesdk/PKGBUILD testing/kdetoys/PKGBUILD testing/kdeutils-filelight/PKGBUILD testing/kdeutils-kcalc/PKGBUILD testing/kdeutils-kcharselect/PKGBUILD testing/kdeutils-kdf/PKGBUILD testing/kdeutils-kfloppy/PKGBUILD testing/kdeutils-kgpg/PKGBUILD testing/kdeutils-kremotecontrol/PKGBUILD testing/kdeutils-ktimer/PKGBUILD testing/kdeutils-kwallet/PKGBUILD testing/kdeutils-superkaramba/PKGBUILD testing/kdeutils-sweeper/PKGBUILD testing/kdewebdev/PKGBUILD testing/libkcddb/PKGBUILD testing/libkcompactdisc/PKGBUILD testing/libkdcraw/PKGBUILD testing/libkdeedu/PKGBUILD testing/libkexiv2/PKGBUILD testing/libkipi/PKGBUILD testing/libksane/PKGBUILD testing/nepomuk-core/PKGBUILD testing/systemd/PKGBUILD testing/systemd/initcpio-install-udev testing/util-linux/PKGBUILD testing/util-linux/util-linux.install
Diffstat (limited to 'extra/system-config-printer')
-rw-r--r--extra/system-config-printer/PKGBUILD10
1 files changed, 5 insertions, 5 deletions
diff --git a/extra/system-config-printer/PKGBUILD b/extra/system-config-printer/PKGBUILD
index 1a2648c2a..202e1e42c 100644
--- a/extra/system-config-printer/PKGBUILD
+++ b/extra/system-config-printer/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164651 2012-08-01 18:41:16Z andrea $
+# $Id: PKGBUILD 167929 2012-10-03 20:43:11Z andrea $
# Maintainer: Andrea Scarpino <andrea@archlinux.org>
pkgbase=system-config-printer
pkgname=('system-config-printer-common'
'system-config-printer-gnome')
-pkgver=1.3.10
+pkgver=1.3.11
pkgrel=1
pkgdesc="A CUPS printer configuration tool and status applet"
url="http://cyberelk.net/tim/software/system-config-printer/"
@@ -13,8 +13,8 @@ license=('GPL')
makedepends=('udev' 'libcups' 'intltool' 'python2' 'xmlto' 'docbook-xsl'
'libusb-compat' 'desktop-file-utils')
source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
-md5sums=('9de9df07c4c97afa2cea3be2f05d6c18'
- '8ef4287a04761bd0b96e8ec44a92c92c')
+md5sums=('081fde89686ee15a9433c0035f5faed0'
+ '470964eb627af31f2aff9967a4b9a5bb')
build() {
cd "${srcdir}"/${pkgbase}-${pkgver}
@@ -37,7 +37,7 @@ build() {
package_system-config-printer-common() {
pkgdesc='Pygtk CUPS Configuration'
- depends=('udev' 'pycups' 'dbus-python' 'pysmbc' 'python-pycurl' 'libusb-compat')
+ depends=('udev' 'pycups' 'dbus-python' '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')