From 94b3591aeed1b38cb9c4cd3a374f7c1d2853f66c Mon Sep 17 00:00:00 2001 From: Tim Waugh Date: Mon, 22 Aug 2011 19:16:31 +0100 Subject: [PATCH] 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 | 1 + sources | 1 + system-config-printer-1.3.5.tar.xz.sig | Bin 280 -> 0 bytes system-config-printer-1.3.6.tar.xz.sig | Bin 0 -> 280 bytes system-config-printer-bug726682.patch | 11 ------- system-config-printer-no-packagekit.patch | 36 ---------------------- system-config-printer.spec | 23 ++++++++------ 7 files changed, 15 insertions(+), 57 deletions(-) delete mode 100644 system-config-printer-1.3.5.tar.xz.sig create mode 100644 system-config-printer-1.3.6.tar.xz.sig delete mode 100644 system-config-printer-bug726682.patch delete mode 100644 system-config-printer-no-packagekit.patch diff --git a/.gitignore b/.gitignore index 22c5a7d..6820c1d 100644 --- a/.gitignore +++ b/.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 diff --git a/sources b/sources index 71db351..ed1fab5 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 9d806643f17dc65a492a1d4e8a60f2ec system-config-printer-1.3.5.tar.xz +dc7a22fc1151f903b516e5cf40982d9d system-config-printer-1.3.6.tar.xz diff --git a/system-config-printer-1.3.5.tar.xz.sig b/system-config-printer-1.3.5.tar.xz.sig deleted file mode 100644 index 433548cc92afca1e9771f7d7057ac9ba211d1d74..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmV+z0q6dS0TlxU08TQObMD2Fs`TEJECB)+?+5)GH&d~mlDSGfXk+lvw1#g@RIok( z_bMy|DV)kB8xU;=WVEUfR`6fpF#~)I%Sg1!)TU#)7*(qnh3XP0tUGhxu@w}y?Q6*O z*V)?s7>9Wr4W7bognG>Zia}D3w73qJ&VY4tVu5frGtHhXJApR=Ecl|?QqlB9e%_$x zEsdJ66IMw7AmV;G+SOa-+9jQ8yxC=7KtmyL#H2Jhw6dwMPPM4%nMdEin*_8&RwFx!}qV^S@b+o6U=^htGgrf$li-`WM^*9m`WKG eQ4sBaprHK-(i`zC7*!tcf6!(cSm!XYpe<;e+JI;qxO=;d{>_Dsn`vb%8_#5lX#A zmO9DL8^11rb63qEZB#!MxjJGa$$$a z@bB*qnAsG7T`7e1%T~x+L$XeM;!h4Xdr9_!M_@w%yzDH@gGfhs4}M#dnRl)xm!<-s e>@wlC3f^==E+{CU>oxP|k1AnEo-*02g>v|@nT5ju literal 0 HcmV?d00001 diff --git a/system-config-printer-bug726682.patch b/system-config-printer-bug726682.patch deleted file mode 100644 index 3b6e2ed..0000000 --- a/system-config-printer-bug726682.patch +++ /dev/null @@ -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 diff --git a/system-config-printer-no-packagekit.patch b/system-config-printer-no-packagekit.patch deleted file mode 100644 index 8482ad8..0000000 --- a/system-config-printer-no-packagekit.patch +++ /dev/null @@ -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() diff --git a/system-config-printer.spec b/system-config-printer.spec index 6b89064..4b39cdb 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.5 -Release: 4%{?dist} +Version: 1.3.6 +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 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 1.3.5-4 - Removed redundant macros, spotted by Jiri Popelka.