[arch-commits] Commit in system-config-printer/repos (6 files)
Jan de Groot
jgc at nymeria.archlinux.org
Wed Dec 4 20:14:29 UTC 2013
Date: Wednesday, December 4, 2013 @ 21:14:29
Author: jgc
Revision: 200771
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
system-config-printer/repos/extra-i686/40_scp-dbus-service-fix-dbus-signature-typo.patch
(from rev 200770, system-config-printer/trunk/40_scp-dbus-service-fix-dbus-signature-typo.patch)
system-config-printer/repos/extra-i686/PKGBUILD
(from rev 200770, system-config-printer/trunk/PKGBUILD)
system-config-printer/repos/extra-x86_64/40_scp-dbus-service-fix-dbus-signature-typo.patch
(from rev 200770, system-config-printer/trunk/40_scp-dbus-service-fix-dbus-signature-typo.patch)
system-config-printer/repos/extra-x86_64/PKGBUILD
(from rev 200770, system-config-printer/trunk/PKGBUILD)
Deleted:
system-config-printer/repos/extra-i686/PKGBUILD
system-config-printer/repos/extra-x86_64/PKGBUILD
----------------------------------------------------------------+
/PKGBUILD | 96 ++++++++++
extra-i686/40_scp-dbus-service-fix-dbus-signature-typo.patch | 12 +
extra-i686/PKGBUILD | 44 ----
extra-x86_64/40_scp-dbus-service-fix-dbus-signature-typo.patch | 12 +
extra-x86_64/PKGBUILD | 44 ----
5 files changed, 120 insertions(+), 88 deletions(-)
Copied: system-config-printer/repos/extra-i686/40_scp-dbus-service-fix-dbus-signature-typo.patch (from rev 200770, system-config-printer/trunk/40_scp-dbus-service-fix-dbus-signature-typo.patch)
===================================================================
--- extra-i686/40_scp-dbus-service-fix-dbus-signature-typo.patch (rev 0)
+++ extra-i686/40_scp-dbus-service-fix-dbus-signature-typo.patch 2013-12-04 20:14:29 UTC (rev 200771)
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' system-config-printer-1.4.2+20130920/scp-dbus-service.py system-config-printer-1.4.2+20130920.new/scp-dbus-service.py
+--- system-config-printer-1.4.2+20130920/scp-dbus-service.py 2013-09-20 22:26:27.000000000 +0200
++++ system-config-printer-1.4.2+20130920.new/scp-dbus-service.py 2013-10-24 13:12:44.998717234 +0200
+@@ -367,7 +367,7 @@
+ pass
+
+ @dbus.service.signal(dbus_interface=CONFIG_NEWPRINTERDIALOG_IFACE,
+- signature='a{s}')
++ signature='a(s)')
+ def DriverDownloadChecked(self, installed_files):
+ pass
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-12-04 20:14:23 UTC (rev 200770)
+++ extra-i686/PKGBUILD 2013-12-04 20:14:29 UTC (rev 200771)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=system-config-printer
-pkgver=1.4.3
-pkgrel=1
-pkgdesc="A CUPS printer configuration tool and status applet"
-url="http://cyberelk.net/tim/software/system-config-printer/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'dbus-glib'
- 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'gtk3')
-makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
-optdepends=('gnome-keyring: password management')
-replaces=('system-config-printer-common' 'system-config-printer-gnome')
-conflicts=('system-config-printer-common' 'system-config-printer-gnome')
-source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('99e251bfd281526fb6ea109b3e2bace3'
- 'SKIP')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- $(find . -name '*.py')
- sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --with-udev-rules
-
- make udevhelperdir=/usr/lib/udev
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" udevhelperdir=/usr/lib/udev \
- udevrulesdir=/usr/lib/udev/rules.d install
-}
Copied: system-config-printer/repos/extra-i686/PKGBUILD (from rev 200770, system-config-printer/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-12-04 20:14:29 UTC (rev 200771)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=system-config-printer
+pkgver=1.4.3
+pkgrel=2
+pkgdesc="A CUPS printer configuration tool and status applet"
+url="http://cyberelk.net/tim/software/system-config-printer/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'dbus-glib'
+ 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'gtk3')
+makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
+optdepends=('gnome-keyring: password management')
+replaces=('system-config-printer-common' 'system-config-printer-gnome')
+conflicts=('system-config-printer-common' 'system-config-printer-gnome')
+source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}
+ 40_scp-dbus-service-fix-dbus-signature-typo.patch)
+md5sums=('99e251bfd281526fb6ea109b3e2bace3'
+ 'SKIP'
+ 'a616371aff9fae27b99d036c4143bf37')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../40_scp-dbus-service-fix-dbus-signature-typo.patch
+
+ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ $(find . -name '*.py')
+ sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --with-udev-rules
+
+ make udevhelperdir=/usr/lib/udev
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" udevhelperdir=/usr/lib/udev \
+ udevrulesdir=/usr/lib/udev/rules.d install
+}
Copied: system-config-printer/repos/extra-x86_64/40_scp-dbus-service-fix-dbus-signature-typo.patch (from rev 200770, system-config-printer/trunk/40_scp-dbus-service-fix-dbus-signature-typo.patch)
===================================================================
--- extra-x86_64/40_scp-dbus-service-fix-dbus-signature-typo.patch (rev 0)
+++ extra-x86_64/40_scp-dbus-service-fix-dbus-signature-typo.patch 2013-12-04 20:14:29 UTC (rev 200771)
@@ -0,0 +1,12 @@
+diff -Nur -x '*.orig' -x '*~' system-config-printer-1.4.2+20130920/scp-dbus-service.py system-config-printer-1.4.2+20130920.new/scp-dbus-service.py
+--- system-config-printer-1.4.2+20130920/scp-dbus-service.py 2013-09-20 22:26:27.000000000 +0200
++++ system-config-printer-1.4.2+20130920.new/scp-dbus-service.py 2013-10-24 13:12:44.998717234 +0200
+@@ -367,7 +367,7 @@
+ pass
+
+ @dbus.service.signal(dbus_interface=CONFIG_NEWPRINTERDIALOG_IFACE,
+- signature='a{s}')
++ signature='a(s)')
+ def DriverDownloadChecked(self, installed_files):
+ pass
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-12-04 20:14:23 UTC (rev 200770)
+++ extra-x86_64/PKGBUILD 2013-12-04 20:14:29 UTC (rev 200771)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=system-config-printer
-pkgver=1.4.3
-pkgrel=1
-pkgdesc="A CUPS printer configuration tool and status applet"
-url="http://cyberelk.net/tim/software/system-config-printer/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'dbus-glib'
- 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'gtk3')
-makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
-optdepends=('gnome-keyring: password management')
-replaces=('system-config-printer-common' 'system-config-printer-gnome')
-conflicts=('system-config-printer-common' 'system-config-printer-gnome')
-source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('99e251bfd281526fb6ea109b3e2bace3'
- 'SKIP')
-
-prepare() {
- cd ${pkgname}-${pkgver}
- sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- $(find . -name '*.py')
- sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --with-udev-rules
-
- make udevhelperdir=/usr/lib/udev
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" udevhelperdir=/usr/lib/udev \
- udevrulesdir=/usr/lib/udev/rules.d install
-}
Copied: system-config-printer/repos/extra-x86_64/PKGBUILD (from rev 200770, system-config-printer/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-12-04 20:14:29 UTC (rev 200771)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=system-config-printer
+pkgver=1.4.3
+pkgrel=2
+pkgdesc="A CUPS printer configuration tool and status applet"
+url="http://cyberelk.net/tim/software/system-config-printer/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'dbus-glib'
+ 'gnome-icon-theme' 'python2-notify' 'python2-gobject' 'gtk3')
+makedepends=('intltool' 'xmlto' 'docbook-xsl' 'desktop-file-utils')
+optdepends=('gnome-keyring: password management')
+replaces=('system-config-printer-common' 'system-config-printer-gnome')
+conflicts=('system-config-printer-common' 'system-config-printer-gnome')
+source=(http://cyberelk.net/tim/data/${pkgname}/${pkgver%*.*}/${pkgname}-${pkgver}.tar.xz{,.sig}
+ 40_scp-dbus-service-fix-dbus-signature-typo.patch)
+md5sums=('99e251bfd281526fb6ea109b3e2bace3'
+ 'SKIP'
+ 'a616371aff9fae27b99d036c4143bf37')
+
+prepare() {
+ cd ${pkgname}-${pkgver}
+ patch -Np1 -i ../40_scp-dbus-service-fix-dbus-signature-typo.patch
+
+ sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
+ -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
+ $(find . -name '*.py')
+ sed -i "s|#!/usr/bin/python|#!/usr/bin/python2|" udev/udev-add-printer
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --with-udev-rules
+
+ make udevhelperdir=/usr/lib/udev
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+ make DESTDIR="${pkgdir}" udevhelperdir=/usr/lib/udev \
+ udevrulesdir=/usr/lib/udev/rules.d install
+}
More information about the arch-commits
mailing list