1.3.6.

Updated translations.
IPPAuthConnection: avoid traceback (Ubuntu #828030).
Allow entering @,?,=,& characters in Device URI text field
(Ubuntu #826958).
Removed PackageKit client code in missingPackagesAndExecutables
(bug #726938).
Properties dialog: make OK button sensitive even when no changes
to save (Ubuntu #444280).

.gitignore

@@ -234,3 +234,4 @@ pycups-1.9.51.tar.bz2
 /system-config-printer-1.3.3.tar.xz
 /system-config-printer-1.3.4.tar.xz
 /system-config-printer-1.3.5.tar.xz
+/system-config-printer-1.3.6.tar.xz

sources

@@ -1 +1,2 @@
 9d806643f17dc65a492a1d4e8a60f2ec  system-config-printer-1.3.5.tar.xz
+dc7a22fc1151f903b516e5cf40982d9d  system-config-printer-1.3.6.tar.xz

system-config-printer-bug726682.patch

@@ -1,11 +0,0 @@
-diff -up system-config-printer-1.3.5/serversettings.py.bug726682 system-config-printer-1.3.5/serversettings.py
---- system-config-printer-1.3.5/serversettings.py.bug726682	2011-07-28 17:04:13.000000000 +0100
-+++ system-config-printer-1.3.5/serversettings.py	2011-07-29 15:57:01.515904062 +0100
-@@ -23,6 +23,7 @@
- import config
- from gettext import gettext as _
- import cups
-+import dbus
- import gobject
- import gtk
- import os

system-config-printer-no-packagekit.patch

@@ -1,36 +0,0 @@
---- system-config-printer-1.3.5/cupshelpers/cupshelpers.py	2011-08-01 10:47:11.614519332 +0100
-+++ system-config-printer-1.3.5/cupshelpers/cupshelpers.py	2011-08-02 15:45:33.807623959 +0100
-@@ -21,7 +21,6 @@
- 
- import cups, pprint, os, tempfile, re, string
- import locale
--import packagekit.client, packagekit.enums
- from . import _debugprint
- 
- class Printer:
-@@ -829,24 +828,7 @@
-     missing executables
-     """
-     executables = missingExecutables(ppd)
--    packages = []
--    if executables:
--        unresolved_executables = []
--        client = packagekit.client.PackageKitClient ()
--        for executable in executables:
--            if not executable.startswith ("/"):
--                executable = "/usr/bin/" + executable
--
--            result = client.search_file ([executable],
--                                         packagekit.enums.FILTER_NOT_INSTALLED)
--            if result:
--                packages.extend (set (map (lambda x: x.name, result)))
--            else:
--                unresolved_executables.append (executable)
--
--        executables = unresolved_executables
--        
--    return (packages, executables)
-+    return ([], executables)
- 
- def _main():
-     c = cups.Connection()

system-config-printer.spec

@@ -1,14 +1,12 @@
 Summary: A printer administration tool
 Name: system-config-printer
-Version: 1.3.5
+Version: 1.3.6
-Release: 4%{?dist}
+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-bug726682.patch
-Patch3: system-config-printer-no-packagekit.patch
 BuildRequires: cups-devel >= 1.2
 BuildRequires: desktop-file-utils >= 0.2.92
 BuildRequires: gettext-devel
@@ -73,12 +71,6 @@ printers.
 # Don't start the applet in GNOME.
 %patch1 -p1 -b .no-applet-in-gnome
 
-# Import dbus in serversettings module (bug #726682).
-%patch2 -p1 -b .bug726682
-
-# Removed problematic PackageKit client support (bug #726996, bug #726938).
-%patch3 -p1 -b .no-packagekit
-
 %build
 %configure --with-udev-rules
 
@@ -205,6 +197,17 @@ if [ $1 -ge 1 ] ; then
 fi
 
 %changelog
+* Mon Aug 22 2011 Tim Waugh <twaugh@redhat.com> 1.3.6-1
+- 1.3.6:
+  - Updated translations.
+  - IPPAuthConnection: avoid traceback (Ubuntu #828030).
+  - Allow entering @,?,=,& characters in Device URI text field
+    (Ubuntu #826958).
+  - Removed PackageKit client code in missingPackagesAndExecutables
+    (bug #726938).
+  - Properties dialog: make OK button sensitive even when no changes
+    to save (Ubuntu #444280).
+
 * Mon Aug 15 2011 Tim Waugh <twaugh@redhat.com> 1.3.5-4
 - Removed redundant macros, spotted by Jiri Popelka.