[arch-commits] Commit in system-config-printer/repos (6 files)

Andrea Scarpino andrea at nymeria.archlinux.org
Wed Feb 13 13:30:37 UTC 2013


    Date: Wednesday, February 13, 2013 @ 14:30:36
  Author: andrea
Revision: 178008

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  system-config-printer/repos/extra-i686/PKGBUILD
    (from rev 178007, system-config-printer/trunk/PKGBUILD)
  system-config-printer/repos/extra-i686/fix-typo-in-service.patch
    (from rev 178007, system-config-printer/trunk/fix-typo-in-service.patch)
  system-config-printer/repos/extra-x86_64/PKGBUILD
    (from rev 178007, system-config-printer/trunk/PKGBUILD)
  system-config-printer/repos/extra-x86_64/fix-typo-in-service.patch
    (from rev 178007, system-config-printer/trunk/fix-typo-in-service.patch)
Deleted:
  system-config-printer/repos/extra-i686/PKGBUILD
  system-config-printer/repos/extra-x86_64/PKGBUILD

----------------------------------------+
 extra-i686/PKGBUILD                    |   87 ++++++++++++++++---------------
 extra-i686/fix-typo-in-service.patch   |   18 ++++++
 extra-x86_64/PKGBUILD                  |   87 ++++++++++++++++---------------
 extra-x86_64/fix-typo-in-service.patch |   18 ++++++
 4 files changed, 128 insertions(+), 82 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2013-02-13 13:30:30 UTC (rev 178007)
+++ extra-i686/PKGBUILD	2013-02-13 13:30:36 UTC (rev 178008)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=system-config-printer
-pkgver=1.3.12
-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=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat'
-         'gnome-icon-theme' 'python2-notify')
-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}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('0775647e1c34ef25364de3c178a4ed36'
-         '1aa2246047b424e2d23473749368b8c6')
-
-build() {
-  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
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sbindir=/usr/bin \
-    --sysconfdir=/etc \
-    --with-udev-rules
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}

Copied: system-config-printer/repos/extra-i686/PKGBUILD (from rev 178007, system-config-printer/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2013-02-13 13:30:36 UTC (rev 178008)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=system-config-printer
+pkgver=1.3.12
+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=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat'
+         'gnome-icon-theme' 'python2-notify')
+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}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig}
+        'fix-typo-in-service.patch')
+md5sums=('0775647e1c34ef25364de3c178a4ed36'
+         '1aa2246047b424e2d23473749368b8c6'
+         'd30d14aeb6d2bfeac0679d28704473ec')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  # Fixed upstream
+  patch -p1 -i "${srcdir}"/fix-typo-in-service.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
+
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --with-udev-rules
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Copied: system-config-printer/repos/extra-i686/fix-typo-in-service.patch (from rev 178007, system-config-printer/trunk/fix-typo-in-service.patch)
===================================================================
--- extra-i686/fix-typo-in-service.patch	                        (rev 0)
+++ extra-i686/fix-typo-in-service.patch	2013-02-13 13:30:36 UTC (rev 178008)
@@ -0,0 +1,18 @@
+From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh at redhat.com>
+Date: Tue, 23 Oct 2012 13:55:12 +0000
+Subject: Fixed typo in systemd config file.
+
+---
+diff --git a/udev/configure-printer at .service.in b/udev/configure-printer at .service.in
+index 8a20967..5898c79 100644
+--- a/udev/configure-printer at .service.in
++++ b/udev/configure-printer at .service.in
+@@ -4,4 +4,4 @@ Requires=cups.socket
+ After=cups.socket
+ 
+ [Service]
+-ExecStart=@udevhelperdir@/configure-printer add "%i"
++ExecStart=@udevhelperdir@/udev-configure-printer add "%i"
+--
+cgit v0.9.1

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2013-02-13 13:30:30 UTC (rev 178007)
+++ extra-x86_64/PKGBUILD	2013-02-13 13:30:36 UTC (rev 178008)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=system-config-printer
-pkgver=1.3.12
-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=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat'
-         'gnome-icon-theme' 'python2-notify')
-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}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig})
-md5sums=('0775647e1c34ef25364de3c178a4ed36'
-         '1aa2246047b424e2d23473749368b8c6')
-
-build() {
-  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
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --sbindir=/usr/bin \
-    --sysconfdir=/etc \
-    --with-udev-rules
-
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}

Copied: system-config-printer/repos/extra-x86_64/PKGBUILD (from rev 178007, system-config-printer/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2013-02-13 13:30:36 UTC (rev 178008)
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer:
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=system-config-printer
+pkgver=1.3.12
+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=('udev' 'pycups' 'python2-dbus' 'pysmbc' 'python2-pycurl' 'libusb-compat'
+         'gnome-icon-theme' 'python2-notify')
+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}/1.3/${pkgname}-${pkgver}.tar.xz{,.sig}
+        'fix-typo-in-service.patch')
+md5sums=('0775647e1c34ef25364de3c178a4ed36'
+         '1aa2246047b424e2d23473749368b8c6'
+         'd30d14aeb6d2bfeac0679d28704473ec')
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  # Fixed upstream
+  patch -p1 -i "${srcdir}"/fix-typo-in-service.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
+
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
+    --with-udev-rules
+
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+}

Copied: system-config-printer/repos/extra-x86_64/fix-typo-in-service.patch (from rev 178007, system-config-printer/trunk/fix-typo-in-service.patch)
===================================================================
--- extra-x86_64/fix-typo-in-service.patch	                        (rev 0)
+++ extra-x86_64/fix-typo-in-service.patch	2013-02-13 13:30:36 UTC (rev 178008)
@@ -0,0 +1,18 @@
+From 1e48d0a6404c6660bbf3f456e5ec48bed8fe7b80 Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh at redhat.com>
+Date: Tue, 23 Oct 2012 13:55:12 +0000
+Subject: Fixed typo in systemd config file.
+
+---
+diff --git a/udev/configure-printer at .service.in b/udev/configure-printer at .service.in
+index 8a20967..5898c79 100644
+--- a/udev/configure-printer at .service.in
++++ b/udev/configure-printer at .service.in
+@@ -4,4 +4,4 @@ Requires=cups.socket
+ After=cups.socket
+ 
+ [Service]
+-ExecStart=@udevhelperdir@/configure-printer add "%i"
++ExecStart=@udevhelperdir@/udev-configure-printer add "%i"
+--
+cgit v0.9.1




More information about the arch-commits mailing list