From 825fa4e9a4121f568805355434794935cbdb26df Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Fri, 19 Feb 2010 13:46:44 +0000
Subject: [PATCH] - 1.1.92.

---
 .cvsignore                                  |   1 +
 sources                                     |   2 +-
 system-config-printer-1.1.91.tar.xz.sig     | Bin 65 -> 0 bytes
 system-config-printer-1.1.92.tar.xz.sig     | Bin 0 -> 65 bytes
 system-config-printer-device-settings.patch |  19 -------------------
 system-config-printer.spec                  |  13 +++++++------
 6 files changed, 9 insertions(+), 26 deletions(-)
 delete mode 100644 system-config-printer-1.1.91.tar.xz.sig
 create mode 100644 system-config-printer-1.1.92.tar.xz.sig
 delete mode 100644 system-config-printer-device-settings.patch

diff --git a/.cvsignore b/.cvsignore
index b68029a..aaa1517 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -212,3 +212,4 @@ system-config-printer-1.1.16.tar.xz
 pycups-1.9.48.tar.bz2
 system-config-printer-1.1.90.tar.xz
 system-config-printer-1.1.91.tar.xz
+system-config-printer-1.1.92.tar.xz
diff --git a/sources b/sources
index aabed93..1a5b178 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 2e9ed692c75328e7fb88f8c230f70990  pycups-1.9.48.tar.bz2
-22c3cbe13faa3ef0935564de1b553fb9  system-config-printer-1.1.91.tar.xz
+773811075ef52e9afd540a6583cf647f  system-config-printer-1.1.92.tar.xz
diff --git a/system-config-printer-1.1.91.tar.xz.sig b/system-config-printer-1.1.91.tar.xz.sig
deleted file mode 100644
index a516382fa72f25b59250afaf13be687876e8db58..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65
zcmV-H0KWf-KLZ5-OK?lE1hg7`no8Q&5dv0o0H1mr|9Vm+9%>oyO8K5J2#TeA=wbk%
XnGl>KS~Q<SA}N&F&X7+F0-OLTA<G!I

diff --git a/system-config-printer-1.1.92.tar.xz.sig b/system-config-printer-1.1.92.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..43b8a4bb56a434e531da4065d4e5db430e902762
GIT binary patch
literal 65
zcmV-H0KWf-KLZ5-OMa3l1hg7`no8Q&5dz~y0G$+_m(Cgnd7w9_$ncfLIrsbfFqZ(I
XOP^(I$#P{0`dYroI~}{Xa{WK^d-ooM

literal 0
HcmV?d00001

diff --git a/system-config-printer-device-settings.patch b/system-config-printer-device-settings.patch
deleted file mode 100644
index a0581d4..0000000
--- a/system-config-printer-device-settings.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up system-config-printer-1.1.91/system-config-printer.py.device-settings system-config-printer-1.1.91/system-config-printer.py
---- system-config-printer-1.1.91/system-config-printer.py.device-settings	2010-02-08 17:31:21.000000000 +0000
-+++ system-config-printer-1.1.91/system-config-printer.py	2010-02-11 17:18:45.101708282 +0000
-@@ -5049,11 +5049,13 @@ class NewPrinterGUI(GtkGUI):
-                 iter = model.iter_next (iter)
-                 i += 1
-         elif not self.device_selected:
-+            # Select the device.
-             column = self.tvNPDevices.get_column (0)
-             self.tvNPDevices.set_cursor ((0,), column)
- 
--        column = self.tvNPDeviceURIs.get_column (0)
--        self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
-+            # Select the connection.
-+            column = self.tvNPDeviceURIs.get_column (0)
-+            self.tvNPDeviceURIs.set_cursor (connection_select_path, column)
- 
-     def on_entNPTDevice_changed(self, entry):
-         self.setNPButtons()
diff --git a/system-config-printer.spec b/system-config-printer.spec
index 0cb9450..716a06b 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -6,8 +6,8 @@
 
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.1.91
-Release: 3%{?dist}
+Version: 1.1.92
+Release: 1%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -16,8 +16,7 @@ Source1: http://cyberelk.net/tim/data/pycups/pycups-%{pycups_version}.tar.bz2
 Source2: http://cyberelk.net/tim/data/pysmbc/pysmbc-%{pysmbc_version}.tar.bz2
 
 Patch1: system-config-printer-no-epydoc.patch
-Patch2: system-config-printer-device-settings.patch
-Patch3: system-config-printer-lowercase-mfg-mdl.patch
+Patch2: system-config-printer-lowercase-mfg-mdl.patch
 
 BuildRequires: cups-devel >= 1.2
 BuildRequires: python-devel >= 2.4
@@ -77,8 +76,7 @@ printers.
 %prep
 %setup -q -a 1 -a 2
 %patch1 -p1 -b .no-epydoc
-%patch2 -p1 -b .device-settings
-%patch3 -p1 -b .lowercase-mfg-mdl
+%patch2 -p1 -b .lowercase-mfg-mdl
 
 %build
 %configure --with-udev-rules --with-polkit-1
@@ -194,6 +192,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Fri Feb 19 2010 Tim Waugh <twaugh@redhat.com> - 1.1.92-1
+- 1.1.92.
+
 * Wed Feb 17 2010 Tim Waugh <twaugh@redhat.com> - 1.1.91-3
 - Convert MFG and MDL to lowercase before D-Bus call to work around
   bug #566217.