r45847 - in /attic/system-config-printer/debian: ./ patches/

[ah at users.alioth.debian.org]

Author: ah
Date: Sat Sep  5 23:03:45 2015
New Revision: 45847

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=45847
Log:
* New upstream release.
* Drop patches obsoleted by upstream changes:
  - 0003-Use-our-custom-cpk-install-package-name.patch
  - 0008-return-exception-rather-than-looping.patch
* Refresh patches via quilt
* Fix package description spelling error caught by lintian
  - Insert 'one' in ... allow one to...

Removed:
    attic/system-config-printer/debian/patches/0003-Use-our-custom-cpk-install-package-name.patch
    attic/system-config-printer/debian/patches/0008-return-exception-rather-than-looping.patch
Modified:
    attic/system-config-printer/debian/changelog
    attic/system-config-printer/debian/control.in
    attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch
    attic/system-config-printer/debian/patches/0007-fix-pk-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=45847&op=diff
==============================================================================
--- attic/system-config-printer/debian/changelog	[utf-8] (original)
+++ attic/system-config-printer/debian/changelog	[utf-8] Sat Sep  5 23:03:45 2015
@@ -1,3 +1,15 @@
+system-config-printer (1.4.8-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Drop patches obsoleted by upstream changes:
+    - 0003-Use-our-custom-cpk-install-package-name.patch
+    - 0008-return-exception-rather-than-looping.patch
+  * Refresh patches via quilt
+  * Fix package description spelling error caught by lintian
+    - Insert 'one' in ... allow one to...
+
+ -- Andreas Henriksson <andreas at fatal.se>  Sun, 06 Sep 2015 00:38:26 +0200
+
 system-config-printer (1.4.6-1) unstable; urgency=medium
 
   [ Dmitry Shachnev ]

Modified: attic/system-config-printer/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/control.in?rev=45847&op=diff
==============================================================================
--- attic/system-config-printer/debian/control.in	[utf-8] (original)
+++ attic/system-config-printer/debian/control.in	[utf-8] Sat Sep  5 23:03:45 2015
@@ -80,6 +80,6 @@
          python-dbus
 Conflicts: hal-cups-utils (<< 0.6.17)
 Description: Utilities to detect and configure printers automatically
- These utilities allow to detect automatically printers using UDEV when they
- are plugged on the system. They are then configured automatically in the CUPS
- printing daemon and made available to users.
+ These utilities allow one to detect automatically printers using UDEV when
+ they are plugged on the system. They are then configured automatically in
+ the CUPS printing daemon and made available to users.

Modified: 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=45847&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch	[utf-8] (original)
+++ attic/system-config-printer/debian/patches/0002-Disable-firewall-checks.patch	[utf-8] Sat Sep  5 23:03:45 2015
@@ -8,7 +8,7 @@
 
 --- a/firewallsettings.py
 +++ b/firewallsettings.py
-@@ -222,21 +222,10 @@
+@@ -225,21 +225,10 @@
              pass
  
      def _check_any_allowed (self, search):

Modified: 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=45847&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/0007-fix-pk-package-name.patch	[utf-8] (original)
+++ attic/system-config-printer/debian/patches/0007-fix-pk-package-name.patch	[utf-8] Sat Sep  5 23:03:45 2015
@@ -4,12 +4,12 @@
 
 --- a/newprinter.py
 +++ b/newprinter.py
-@@ -1064,7 +1064,7 @@ class NewPrinterGUI(GtkGUI):
-                             not os.access ("/usr/lib/cups/backend/smb", os.F_OK)):
+@@ -1070,7 +1070,7 @@
+                             debugprint ("No smb backend so attempting install")
                              try:
                                  pk = installpackage.PackageKit ()
 -                                pk.InstallPackageName (0, 0, "samba-client")
 +                                pk.InstallPackageName (0, 0, "smbclient")
                              except:
-                                 pass
+                                 nonfatalException ()
  

Modified: attic/system-config-printer/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/series?rev=45847&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/series	[utf-8] (original)
+++ attic/system-config-printer/debian/patches/series	[utf-8] Sat Sep  5 23:03:45 2015
@@ -1,7 +1,5 @@
 0001-Adjust-python-paths.patch
 0002-Disable-firewall-checks.patch
-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
-0008-return-exception-rather-than-looping.patch