r25002 - in /packages/unstable/system-config-printer/debian/patches: 0003-Adjust-package-names.patch 18_debian_packages.patch series

[agx at users.alioth.debian.org]

Author: agx
Date: Tue Aug 24 13:28:05 2010
New Revision: 25002

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25002
Log:
New patch 0003-Adjust-package-names.patch

Adjust package names to match the Debian ones

Added:
    packages/unstable/system-config-printer/debian/patches/0003-Adjust-package-names.patch
Removed:
    packages/unstable/system-config-printer/debian/patches/18_debian_packages.patch
Modified:
    packages/unstable/system-config-printer/debian/patches/series

Added: packages/unstable/system-config-printer/debian/patches/0003-Adjust-package-names.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/patches/0003-Adjust-package-names.patch?rev=25002&op=file
==============================================================================
--- packages/unstable/system-config-printer/debian/patches/0003-Adjust-package-names.patch (added)
+++ packages/unstable/system-config-printer/debian/patches/0003-Adjust-package-names.patch [utf-8] Tue Aug 24 13:28:05 2010
@@ -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]
+--

Modified: packages/unstable/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/patches/series?rev=25002&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/patches/series [utf-8] (original)
+++ packages/unstable/system-config-printer/debian/patches/series [utf-8] Tue Aug 24 13:28:05 2010
@@ -6,10 +6,11 @@
 15_close_shortcut.patch
 16_dont_monitor_session.patch
 17_new_printer_notification.patch
-18_debian_packages.patch
 19_dbus_interfaces.patch
 30_install_traceback.patch
 31_browse_hang.patch
 32_pycups_traceback.patch
 33_dont_strip_Printer.patch
 0001-Adjust-python-paths.patch
+0002-Disable-firewall-checks.patch
+0003-Adjust-package-names.patch