r27608 - in /packages/unstable/system-config-printer/debian: ./ patches/

agx at users.alioth.debian.org agx at users.alioth.debian.org
Sat Apr 16 15:49:18 UTC 2011 

Author: agx
Date: Sat Apr 16 15:49:13 2011
New Revision: 27608

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27608
Log:
Update patches for 1.3.2

Added:
    packages/unstable/system-config-printer/debian/patches/Adjust-package-names.patch
      - copied, changed from r27607, packages/unstable/system-config-printer/debian/patches/0003-Adjust-package-names.patch
    packages/unstable/system-config-printer/debian/patches/Adjust-python-paths.patch
      - copied, changed from r27607, packages/unstable/system-config-printer/debian/patches/0001-Adjust-python-paths.patch
    packages/unstable/system-config-printer/debian/patches/Don-t-blindly-listen-to-any-signal.patch
    packages/unstable/system-config-printer/debian/patches/Use-our-custom-cpk-install-package-name.patch
      - copied, changed from r27607, packages/unstable/system-config-printer/debian/patches/0007-Use-our-custom-cpk-install-package-name.patch
Removed:
    packages/unstable/system-config-printer/debian/patches/0001-Adjust-python-paths.patch
    packages/unstable/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch
    packages/unstable/system-config-printer/debian/patches/0003-Adjust-package-names.patch
    packages/unstable/system-config-printer/debian/patches/0004-Fix-blacklist-name.patch
    packages/unstable/system-config-printer/debian/patches/0005-Revert-to-the-correct-menu-category.patch
    packages/unstable/system-config-printer/debian/patches/0006-Don-t-blindly-listen-to-any-signal.patch
    packages/unstable/system-config-printer/debian/patches/0007-Use-our-custom-cpk-install-package-name.patch
Modified:
    packages/unstable/system-config-printer/debian/changelog
    packages/unstable/system-config-printer/debian/patches/series

Modified: packages/unstable/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/changelog?rev=27608&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/changelog [utf-8] (original)
+++ packages/unstable/system-config-printer/debian/changelog [utf-8] Sat Apr 16 15:49:13 2011
@@ -1,3 +1,12 @@
+system-config-printer (1.3.2-1~1.gbp235d18) unstable; urgency=low
+
+  ** SNAPSHOT build @235d180bd2914d463978deec05f8705837aee8ad **
+
+  * Update watch file.
+    Upstream uses xz now
+
+ -- Guido Günther <agx at sigxcpu.org>  Sat, 16 Apr 2011 17:06:31 +0200
+
 system-config-printer (1.2.3-3) unstable; urgency=high
 
   * Depend on libxml2 (Closes: #597723)

Copied: packages/unstable/system-config-printer/debian/patches/Adjust-package-names.patch (from r27607, 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/Adjust-package-names.patch?rev=27608&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/patches/0003-Adjust-package-names.patch [utf-8] (original)
+++ packages/unstable/system-config-printer/debian/patches/Adjust-package-names.patch [utf-8] Sat Apr 16 15:49:13 2011
@@ -1,6 +1,6 @@
 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
+Subject: Adjust package names
 
 packages are named differently on RH systems
 ---
@@ -8,10 +8,10 @@
  1 files changed, 10 insertions(+), 10 deletions(-)
 
 diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
-index 65db4bb..96a4772 100755
+index 9224f3e..2f9cd4a 100755
 --- a/cupshelpers/cupshelpers.py
 +++ b/cupshelpers/cupshelpers.py
-@@ -786,23 +786,23 @@ def missingPackagesAndExecutables(ppd):
+@@ -821,23 +821,23 @@ def missingPackagesAndExecutables(ppd):
              'foo2oak-wrapper': None,
              'pnm2ppa': 'pnm2ppa',
              'c2050': 'c2050',
@@ -45,4 +45,4 @@
              }
          try:
              pkg = pkgs[exe]
---
+-- 

Copied: packages/unstable/system-config-printer/debian/patches/Adjust-python-paths.patch (from r27607, packages/unstable/system-config-printer/debian/patches/0001-Adjust-python-paths.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/patches/Adjust-python-paths.patch?rev=27608&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/patches/0001-Adjust-python-paths.patch [utf-8] (original)
+++ packages/unstable/system-config-printer/debian/patches/Adjust-python-paths.patch [utf-8] Sat Apr 16 15:49:13 2011
@@ -1,6 +1,6 @@
 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
+Subject: Adjust python paths
 
 ---
  applet.py                |    1 +
@@ -8,7 +8,7 @@
  2 files changed, 3 insertions(+), 0 deletions(-)
 
 diff --git a/applet.py b/applet.py
-index 09732d7..491ddb1 100644
+index 9aec1da..048197c 100644
 --- a/applet.py
 +++ b/applet.py
 @@ -20,6 +20,7 @@
@@ -17,19 +17,19 @@
  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
+index 8828a4f..0226378 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: packages/unstable/system-config-printer/debian/patches/Don-t-blindly-listen-to-any-signal.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/patches/Don-t-blindly-listen-to-any-signal.patch?rev=27608&op=file
==============================================================================
--- packages/unstable/system-config-printer/debian/patches/Don-t-blindly-listen-to-any-signal.patch (added)
+++ packages/unstable/system-config-printer/debian/patches/Don-t-blindly-listen-to-any-signal.patch [utf-8] Sat Apr 16 15:49:13 2011
@@ -1,0 +1,39 @@
+From: Josselin Mouette <joss at debian.org>
+Date: Sat, 16 Apr 2011 17:22:09 +0200
+Subject: Don't blindly listen to any signal
+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 |   11 -----------
+ 1 files changed, 0 insertions(+), 11 deletions(-)
+
+diff --git a/applet.py b/applet.py
+index 048197c..e6cdf31 100644
+--- a/applet.py
++++ b/applet.py
+@@ -410,17 +410,6 @@ if __name__ == '__main__':
+             sys.exit (1)
+ 
+     try:
+-        session_bus = dbus.SessionBus()
+-        # Stop running when the session ends.
+-        session_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:
+         NewPrinterNotification(system_bus, session_bus)
+     except:
+         try:
+-- 

Copied: packages/unstable/system-config-printer/debian/patches/Use-our-custom-cpk-install-package-name.patch (from r27607, packages/unstable/system-config-printer/debian/patches/0007-Use-our-custom-cpk-install-package-name.patch)
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/system-config-printer/debian/patches/Use-our-custom-cpk-install-package-name.patch?rev=27608&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/patches/0007-Use-our-custom-cpk-install-package-name.patch [utf-8] (original)
+++ packages/unstable/system-config-printer/debian/patches/Use-our-custom-cpk-install-package-name.patch [utf-8] Sat Apr 16 15:49:13 2011
@@ -1,19 +1,19 @@
 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
+Subject: 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
+index b30137d..a2bdf41 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:
@@ -26,7 +26,7 @@
 -
 -        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: 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=27608&op=diff
==============================================================================
--- packages/unstable/system-config-printer/debian/patches/series [utf-8] (original)
+++ packages/unstable/system-config-printer/debian/patches/series [utf-8] Sat Apr 16 15:49:13 2011
@@ -1,7 +1,4 @@
-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
+Adjust-python-paths.patch
+Adjust-package-names.patch
+Use-our-custom-cpk-install-package-name.patch
+Don-t-blindly-listen-to-any-signal.patch

More information about the pkg-gnome-commits mailing list