r43737 - in /attic/system-config-printer/debian: changelog patches/0003-Use-our-custom-cpk-install-package-name.patch patches/0007-fix-pk-package-name.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Wed Oct 22 12:18:17 2014
New Revision: 43737

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43737
Log:
Update to 1.4.6, refresh 0003-Use-our-custom-cpk-install-package-name.patch
again and fix some pkg name that should be installed via pk

Added:
    attic/system-config-printer/debian/patches/0007-fix-pk-package-name.patch
Modified:
    attic/system-config-printer/debian/changelog
    attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch
    attic/system-config-printer/debian/patches/series

Modified: attic/system-config-printer/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/changelog?rev=43737&op=diff
==============================================================================
--- attic/system-config-printer/debian/changelog	[utf-8] (original)
+++ attic/system-config-printer/debian/changelog	[utf-8] Wed Oct 22 12:18:17 2014
@@ -1,4 +1,4 @@
-system-config-printer (1.4.5-1) UNRELEASED; urgency=medium
+system-config-printer (1.4.6-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * Drop obsolete python-gnomekeyring Suggests, the package has been
@@ -17,8 +17,10 @@
     d/p/0007-scp-dbus-service-fix-dbus-signature-typo.patch: Merged upstream
   * Drop debian/patches/0008-fix-udevhelperdir.patch: The path is expanded
     properly
-
- -- Laurent Bigonville <bigon at debian.org>  Sun, 12 Oct 2014 12:04:08 +0200
+  * Add debian/patches/0007-fix-pk-package-name.patch: Fix the package names
+    that PackageKit should try to install
+
+ -- Laurent Bigonville <bigon at debian.org>  Wed, 22 Oct 2014 12:20:53 +0200
 
 system-config-printer (1.4.3-4) unstable; urgency=medium
 

Modified: attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch?rev=43737&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch	[utf-8] (original)
+++ attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch	[utf-8] Wed Oct 22 12:18:17 2014
@@ -8,7 +8,7 @@
 
 --- a/installpackage.py
 +++ b/installpackage.py
-@@ -22,15 +22,11 @@
+@@ -22,9 +22,11 @@
  import os
  from gi.repository import GLib
  
@@ -16,14 +16,9 @@
 +
  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"
+-        raise RuntimeError, "Package installation not implemented"
 +        self.gpk_install_package_name = GPK_INSTALL_PACKAGE_NAME
  
      def InstallPackageName (self, xid, timestamp, name):
-         GLib.spawn_async ([self.gpk_install_package_name, name])
+-        raise RuntimeError, "Package installation not implemented"
++        GLib.spawn_async ([self.gpk_install_package_name, name])

Added: attic/system-config-printer/debian/patches/0007-fix-pk-package-name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0007-fix-pk-package-name.patch?rev=43737&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0007-fix-pk-package-name.patch	(added)
+++ attic/system-config-printer/debian/patches/0007-fix-pk-package-name.patch	[utf-8] Wed Oct 22 12:18:17 2014
@@ -0,0 +1,15 @@
+Description: Fix the package names that PackageKit should try to install
+Author: Laurent Bigonville <bigon at debian.org>
+Forwarded: not-needed
+
+--- a/newprinter.py
++++ b/newprinter.py
+@@ -1064,7 +1064,7 @@ class NewPrinterGUI(GtkGUI):
+                             not os.access ("/usr/lib/cups/backend/smb", os.F_OK)):
+                             try:
+                                 pk = installpackage.PackageKit ()
+-                                pk.InstallPackageName (0, 0, "samba-client")
++                                pk.InstallPackageName (0, 0, "smbclient")
+                             except:
+                                 pass
+ 

Modified: attic/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/series?rev=43737&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/series	[utf-8] (original)
+++ attic/system-config-printer/debian/patches/series	[utf-8] Wed Oct 22 12:18:17 2014
@@ -3,3 +3,4 @@
 0003-Use-our-custom-cpk-install-package-name.patch
 #0005-Fix-French-translation.patch
 0006-use-paper-size-default-in-etc-papersize.patch
+0007-fix-pk-package-name.patch