[arch-commits] Commit in system-config-printer/repos (6 files)
Eric Bélanger
eric at archlinux.org
Wed Oct 12 04:35:30 UTC 2011
Date: Wednesday, October 12, 2011 @ 00:35:30
Author: eric
Revision: 140389
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
system-config-printer/repos/extra-i686/PKGBUILD
(from rev 140388, system-config-printer/trunk/PKGBUILD)
system-config-printer/repos/extra-x86_64/PKGBUILD
(from rev 140388, system-config-printer/trunk/PKGBUILD)
Deleted:
system-config-printer/repos/extra-i686/PKGBUILD
system-config-printer/repos/extra-i686/no-packagekit.patch
system-config-printer/repos/extra-x86_64/PKGBUILD
system-config-printer/repos/extra-x86_64/no-packagekit.patch
----------------------------------+
extra-i686/PKGBUILD | 211 ++++++++++++++++++-------------------
extra-i686/no-packagekit.patch | 36 ------
extra-x86_64/PKGBUILD | 211 ++++++++++++++++++-------------------
extra-x86_64/no-packagekit.patch | 36 ------
4 files changed, 208 insertions(+), 286 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-10-12 04:35:11 UTC (rev 140388)
+++ extra-i686/PKGBUILD 2011-10-12 04:35:30 UTC (rev 140389)
@@ -1,107 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=system-config-printer
-pkgname=('system-config-printer-common'
- 'system-config-printer-gnome')
-pkgver=1.3.5
-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')
-makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
-source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz"
- 'no-packagekit.patch')
-md5sums=('9d806643f17dc65a492a1d4e8a60f2ec'
- 'e70a274c3cced39db1668e2a748e068f')
-
-build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
-
- patch -p1 -i "${srcdir}"/no-packagekit.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
-
- ./configure --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --with-udev-rules
-
- make
-}
-
-package_system-config-printer-common() {
- pkgdesc='Pygtk CUPS Configuration'
- depends=('pycups' 'dbus-python' 'pysmbc')
- 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')
- provides=("system-config-printer=${pkgver}")
- conflicts=('system-config-printer')
-
- cd "${srcdir}"/${pkgbase}-${pkgver}
- install -d "${pkgdir}"/usr/share/${pkgbase}
- install -m644 config.py \
- debug.py \
- installpackage.py \
- monitor.py \
- PhysicalDevice.py \
- ppdippstr.py \
- probe_printer.py \
- SearchCriterion.py \
- smburi.py \
- statereason.py \
- "${pkgdir}"/usr/share/${pkgbase}/
-
- install -m755 pysmb.py \
- "${pkgdir}"/usr/share/${pkgbase}/
-
- install -d "${pkgdir}"/etc/dbus-1/system.d/
- install -m644 dbus/com.redhat.NewPrinterNotification.conf \
- dbus/com.redhat.PrinterDriversInstaller.conf \
- "${pkgdir}"/etc/dbus-1/system.d/
- install -d "${pkgdir}"/etc/cupshelpers/
- install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
-
- install -d "${pkgdir}"/lib/udev/rules.d
- install -m755 udev/{udev-add-printer,udev-configure-printer} \
- "${pkgdir}"/lib/udev/
- install -m644 udev/70-printers.rules \
- "${pkgdir}"/lib/udev/rules.d
-
- for file in build/lib/cupshelpers/*.py; do
- install -Dm644 $file \
- "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
- done
-}
-
-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')
- optdependence=('gnome-keyring: password management')
-
- cd "${srcdir}"/${pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- # files provided by system-config-printer-common
- cd "${pkgdir}"/usr/share/${pkgbase}
- rm config.py \
- debug.py \
- installpackage.py \
- monitor.py \
- PhysicalDevice.py \
- ppdippstr.py \
- probe_printer.py \
- SearchCriterion.py \
- smburi.py \
- statereason.py \
- pysmb.py
- rm -r "${pkgdir}"/etc/dbus-1/
- rm -r "${pkgdir}"/etc/cupshelpers/
- rm -r "${pkgdir}"/etc/udev/
- rm -r "${pkgdir}"/usr/lib/
-}
Copied: system-config-printer/repos/extra-i686/PKGBUILD (from rev 140388, system-config-printer/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-12 04:35:30 UTC (rev 140389)
@@ -0,0 +1,104 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=system-config-printer
+pkgname=('system-config-printer-common'
+ 'system-config-printer-gnome')
+pkgver=1.3.7
+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')
+makedepends=('udev' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
+source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
+md5sums=('f579ba287403d8ae3028377c6641feed'
+ 'a2ce58f4e612130b30e5c029e9afd31f')
+
+build() {
+ cd "${srcdir}"/${pkgbase}-${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
+
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --with-udev-rules
+
+ make
+}
+
+package_system-config-printer-common() {
+ pkgdesc='Pygtk CUPS Configuration'
+ depends=('udev' 'pycups' 'dbus-python' 'pysmbc')
+ 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')
+ provides=("system-config-printer=${pkgver}")
+ conflicts=('system-config-printer')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ install -d "${pkgdir}"/usr/share/${pkgbase}
+ install -m644 config.py \
+ debug.py \
+ installpackage.py \
+ monitor.py \
+ PhysicalDevice.py \
+ ppdippstr.py \
+ probe_printer.py \
+ SearchCriterion.py \
+ smburi.py \
+ statereason.py \
+ "${pkgdir}"/usr/share/${pkgbase}/
+
+ install -m755 pysmb.py \
+ "${pkgdir}"/usr/share/${pkgbase}/
+
+ install -d "${pkgdir}"/etc/dbus-1/system.d/
+ install -m644 dbus/com.redhat.NewPrinterNotification.conf \
+ dbus/com.redhat.PrinterDriversInstaller.conf \
+ "${pkgdir}"/etc/dbus-1/system.d/
+ install -d "${pkgdir}"/etc/cupshelpers/
+ install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
+
+ install -d "${pkgdir}"/lib/udev/rules.d
+ install -m755 udev/{udev-add-printer,udev-configure-printer} \
+ "${pkgdir}"/lib/udev/
+ install -m644 udev/70-printers.rules \
+ "${pkgdir}"/lib/udev/rules.d
+
+ for file in build/lib/cupshelpers/*.py; do
+ install -Dm644 $file \
+ "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
+ done
+}
+
+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')
+ optdependence=('gnome-keyring: password management')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ # files provided by system-config-printer-common
+ cd "${pkgdir}"/usr/share/${pkgbase}
+ rm config.py \
+ debug.py \
+ installpackage.py \
+ monitor.py \
+ PhysicalDevice.py \
+ ppdippstr.py \
+ probe_printer.py \
+ SearchCriterion.py \
+ smburi.py \
+ statereason.py \
+ pysmb.py
+ rm -r "${pkgdir}"/etc/dbus-1/
+ rm -r "${pkgdir}"/etc/cupshelpers/
+ rm -r "${pkgdir}"/etc/udev/
+ rm -r "${pkgdir}"/usr/lib/
+}
Deleted: extra-i686/no-packagekit.patch
===================================================================
--- extra-i686/no-packagekit.patch 2011-10-12 04:35:11 UTC (rev 140388)
+++ extra-i686/no-packagekit.patch 2011-10-12 04:35:30 UTC (rev 140389)
@@ -1,36 +0,0 @@
---- system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-01 10:47:11.614519332 +0100
-+++ system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-02 15:45:33.807623959 +0100
-@@ -21,7 +21,6 @@
-
- import cups, pprint, os, tempfile, re, string
- import locale
--import packagekit.client, packagekit.enums
- from . import _debugprint
-
- class Printer:
-@@ -829,24 +828,7 @@
- missing executables
- """
- executables = missingExecutables(ppd)
-- packages = []
-- if executables:
-- unresolved_executables = []
-- client = packagekit.client.PackageKitClient ()
-- for executable in executables:
-- if not executable.startswith ("/"):
-- executable = "/usr/bin/" + executable
--
-- result = client.search_file ([executable],
-- packagekit.enums.FILTER_NOT_INSTALLED)
-- if result:
-- packages.extend (set (map (lambda x: x.name, result)))
-- else:
-- unresolved_executables.append (executable)
--
-- executables = unresolved_executables
--
-- return (packages, executables)
-+ return ([], executables)
-
- def _main():
- c = cups.Connection()
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-10-12 04:35:11 UTC (rev 140388)
+++ extra-x86_64/PKGBUILD 2011-10-12 04:35:30 UTC (rev 140389)
@@ -1,107 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgbase=system-config-printer
-pkgname=('system-config-printer-common'
- 'system-config-printer-gnome')
-pkgver=1.3.5
-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')
-makedepends=('intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
-source=("http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz"
- 'no-packagekit.patch')
-md5sums=('9d806643f17dc65a492a1d4e8a60f2ec'
- 'e70a274c3cced39db1668e2a748e068f')
-
-build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
-
- patch -p1 -i "${srcdir}"/no-packagekit.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
-
- ./configure --prefix=/usr \
- --sbindir=/usr/bin \
- --sysconfdir=/etc \
- --with-udev-rules
-
- make
-}
-
-package_system-config-printer-common() {
- pkgdesc='Pygtk CUPS Configuration'
- depends=('pycups' 'dbus-python' 'pysmbc')
- 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')
- provides=("system-config-printer=${pkgver}")
- conflicts=('system-config-printer')
-
- cd "${srcdir}"/${pkgbase}-${pkgver}
- install -d "${pkgdir}"/usr/share/${pkgbase}
- install -m644 config.py \
- debug.py \
- installpackage.py \
- monitor.py \
- PhysicalDevice.py \
- ppdippstr.py \
- probe_printer.py \
- SearchCriterion.py \
- smburi.py \
- statereason.py \
- "${pkgdir}"/usr/share/${pkgbase}/
-
- install -m755 pysmb.py \
- "${pkgdir}"/usr/share/${pkgbase}/
-
- install -d "${pkgdir}"/etc/dbus-1/system.d/
- install -m644 dbus/com.redhat.NewPrinterNotification.conf \
- dbus/com.redhat.PrinterDriversInstaller.conf \
- "${pkgdir}"/etc/dbus-1/system.d/
- install -d "${pkgdir}"/etc/cupshelpers/
- install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
-
- install -d "${pkgdir}"/lib/udev/rules.d
- install -m755 udev/{udev-add-printer,udev-configure-printer} \
- "${pkgdir}"/lib/udev/
- install -m644 udev/70-printers.rules \
- "${pkgdir}"/lib/udev/rules.d
-
- for file in build/lib/cupshelpers/*.py; do
- install -Dm644 $file \
- "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
- done
-}
-
-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')
- optdependence=('gnome-keyring: password management')
-
- cd "${srcdir}"/${pkgbase}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- # files provided by system-config-printer-common
- cd "${pkgdir}"/usr/share/${pkgbase}
- rm config.py \
- debug.py \
- installpackage.py \
- monitor.py \
- PhysicalDevice.py \
- ppdippstr.py \
- probe_printer.py \
- SearchCriterion.py \
- smburi.py \
- statereason.py \
- pysmb.py
- rm -r "${pkgdir}"/etc/dbus-1/
- rm -r "${pkgdir}"/etc/cupshelpers/
- rm -r "${pkgdir}"/etc/udev/
- rm -r "${pkgdir}"/usr/lib/
-}
Copied: system-config-printer/repos/extra-x86_64/PKGBUILD (from rev 140388, system-config-printer/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-10-12 04:35:30 UTC (rev 140389)
@@ -0,0 +1,104 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=system-config-printer
+pkgname=('system-config-printer-common'
+ 'system-config-printer-gnome')
+pkgver=1.3.7
+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')
+makedepends=('udev' 'intltool' 'python2' 'xmlto' 'docbook-xsl' 'desktop-file-utils' 'libcups' 'libxml2')
+source=(http://cyberelk.net/tim/data/${pkgbase}/1.3/${pkgbase}-${pkgver}.tar.xz{,.sig})
+md5sums=('f579ba287403d8ae3028377c6641feed'
+ 'a2ce58f4e612130b30e5c029e9afd31f')
+
+build() {
+ cd "${srcdir}"/${pkgbase}-${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
+
+ ./configure --prefix=/usr \
+ --sbindir=/usr/bin \
+ --sysconfdir=/etc \
+ --with-udev-rules
+
+ make
+}
+
+package_system-config-printer-common() {
+ pkgdesc='Pygtk CUPS Configuration'
+ depends=('udev' 'pycups' 'dbus-python' 'pysmbc')
+ 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')
+ provides=("system-config-printer=${pkgver}")
+ conflicts=('system-config-printer')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ install -d "${pkgdir}"/usr/share/${pkgbase}
+ install -m644 config.py \
+ debug.py \
+ installpackage.py \
+ monitor.py \
+ PhysicalDevice.py \
+ ppdippstr.py \
+ probe_printer.py \
+ SearchCriterion.py \
+ smburi.py \
+ statereason.py \
+ "${pkgdir}"/usr/share/${pkgbase}/
+
+ install -m755 pysmb.py \
+ "${pkgdir}"/usr/share/${pkgbase}/
+
+ install -d "${pkgdir}"/etc/dbus-1/system.d/
+ install -m644 dbus/com.redhat.NewPrinterNotification.conf \
+ dbus/com.redhat.PrinterDriversInstaller.conf \
+ "${pkgdir}"/etc/dbus-1/system.d/
+ install -d "${pkgdir}"/etc/cupshelpers/
+ install -m644 xml/preferreddrivers.xml "${pkgdir}"/etc/cupshelpers/
+
+ install -d "${pkgdir}"/lib/udev/rules.d
+ install -m755 udev/{udev-add-printer,udev-configure-printer} \
+ "${pkgdir}"/lib/udev/
+ install -m644 udev/70-printers.rules \
+ "${pkgdir}"/lib/udev/rules.d
+
+ for file in build/lib/cupshelpers/*.py; do
+ install -Dm644 $file \
+ "${pkgdir}"/usr/lib/python2.7/site-packages/cupshelpers/$(basename $file)
+ done
+}
+
+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')
+ optdependence=('gnome-keyring: password management')
+
+ cd "${srcdir}"/${pkgbase}-${pkgver}
+ make DESTDIR="${pkgdir}" install
+
+ # files provided by system-config-printer-common
+ cd "${pkgdir}"/usr/share/${pkgbase}
+ rm config.py \
+ debug.py \
+ installpackage.py \
+ monitor.py \
+ PhysicalDevice.py \
+ ppdippstr.py \
+ probe_printer.py \
+ SearchCriterion.py \
+ smburi.py \
+ statereason.py \
+ pysmb.py
+ rm -r "${pkgdir}"/etc/dbus-1/
+ rm -r "${pkgdir}"/etc/cupshelpers/
+ rm -r "${pkgdir}"/etc/udev/
+ rm -r "${pkgdir}"/usr/lib/
+}
Deleted: extra-x86_64/no-packagekit.patch
===================================================================
--- extra-x86_64/no-packagekit.patch 2011-10-12 04:35:11 UTC (rev 140388)
+++ extra-x86_64/no-packagekit.patch 2011-10-12 04:35:30 UTC (rev 140389)
@@ -1,36 +0,0 @@
---- system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-01 10:47:11.614519332 +0100
-+++ system-config-printer-1.3.5/cupshelpers/cupshelpers.py 2011-08-02 15:45:33.807623959 +0100
-@@ -21,7 +21,6 @@
-
- import cups, pprint, os, tempfile, re, string
- import locale
--import packagekit.client, packagekit.enums
- from . import _debugprint
-
- class Printer:
-@@ -829,24 +828,7 @@
- missing executables
- """
- executables = missingExecutables(ppd)
-- packages = []
-- if executables:
-- unresolved_executables = []
-- client = packagekit.client.PackageKitClient ()
-- for executable in executables:
-- if not executable.startswith ("/"):
-- executable = "/usr/bin/" + executable
--
-- result = client.search_file ([executable],
-- packagekit.enums.FILTER_NOT_INSTALLED)
-- if result:
-- packages.extend (set (map (lambda x: x.name, result)))
-- else:
-- unresolved_executables.append (executable)
--
-- executables = unresolved_executables
--
-- return (packages, executables)
-+ return ([], executables)
-
- def _main():
- c = cups.Connection()
More information about the arch-commits
mailing list