r40103 - in /attic/system-config-printer/debian: changelog patches/0006-use-paper-size-default-in-etc-papersize.patch patches/0007-scp-dbus-service-fix-dbus-signature-typo.patch patches/series

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sat Oct 26 12:53:40 2013
New Revision: 40103

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40103
Log:
* New upstream release (Closes: #727556)
  - Fix some Unicode-related issues (Closes: #718263, #725882)
* d/p/0006-use-paper-size-default-in-etc-papersize.patch: Detect paper size
  using /etc/papersize if it's available, thanks to the Ubuntu guys
  (Closes: #593219)
* d/p/0007-scp-dbus-service-fix-dbus-signature-typo.patch: Fix typo in a
  D-Bus method signature (Taken from Ubuntu, thanks)

Added:
    attic/system-config-printer/debian/patches/0006-use-paper-size-default-in-etc-papersize.patch
    attic/system-config-printer/debian/patches/0007-scp-dbus-service-fix-dbus-signature-typo.patch
Modified:
    attic/system-config-printer/debian/changelog
    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=40103&op=diff
==============================================================================
--- attic/system-config-printer/debian/changelog	[utf-8] (original)
+++ attic/system-config-printer/debian/changelog	[utf-8] Sat Oct 26 12:53:40 2013
@@ -1,3 +1,15 @@
+system-config-printer (1.4.3-1) UNRELEASED; urgency=low
+
+  * New upstream release (Closes: #727556)
+    - Fix some Unicode-related issues (Closes: #718263, #725882)
+  * d/p/0006-use-paper-size-default-in-etc-papersize.patch: Detect paper size
+    using /etc/papersize if it's available, thanks to the Ubuntu guys
+    (Closes: #593219)
+  * d/p/0007-scp-dbus-service-fix-dbus-signature-typo.patch: Fix typo in a
+    D-Bus method signature (Taken from Ubuntu, thanks)
+
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 26 Oct 2013 14:04:46 +0200
+
 system-config-printer (1.4.1-4) unstable; urgency=low
 
   * Switch from pysupport to dh_python2

Added: attic/system-config-printer/debian/patches/0006-use-paper-size-default-in-etc-papersize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0006-use-paper-size-default-in-etc-papersize.patch?rev=40103&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0006-use-paper-size-default-in-etc-papersize.patch	(added)
+++ attic/system-config-printer/debian/patches/0006-use-paper-size-default-in-etc-papersize.patch	[utf-8] Sat Oct 26 12:53:40 2013
@@ -0,0 +1,31 @@
+Description: Use setting in /etc/papersize if available
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=593219
+Origin: vendor
+
+diff -Nur -x '*.orig' -x '*~' system-config-printer-1.2.3+20100723//cupshelpers/cupshelpers.py system-config-printer-1.2.3+20100723.new//cupshelpers/cupshelpers.py
+--- system-config-printer-1.2.3+20100723//cupshelpers/cupshelpers.py	2010-07-23 11:35:25.000000000 -0400
++++ system-config-printer-1.2.3+20100723.new//cupshelpers/cupshelpers.py	2010-10-29 12:50:35.731061356 -0400
+@@ -654,6 +654,23 @@
+     for each in letter:
+         if language == each:
+             size = 'Letter'
++
++    # Use setting in /etc/papersize if available
++    try:
++        f = open ("/etc/papersize")
++        for line in f:
++            if line.startswith("#"):
++                continue
++            if line.strip().lower().startswith("a4"):
++                size = 'A4'
++            elif line.strip().lower().startswith("letter"):
++                size = 'Letter'
++            elif line.strip() != "":
++                break
++        f.close()
++    except:
++        pass
++
+     try:
+         ppd.markOption ('PageSize', size)
+         _debugprint ("set PageSize = %s" % size)

Added: attic/system-config-printer/debian/patches/0007-scp-dbus-service-fix-dbus-signature-typo.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/system-config-printer/debian/patches/0007-scp-dbus-service-fix-dbus-signature-typo.patch?rev=40103&op=file
==============================================================================
--- attic/system-config-printer/debian/patches/0007-scp-dbus-service-fix-dbus-signature-typo.patch	(added)
+++ attic/system-config-printer/debian/patches/0007-scp-dbus-service-fix-dbus-signature-typo.patch	[utf-8] Sat Oct 26 12:53:40 2013
@@ -0,0 +1,16 @@
+Description: Fix typo in a D-Bus method signature
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/system-config-printer/+bug/1232947
+Origin: vendor
+
+diff -Nur -x '*.orig' -x '*~' system-config-printer-1.4.2+20130920/scp-dbus-service.py system-config-printer-1.4.2+20130920.new/scp-dbus-service.py
+--- system-config-printer-1.4.2+20130920/scp-dbus-service.py	2013-09-20 22:26:27.000000000 +0200
++++ system-config-printer-1.4.2+20130920.new/scp-dbus-service.py	2013-10-24 13:12:44.998717234 +0200
+@@ -367,7 +367,7 @@
+         pass
+ 
+     @dbus.service.signal(dbus_interface=CONFIG_NEWPRINTERDIALOG_IFACE,
+-                         signature='a{s}')
++                         signature='a(s)')
+     def DriverDownloadChecked(self, installed_files):
+         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=40103&op=diff
==============================================================================
--- attic/system-config-printer/debian/patches/series	[utf-8] (original)
+++ attic/system-config-printer/debian/patches/series	[utf-8] Sat Oct 26 12:53:40 2013
@@ -2,3 +2,5 @@
 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-scp-dbus-service-fix-dbus-signature-typo.patch