From 4e2ace70f4d026d7474021a5780442f20609ca9d Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@redhat.com>
Date: Thu, 1 Mar 2012 14:29:07 +0000
Subject: [PATCH] 1.3.9.

- Updated translations.
- Improved check-device-ids output.
- Removed incorrect warning when using CUPS >= 1.5.3.
---
 .gitignore                                  |   1 +
 sources                                     |   2 +-
 system-config-printer-1.3.8-debuginfo.patch |  39 --------------------
 system-config-printer-1.3.8.tar.xz.sig      | Bin 280 -> 0 bytes
 system-config-printer-1.3.9.tar.xz.sig      | Bin 0 -> 280 bytes
 system-config-printer-ppdcache-enoent.patch |  31 ----------------
 system-config-printer.spec                  |  16 ++++----
 7 files changed, 10 insertions(+), 79 deletions(-)
 delete mode 100644 system-config-printer-1.3.8-debuginfo.patch
 delete mode 100644 system-config-printer-1.3.8.tar.xz.sig
 create mode 100644 system-config-printer-1.3.9.tar.xz.sig
 delete mode 100644 system-config-printer-ppdcache-enoent.patch

diff --git a/.gitignore b/.gitignore
index ffac9a1..c00d606 100644
--- a/.gitignore
+++ b/.gitignore
@@ -237,3 +237,4 @@ pycups-1.9.51.tar.bz2
 /system-config-printer-1.3.6.tar.xz
 /system-config-printer-1.3.7.tar.xz
 /system-config-printer-1.3.8.tar.xz
