r37554 - in /attic/system-config-printer/debian: ./ patches/
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Apr 16 15:23:30 UTC 2013
Author: pochu
Date: Tue Apr 16 15:23:30 2013
New Revision: 37554
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37554
Log:
revert changes not in the archive
Added:
attic/system-config-printer/debian/install
attic/system-config-printer/debian/patches/0001-Adjust-python-paths.patch
attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch
attic/system-config-printer/debian/patches/0003-Adjust-package-names.patch
attic/system-config-printer/debian/patches/0004-Fix-blacklist-name.patch
attic/system-config-printer/debian/patches/0005-Revert-to-the-correct-menu-category.patch
attic/system-config-printer/debian/patches/0006-Don-t-blindly-listen-to-any-signal.patch
attic/system-config-printer/debian/patches/0007-Use-our-custom-cpk-install-package-name.patch
attic/system-config-printer/debian/postinst
Removed:
attic/system-config-printer/debian/patches/Adjust-package-names.patch
attic/system-config-printer/debian/patches/Adjust-python-paths.patch
attic/system-config-printer/debian/patches/Don-t-blindly-listen-to-any-signal.patch
attic/system-config-printer/debian/patches/Use-our-custom-cpk-install-package-name.patch
attic/system-config-printer/debian/system-config-printer.install
Modified:
attic/system-config-printer/debian/changelog
attic/system-config-printer/debian/compat
attic/system-config-printer/debian/control
attic/system-config-printer/debian/control.in
attic/system-config-printer/debian/patches/series
attic/system-config-printer/debian/python-cupshelpers.install
attic/system-config-printer/debian/rules
attic/system-config-printer/debian/watch
Modified: attic/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/changelog?rev=37554&op=diff
==============================================================================
--- attic/system-config-printer/debian/changelog [utf-8] (original)
+++ attic/system-config-printer/debian/changelog [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,49 +1,3 @@
-system-config-printer (1.4.0-1) UNRELEASED; urgency=low
-
- [ Guido Günther ]
- * Update watch file.
- Upstream uses xz now
-
- [ Emilio Pozuelo Monfort ]
- * Change the maintainer to the GNOME team. Thanks Otavio for all
- your work!
-
- [ Jordi Mallach ]
- * New upstream release 1.3.7.
- * Don't search for .bz2 tarballs, only .xz is supported.
- * Fix get-orig-source by using more gnome-get-source.mk variables to
- build the download URL.
- * Remove obsolete postinst script.
- * Bump debhelper compatibility to 8.
- * Bump Standards-Version to 3.9.2. No changes required.
- * Remove debian/tmp prefix from .install files.
- * Update Vcs-* fields to non-redirected URLs.
- * Refresh patches.
- * Disable Adjust-package-names.patch, the static list of file → package
- is now handled by PackageKit.
- * Make s-c-p-udev depend on python-dbus (closes: #627810).
-
- [ Josselin Mouette ]
- * Update repository URL.
-
- [ Emilio Pozuelo Monfort ]
- * New upstream release 1.4.0.
- + Doesn't use deprecated udev functions. Closes: #705521.
- + debian/control.in:
- - Update build dependencies.
- + debian/install:
- - Renamed to debian/system-config-printer.install.
- + debian/rules,
- debian/system-config-printer.install:
- - Remove various hacks in debian/rules and just install the upstream
- script to run system-config-printer{,-applet}.
- + debian/rules:
- - Remove debug.py instead of options.py as that's what we're copying.
- + debian/system-config-printer.install:
- - Install the dbus service files.
-
- -- Jordi Mallach <jordi at debian.org> Fri, 14 Oct 2011 19:45:42 +0200
-
system-config-printer (1.2.3-3) unstable; urgency=high
* Depend on libxml2 (Closes: #597723)
Modified: attic/system-config-printer/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/compat?rev=37554&op=diff
==============================================================================
--- attic/system-config-printer/debian/compat [utf-8] (original)
+++ attic/system-config-printer/debian/compat [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,1 +1,1 @@
-8
+5
Modified: attic/system-config-printer/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/control?rev=37554&op=diff
==============================================================================
--- attic/system-config-printer/debian/control [utf-8] (original)
+++ attic/system-config-printer/debian/control [utf-8] Tue Apr 16 15:23:30 2013
@@ -6,11 +6,11 @@
Source: system-config-printer
Section: gnome
Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Jordi Mallach <jordi at debian.org>, Josselin Mouette <joss at debian.org>,
+Maintainer: Otavio Salvador <otavio at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>,
Guido Günther <agx at sigxcpu.org>
Build-Depends: cdbs (>= 0.4.43),
- debhelper (>= 8),
+ debhelper (>= 5.0.37.2),
python-support (>= 0.7.1),
python-all-dev (>= 2.6),
libxml-parser-perl,
@@ -22,9 +22,9 @@
libglib2.0-dev,
libudev-dev [linux-any],
libusb-dev
-Standards-Version: 3.9.2
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/attic/system-config-printer
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/attic/system-config-printer
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/system-config-printer
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer
Homepage: http://cyberelk.net/tim/software/system-config-printer/
Package: system-config-printer
@@ -73,7 +73,6 @@
${shlibs:Depends},
${python:Depends},
python-cups (>= 1.9.42),
- python-dbus,
python-cupshelpers (= ${source:Version})
Conflicts: hal-cups-utils (<< 0.6.17)
Description: Utilities to detect and configure printers automatically
Modified: attic/system-config-printer/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/control.in?rev=37554&op=diff
==============================================================================
--- attic/system-config-printer/debian/control.in [utf-8] (original)
+++ attic/system-config-printer/debian/control.in [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,11 +1,11 @@
Source: system-config-printer
Section: gnome
Priority: optional
-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Maintainer: Otavio Salvador <otavio at debian.org>
Uploaders: @GNOME_TEAM@,
Guido Günther <agx at sigxcpu.org>
Build-Depends: cdbs (>= 0.4.43),
- debhelper (>= 8),
+ debhelper (>= 5.0.37.2),
python-support (>= 0.7.1),
python-all-dev (>= 2.6),
libxml-parser-perl,
@@ -15,11 +15,11 @@
intltool,
libcups2-dev,
libglib2.0-dev,
- libudev-dev (>= 172) [linux-any],
- libusb-1.0-0-dev
-Standards-Version: 3.9.2
-Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/attic/system-config-printer
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/attic/system-config-printer
+ libudev-dev [linux-any],
+ libusb-dev
+Standards-Version: 3.9.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/system-config-printer
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer
Homepage: http://cyberelk.net/tim/software/system-config-printer/
Package: system-config-printer
@@ -68,7 +68,6 @@
${shlibs:Depends},
${python:Depends},
python-cups (>= 1.9.42),
- python-dbus,
python-cupshelpers (= ${source:Version})
Conflicts: hal-cups-utils (<< 0.6.17)
Description: Utilities to detect and configure printers automatically
Added: attic/system-config-printer/debian/install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/install?rev=37554&op=file
==============================================================================
--- attic/system-config-printer/debian/install (added)
+++ attic/system-config-printer/debian/install [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,0 +1,8 @@
+debian/tmp/etc/xdg/
+debian/tmp/etc/dbus-1/
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/man
+debian/tmp/usr/share/system-config-printer/system-config-printer.py /usr/bin
+debian/tmp/usr/share/system-config-printer/*/
+debian/gpk-install-package-name /usr/share/system-config-printer/
Added: attic/system-config-printer/debian/patches/0001-Adjust-python-paths.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0001-Adjust-python-paths.patch?rev=37554&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0001-Adjust-python-paths.patch (added)
+++ attic/system-config-printer/debian/patches/0001-Adjust-python-paths.patch [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,0 +1,35 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Mon, 26 Jul 2010 16:20:26 +0200
+Subject: [PATCH] Adjust python paths
+
+---
+ applet.py | 1 +
+ system-config-printer.py | 2 ++
+ 2 files changed, 3 insertions(+), 0 deletions(-)
+
+diff --git a/applet.py b/applet.py
+index 09732d7..491ddb1 100644
+--- a/applet.py
++++ b/applet.py
+@@ -20,6 +20,7 @@
+ import cups
+ cups.require ("1.9.42")
+ import sys
++sys.path.append("/usr/share/system-config-printer")
+ from debug import *
+
+ import dbus
+diff --git a/system-config-printer.py b/system-config-printer.py
+index 96f1dad..6d6b08c 100755
+--- a/system-config-printer.py
++++ b/system-config-printer.py
+@@ -21,6 +21,8 @@
+ ## along with this program; if not, write to the Free Software
+ ## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
++import sys
++sys.path.append("/usr/share/system-config-printer")
+ # config is generated from config.py.in by configure
+ import config
+
+--
Added: attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch?rev=37554&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch (added)
+++ attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,0 +1,38 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Mon, 26 Jul 2010 17:02:20 +0200
+Subject: [PATCH] Disable firewall checks
+
+---
+ firewall.py | 14 +++-----------
+ 1 files changed, 3 insertions(+), 11 deletions(-)
+
+diff --git a/firewall.py b/firewall.py
+index 512a83d..0466c12 100644
+--- a/firewall.py
++++ b/firewall.py
+@@ -48,21 +48,13 @@ class Firewall:
+ return self._fw_data
+
+ def write (self):
+- self._firewall.write (pickle.dumps (self._fw_data[0]))
++ pass
+
+ def _check_any_allowed (self, search):
+- (args, filename) = self._get_fw_data ()
+- isect = set (search).intersection (set (args))
+- return len (isect) != 0
++ return True
+
+ def add_rule (self, rule):
+- try:
+- (args, filename) = self._fw_data
+- except AttributeError:
+- (args, filename) = self._get_fw_data ()
+-
+- args.append (rule)
+- self._fw_data = (args, filename)
++ pass
+
+ def check_ipp_client_allowed (self):
+ return self._check_any_allowed (set(["--port=631:udp",
+--
Added: attic/system-config-printer/debian/patches/0003-Adjust-package-names.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0003-Adjust-package-names.patch?rev=37554&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0003-Adjust-package-names.patch (added)
+++ attic/system-config-printer/debian/patches/0003-Adjust-package-names.patch [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,0 +1,48 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Mon, 26 Jul 2010 17:10:26 +0200
+Subject: [PATCH] Adjust package names
+
+packages are named differently on RH systems
+---
+ cupshelpers/cupshelpers.py | 20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
+index 65db4bb..96a4772 100755
+--- a/cupshelpers/cupshelpers.py
++++ b/cupshelpers/cupshelpers.py
+@@ -786,23 +786,23 @@ def missingPackagesAndExecutables(ppd):
+ 'foo2oak-wrapper': None,
+ 'pnm2ppa': 'pnm2ppa',
+ 'c2050': 'c2050',
+- 'c2070': 'c2070',
++ 'c2070': None,
+ 'cjet': 'cjet',
+ 'lm1100': 'lx',
+ 'esc-m': 'min12xxw',
+ 'min12xxw': 'min12xxw',
+- 'pbm2l2030': 'pbm2l2030',
+- 'pbm2l7k': 'pbm2l7k',
+- 'pbm2lex': 'pbm2l7k',
++ 'pbm2l2030': None,
++ 'pbm2l7k': None,
++ 'pbm2lex': None,
+ # IJS servers (used by foomatic)
+ 'hpijs': 'hpijs',
+- 'ijsgutenprint.5.0': 'gutenprint',
+- 'ijsgutenprint.5.2': 'gutenprint',
++ 'ijsgutenprint.5.0': 'ijsgutenprint',
++ 'ijsgutenprint.5.2': 'ijsgutenprint',
+ # CUPS filters
+- 'rastertogutenprint.5.0': 'gutenprint-cups',
+- 'rastertogutenprint.5.2': 'gutenprint-cups',
+- 'commandtoepson': 'gutenprint-cups',
+- 'commandtocanon': 'gutenprint-cups',
++ 'rastertogutenprint.5.0': 'cups-driver-gutenprint',
++ 'rastertogutenprint.5.2': 'cups-driver-gutenprint',
++ 'commandtoepson': 'cups-driver-gutenprint',
++ 'commandtocanon': 'cups-driver-gutenprint',
+ }
+ try:
+ pkg = pkgs[exe]
+--
Added: attic/system-config-printer/debian/patches/0004-Fix-blacklist-name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0004-Fix-blacklist-name.patch?rev=37554&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0004-Fix-blacklist-name.patch (added)
+++ attic/system-config-printer/debian/patches/0004-Fix-blacklist-name.patch [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,0 +1,22 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 28 Jul 2010 09:37:32 +0200
+Subject: [PATCH] Fix blacklist name
+
+---
+ udev/udev-add-printer | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/udev/udev-add-printer b/udev/udev-add-printer
+index ce2b620..7189adc 100755
+--- a/udev/udev-add-printer
++++ b/udev/udev-add-printer
+@@ -27,7 +27,7 @@ import sys
+ import traceback
+ from syslog import *
+
+-MFR_BLACKLIST=[
++MFG_BLACKLIST=[
+ "graphtec",
+ ]
+
+--
Added: attic/system-config-printer/debian/patches/0005-Revert-to-the-correct-menu-category.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0005-Revert-to-the-correct-menu-category.patch?rev=37554&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0005-Revert-to-the-correct-menu-category.patch (added)
+++ attic/system-config-printer/debian/patches/0005-Revert-to-the-correct-menu-category.patch [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,0 +1,19 @@
+From: Josselin Mouette <joss at debian.org>
+Date: Wed, 28 Jul 2010 11:57:25 +0200
+Subject: [PATCH] Revert to the correct menu category.
+
+---
+ manage-print-jobs.desktop.in | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/manage-print-jobs.desktop.in b/manage-print-jobs.desktop.in
+index 5c8ccc5..6c72d77 100644
+--- a/manage-print-jobs.desktop.in
++++ b/manage-print-jobs.desktop.in
+@@ -7,4 +7,4 @@ Terminal=false
+ Type=Application
+ Icon=printer
+ NoDisplay=true
+-StartupNotify=true
++StartupNotify=false
+--
Added: attic/system-config-printer/debian/patches/0006-Don-t-blindly-listen-to-any-signal.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0006-Don-t-blindly-listen-to-any-signal.patch?rev=37554&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0006-Don-t-blindly-listen-to-any-signal.patch (added)
+++ attic/system-config-printer/debian/patches/0006-Don-t-blindly-listen-to-any-signal.patch [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,0 +1,43 @@
+From: Josselin Mouette <joss at debian.org>
+Date: Wed, 28 Jul 2010 11:59:24 +0200
+Subject: [PATCH] =?UTF-8?q?Don=E2=80=99t=20blindly=20listen=20to=20any=20signal?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+that goes through the session bus. Gnome-session will know when to kill
+the applet.
+
+Closes: #486674
+Thanks: Michal Čihař
+---
+ applet.py | 15 ---------------
+ 1 files changed, 0 insertions(+), 15 deletions(-)
+
+diff --git a/applet.py b/applet.py
+index 491ddb1..28f681a 100644
+--- a/applet.py
++++ b/applet.py
+@@ -329,21 +329,6 @@ if __name__ == '__main__':
+ except:
+ pass
+
+- if trayicon:
+- # Stop running when the session ends.
+- def monitor_session (*args):
+- pass
+-
+- try:
+- bus = dbus.SessionBus()
+- bus.add_signal_receiver (monitor_session)
+- except:
+- try:
+- print >> sys.stderr, ("%s: failed to connect to "
+- "session D-Bus" % PROGRAM_NAME)
+- finally:
+- sys.exit (1)
+-
+ try:
+ bus = dbus.SystemBus()
+ except:
+--
Added: attic/system-config-printer/debian/patches/0007-Use-our-custom-cpk-install-package-name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0007-Use-our-custom-cpk-install-package-name.patch?rev=37554&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0007-Use-our-custom-cpk-install-package-name.patch (added)
+++ attic/system-config-printer/debian/patches/0007-Use-our-custom-cpk-install-package-name.patch [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,0 +1,32 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx at sigxcpu.org>
+Date: Wed, 28 Jul 2010 17:29:05 +0200
+Subject: [PATCH] Use our custom cpk-install-package-name
+
+---
+ installpackage.py | 10 +++-------
+ 1 files changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/installpackage.py b/installpackage.py
+index baedc60..b956997 100644
+--- a/installpackage.py
++++ b/installpackage.py
+@@ -22,15 +22,11 @@
+ import os
+ import glib
+
++GPK_INSTALL_PACKAGE_NAME='/usr/share/system-config-printer/gpk-install-package-name'
++
+ class PackageKit:
+ def __init__ (self):
+- for dir in os.environ.get ("PATH", "").split (":"):
+- path = dir + os.path.sep + "gpk-install-package-name"
+- if os.access (path, os.X_OK):
+- self.gpk_install_package_name = path
+- return
+-
+- raise RuntimeError, "No gpk-install-package-name program available"
++ self.gpk_install_package_name = GPK_INSTALL_PACKAGE_NAME
+
+ def InstallPackageName (self, xid, timestamp, name):
+ glib.spawn_async ([self.gpk_install_package_name, name])
+--
Modified: attic/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/series?rev=37554&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/series [utf-8] (original)
+++ attic/system-config-printer/debian/patches/series [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,4 +1,7 @@
-Adjust-python-paths.patch
-#Adjust-package-names.patch # Moved to PackageKit
-Use-our-custom-cpk-install-package-name.patch
-Don-t-blindly-listen-to-any-signal.patch
+0001-Adjust-python-paths.patch
+0002-Disable-firewall-checks.patch
+0003-Adjust-package-names.patch
+0004-Fix-blacklist-name.patch
+0005-Revert-to-the-correct-menu-category.patch
+0006-Don-t-blindly-listen-to-any-signal.patch
+0007-Use-our-custom-cpk-install-package-name.patch
Added: attic/system-config-printer/debian/postinst
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/postinst?rev=37554&op=file
==============================================================================
--- attic/system-config-printer/debian/postinst (added)
+++ attic/system-config-printer/debian/postinst [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,0 +1,11 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+# Remove old configuration file
+if [ "$1" = upgrade ] && dpkg --compare-versions "$2" lt-nl "1.0.0-1"; then
+ rm -f /etc/xdg/autostart/redhat-print-applet.desktop
+fi
+
Modified: attic/system-config-printer/debian/python-cupshelpers.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/python-cupshelpers.install?rev=37554&op=diff
==============================================================================
--- attic/system-config-printer/debian/python-cupshelpers.install [utf-8] (original)
+++ attic/system-config-printer/debian/python-cupshelpers.install [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,1 +1,1 @@
-usr/lib/python*/site-packages/cupshelpers
+debian/tmp/usr/lib/python*/site-packages/cupshelpers
Modified: attic/system-config-printer/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/rules?rev=37554&op=diff
==============================================================================
--- attic/system-config-printer/debian/rules [utf-8] (original)
+++ attic/system-config-printer/debian/rules [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,22 +1,31 @@
#!/usr/bin/make -f
DEB_PYTHON_SYSTEM = pysupport
-GNOME_DOWNLOAD_URL = http://cyberelk.net/tim/data/system-config-printer/$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/$(GNOME_TARBALL)
-TARBALL_EXT := tar.xz
+GNOME_DOWNLOAD_URL = http://cyberelk.net/tim/data/system-config-printer/1.0.x/$(GNOME_TARBALL)
+TARBALL_EXT := tar.bz2
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_CONFIGURE_EXTRA_FLAGS := --sbindir=/usr/bin \
- --with-udev-rules
+DEB_CONFIGURE_EXTRA_FLAGS := --sbindir=/usr/bin
configure/python-cupshelpers::
cp debug.py smburi.py cupshelpers/
cleanbuilddir/python-cupshelpers::
- rm -rf cupshelpers/debug.py cupshelpers/smburi.py
+ rm -rf cupshelpers/options.py cupshelpers/smburi.py
+
+binary-install/system-config-printer::
+ for i in debian/tmp/usr/share/system-config-printer/*.py; do \
+ if ! grep -q ^$$i debian/*install; then \
+ cp $$i debian/system-config-printer/usr/share/system-config-printer/ ; \
+ fi ; done
+ sed -i 's,^#!/usr/bin/env python,#!/usr/bin/python,' debian/system-config-printer/usr/bin/*.py
+ rename 's/\.py$$//' debian/system-config-printer/usr/bin/*.py
+ mv debian/system-config-printer/usr/share/system-config-printer/applet.py \
+ debian/system-config-printer/usr/bin/system-config-printer-applet
$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
dh_pysupport -p$(cdbs_curpkg)
Modified: attic/system-config-printer/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/watch?rev=37554&op=diff
==============================================================================
--- attic/system-config-printer/debian/watch [utf-8] (original)
+++ attic/system-config-printer/debian/watch [utf-8] Tue Apr 16 15:23:30 2013
@@ -1,2 +1,3 @@
version=3
-http://cyberelk.net/tim/data/system-config-printer/([\d\.]+)/system-config-printer-(.*)\.tar\.xz
+http://cyberelk.net/tim/data/system-config-printer/([\d\.]+)x?/system-config-printer-(.*).tar.bz2
+debian git-import-orig
More information about the pkg-gnome-commits
mailing list