+/system-config-printer-1.3.9.tar.xz
diff --git a/sources b/sources
index d55a65c..826b202 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ca04568dd7ff1ef7a381ad637d4e915b  system-config-printer-1.3.8.tar.xz
+df424f127eede63965608e5ec5e27519  system-config-printer-1.3.9.tar.xz
diff --git a/system-config-printer-1.3.8-debuginfo.patch b/system-config-printer-1.3.8-debuginfo.patch
deleted file mode 100644
index 6c1c28f..0000000
--- a/system-config-printer-1.3.8-debuginfo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -up system-config-printer-1.3.8/newprinter.py.debuginfo system-config-printer-1.3.8/newprinter.py
---- system-config-printer-1.3.8/newprinter.py.debuginfo	2012-01-06 15:20:36.000000000 +0100
-+++ system-config-printer-1.3.8/newprinter.py	2012-01-30 15:44:03.860339396 +0100
-@@ -1429,7 +1429,7 @@ class NewPrinterGUI(GtkGUI):
-         new_environ['LC_ALL'] = "C"
-         new_environ['DISPLAY'] = ""
-         args = ["hp-info", "-x", "-i", "-d" + faxuri]
--        debugprint (faxuri + ": " + args)
-+        debugprint (faxuri + ": " + repr(args))
-         try:
-             p = subprocess.Popen (args, env=new_environ, close_fds=True,
-                                   stdin=file("/dev/null"),
-@@ -1459,7 +1459,7 @@ class NewPrinterGUI(GtkGUI):
- 
-     def get_hplip_scan_type_for_uri(self, uri):
-         args = ["hp-query", "-k", "scan-type", "-d", uri]
--        debugprint (uri + ": " + args)
-+        debugprint (uri + ": " + repr(args))
-         try:
-             p = subprocess.Popen (args, close_fds=True,
-                                   stdin=file("/dev/null"),
-@@ -1488,7 +1488,7 @@ class NewPrinterGUI(GtkGUI):
-         elif mode == "fax": mod = "-f"
-         else: mod = "-c"
-         args = ["hp-makeuri", mod, host]
--        debugprint (host + ": " + args)
-+        debugprint (host + ": " + repr(args))
-         uri = None
-         try:
-             p = subprocess.Popen (args, close_fds=True,
-@@ -1528,7 +1528,7 @@ class NewPrinterGUI(GtkGUI):
-         # Try to get make and model via SNMP
-         if host:
-             args = ["/usr/lib/cups/backend/snmp", host]
--            debugprint (host + ": " + args)
-+            debugprint (host + ": " + repr(args))
-             stdout = None
-             try:
-                 p = subprocess.Popen (args, close_fds=True,
diff --git a/system-config-printer-1.3.8.tar.xz.sig b/system-config-printer-1.3.8.tar.xz.sig
deleted file mode 100644
index 137dd84aac4fc366c9a7845e407cded0e41ac973..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 280
zcmV+z0q6dS0TlxU08bvWneN4rs`TEJECB*>dk6nh{{QBTpg8EuR-t(@xn}_$;deeI
zY_RGYXk?N;wm3}tC7F`2sXjtF_^h^%3-v!XQ}60XEw>1}B~qL>MY^dr8m*Kuew7O<
zHfKop3Q9TSu-eigm78_`YvgV^65&RMyd7<e>BJRM{hOugxI6TcmpIAkI;*-2f>>BH
z;)HQB_K^A8c?;KA(F`u(nUXRT5v37d9`%*hbUa1JF|~NOV^-n1@qjm5AY3HuaW(#D
zw5rxj#=-o_k-U7~#<>`c;j#25!x6^F%y9)@uk?qHNW@k3kEf;c@m^v3SPrLH{}Sd<
e(gHjsa_=Z;5$RKgi4k=Hi)pvTSGee77Ot&1O^s9l

diff --git a/system-config-printer-1.3.9.tar.xz.sig b/system-config-printer-1.3.9.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..c25031ea18900fcd2476250797e863303a759827
GIT binary patch
literal 280
zcmV+z0q6dS0TlxU08dYaBJRbJs`TEJECB*KN(cN6Bg_6bi$-HDVFJ5}wW?>w4K<)a
z$ehfr)l1;)>c>QO8ekvX#(#zWw8&J=d}?hPUb;f0S|KSfF?DM;o|@|*t<Pz>bCX6{
z&q&L<?Dh#RFTa-aJ-i#(^Neb^rk(|M{oSysVCG(>6@Lh`XrrihXtHG9(r`bOhx%-B
zQ}e037j%mEHUEVA8;RbJiHNYHqg|D)kX(>~p{_wzERHxs4pek=<(0Ps&jYW_0wNS!
zy_#drbuoton1(BC0hF#v#iGHCBf9WB;}j(zuE0;huE^L=oM!z2ag_^2Id<QuU3L3H
ekcVo7<K|X!6WY*|3~6IcLa~`Vqr&ZNlLEO*35!zz

literal 0
HcmV?d00001

diff --git a/system-config-printer-ppdcache-enoent.patch b/system-config-printer-ppdcache-enoent.patch
deleted file mode 100644
index e4c5354..0000000
--- a/system-config-printer-ppdcache-enoent.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up system-config-printer-1.3.8/ppdcache.py.ppdcache-enoent system-config-printer-1.3.8/ppdcache.py
---- system-config-printer-1.3.8/ppdcache.py.ppdcache-enoent	2011-10-26 13:14:20.000000000 +0100
-+++ system-config-printer-1.3.8/ppdcache.py	2012-02-03 15:40:36.215015934 +0000
-@@ -123,14 +123,20 @@ class PPDCache:
-                 # Store an open file object, then remove the actual
-                 # file.  This way we don't leave temporary files
-                 # around.
--                self._cache[name] = file (filename)
--                debugprint ("%s: caching %s (fd %d) "
--                            "(%s) - %s" % (self, filename,
--                                           self._cache[name].fileno (),
--                                           modtime, status))
--                os.unlink (filename)
--                self._modtimes[name] = modtime
-+                try:
-+                    self._cache[name] = file (filename)
-+                    debugprint ("%s: caching %s (fd %d) "
-+                                "(%s) - %s" % (self, filename,
-+                                               self._cache[name].fileno (),
-+                                               modtime, status))
-+                    os.unlink (filename)
-+                    self._modtimes[name] = modtime
-+                except IOError:
-+                    # File disappeared?
-+                    debugprint ("%s: file %s disappeared? Unable to cache it"
-+                                % (self, filename))
- 
-+            # Now fetch it from our own cache.
-             self.fetch_ppd (name, callback, check_uptodate=False)
-         else:
-             self._schedule_callback (callback, name,
diff --git a/system-config-printer.spec b/system-config-printer.spec
index d08407e..9db05fe 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,14 +1,12 @@
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.3.8
-Release: 4%{?dist}
+Version: 1.3.9
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
 Source0: http://cyberelk.net/tim/data/system-config-printer/1.3/%{name}-%{version}.tar.xz
 Patch1: system-config-printer-no-applet-in-gnome.patch
-Patch2: system-config-printer-1.3.8-debuginfo.patch
-Patch3: system-config-printer-ppdcache-enoent.patch
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: gettext-devel
@@ -64,10 +62,6 @@ printers.
 
 # Don't start the applet in GNOME.
 %patch1 -p1 -b .no-applet-in-gnome
-# Fix several debugprints (#785581)
-%patch2 -p1 -b .debugprint
-# Upstream patch to fix ppdcache traceback (bug #786232).
-%patch3 -p1 -b .ppdcache-enoent
 
 %build
 %configure --with-udev-rules
@@ -188,6 +182,12 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Thu Mar  1 2012 Tim Waugh <twaugh@redhat.com> 1.3.9-1
+- 1.3.9:
+  - Updated translations.
+  - Improved check-device-ids output.
+  - Removed incorrect warning when using CUPS >= 1.5.3.
+
 * Thu Feb 23 2012 Tim Waugh <twaugh@redhat.com> 1.3.8-4
 - Added version to python-cups dependency (bug #796678).