# ChangeLog for app-admin/system-config-printer-common
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.42 2011/08/10 21:07:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/ChangeLog,v 1.43 2011/08/22 23:46:39 reavertm Exp $
+
+*system-config-printer-common-1.3.6 (22 Aug 2011)
+
+ 22 Aug 2011; Maciej Mrozowski <reavertm@gentoo.org>
+ -system-config-printer-common-1.3.5.ebuild,
+ +system-config-printer-common-1.3.6.ebuild,
+ -files/0002-Make-PackageKit-optional-in-cupshelpers-bug-726996-U.patch,
+ -files/0004-Removed-PackageKit-client-code-in-missingPackagesAnd.patch:
+ Version bump, remove old
10 Aug 2011; Markus Meier <maekke@gentoo.org>
system-config-printer-common-1.3.3.ebuild:
+++ /dev/null
-From ddf4a4dcec27393e3c0c9efb032032cdb6b69d10 Mon Sep 17 00:00:00 2001
-From: Tim Waugh <twaugh@redhat.com>
-Date: Mon, 1 Aug 2011 10:42:57 +0100
-Subject: [PATCH 2/4] Make PackageKit optional in cupshelpers (bug #726996, Ubuntu #819000).
-
----
- cupshelpers/cupshelpers.py | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
-index 251e0ee..3b95e2f 100755
---- a/cupshelpers/cupshelpers.py
-+++ b/cupshelpers/cupshelpers.py
-@@ -21,8 +21,12 @@
-
- import cups, pprint, os, tempfile, re, string
- import locale
--import packagekit.client, packagekit.enums
- from . import _debugprint
-+try:
-+ import packagekit.client, packagekit.enums
-+ HAVE_PACKAGEKIT=True
-+except ImportError:
-+ HAVE_PACKAGEKIT=False
-
- class Printer:
- _flags_blacklist = ["options", "local"]
-@@ -830,7 +834,7 @@ def missingPackagesAndExecutables(ppd):
- """
- executables = missingExecutables(ppd)
- packages = []
-- if executables:
-+ if executables and HAVE_PACKAGEKIT:
- unresolved_executables = []
- client = packagekit.client.PackageKitClient ()
- for executable in executables:
---
-1.7.3.4
-
+++ /dev/null
-From b1420ee264d6c462454919492f53a506d7bce0e1 Mon Sep 17 00:00:00 2001
-From: Tim Waugh <twaugh@redhat.com>
-Date: Tue, 2 Aug 2011 15:43:11 +0100
-Subject: [PATCH 4/4] Removed PackageKit client code in missingPackagesAndExecutables (bug #726938).
-
-The PackageKit Python client module is hard-coded to set a default
-GLib main loop on import, which means it cannot be imported by a
-module that might be used by an application using a different main
-loop implementation, such as KDE's printer-applet.
----
- cupshelpers/cupshelpers.py | 24 +-----------------------
- 1 files changed, 1 insertions(+), 23 deletions(-)
-
-diff --git a/cupshelpers/cupshelpers.py b/cupshelpers/cupshelpers.py
-index 3b95e2f..bf6eda2 100755
---- a/cupshelpers/cupshelpers.py
-+++ b/cupshelpers/cupshelpers.py
-@@ -22,11 +22,6 @@
- import cups, pprint, os, tempfile, re, string
- import locale
- from . import _debugprint
--try:
-- import packagekit.client, packagekit.enums
-- HAVE_PACKAGEKIT=True
--except ImportError:
-- HAVE_PACKAGEKIT=False
-
- class Printer:
- _flags_blacklist = ["options", "local"]
-@@ -833,24 +828,7 @@ def missingPackagesAndExecutables(ppd):
- missing executables
- """
- executables = missingExecutables(ppd)
-- packages = []
-- if executables and HAVE_PACKAGEKIT:
-- 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()
---
-1.7.3.4
-
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.5.ebuild,v 1.1 2011/08/09 23:55:19 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-common/system-config-printer-common-1.3.6.ebuild,v 1.1 2011/08/22 23:46:39 reavertm Exp $
EAPI="3"
src_prepare() {
epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
- # Picked up from master just after tagging, remove for next release
- epatch "${FILESDIR}/0002-Make-PackageKit-optional-in-cupshelpers-bug-726996-U.patch"
- epatch "${FILESDIR}/0004-Removed-PackageKit-client-code-in-missingPackagesAnd.patch"
-
eautoreconf
}
# ChangeLog for app-admin/system-config-printer-gnome
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.29 2011/08/10 21:21:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/ChangeLog,v 1.30 2011/08/22 23:47:18 reavertm Exp $
+
+*system-config-printer-gnome-1.3.6 (22 Aug 2011)
+
+ 22 Aug 2011; Maciej Mrozowski <reavertm@gentoo.org>
+ -files/0001-Avoid-global-name-dbus-is-not-defined-traceback-in-s.patch,
+ -files/0003-Properties-dialog-make-OK-button-sensitive-even-when.patch,
+ -system-config-printer-gnome-1.3.5.ebuild,
+ +system-config-printer-gnome-1.3.6.ebuild:
+ Version bump, remove old
10 Aug 2011; Markus Meier <maekke@gentoo.org>
system-config-printer-gnome-1.3.3.ebuild:
+++ /dev/null
-From 895b66459b34b7f36dba1313212ec224c6662e3c Mon Sep 17 00:00:00 2001
-From: Tim Waugh <twaugh@redhat.com>
-Date: Fri, 29 Jul 2011 15:51:54 +0100
-Subject: [PATCH 1/4] Avoid "global name 'dbus' is not defined" traceback in serversettings.py (bgu #726682).
-
----
- serversettings.py | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/serversettings.py b/serversettings.py
-index 05db1ba..62d345f 100644
---- a/serversettings.py
-+++ b/serversettings.py
-@@ -23,6 +23,7 @@
- import config
- from gettext import gettext as _
- import cups
-+import dbus
- import gobject
- import gtk
- import os
---
-1.7.3.4
-
+++ /dev/null
-From 4ede66364b6987cb3013fa447fcdec09b3a638cb Mon Sep 17 00:00:00 2001
-From: Tim Waugh <twaugh@redhat.com>
-Date: Mon, 1 Aug 2011 14:04:49 +0100
-Subject: [PATCH 3/4] Properties dialog: make OK button sensitive even when no changes to save (Ubuntu #444280).
-
-Only becomes insensitive when there are conflicts.
----
- printerproperties.py | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/printerproperties.py b/printerproperties.py
-index ca40f31..9c055f9 100755
---- a/printerproperties.py
-+++ b/printerproperties.py
-@@ -619,7 +619,10 @@ class PrinterPropertiesDialog(GtkGUI):
-
- if (response == gtk.RESPONSE_OK or
- response == gtk.RESPONSE_APPLY):
-- failed = self.save_printer (self.printer)
-+ if (response == gtk.RESPONSE_OK and len (self.changed) == 0):
-+ failed = False
-+ else:
-+ failed = self.save_printer (self.printer)
-
- if response == gtk.RESPONSE_APPLY and not failed:
- try:
-@@ -957,8 +960,7 @@ class PrinterPropertiesDialog(GtkGUI):
-
- self.btnPrinterPropertiesApply.set_sensitive (len (self.changed) > 0 and
- not self.conflicts)
-- self.btnPrinterPropertiesOK.set_sensitive (len (self.changed) > 0 and
-- not self.conflicts)
-+ self.btnPrinterPropertiesOK.set_sensitive (not self.conflicts)
-
- def save_printer(self, printer, saveall=False, parent=None):
- if parent == None:
---
-1.7.3.4
-
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.5.ebuild,v 1.1 2011/08/09 23:56:08 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/system-config-printer-gnome/system-config-printer-gnome-1.3.6.ebuild,v 1.1 2011/08/22 23:47:18 reavertm Exp $
EAPI="3"
src_prepare() {
epatch "${FILESDIR}/${PN}-1.3.5-split.patch"
- # Picked up from master just after tagging, remove for next release
- epatch "${FILESDIR}/0001-Avoid-global-name-dbus-is-not-defined-traceback-in-s.patch"
- epatch "${FILESDIR}/0003-Properties-dialog-make-OK-button-sensitive-even-when.patch"
-
eautoreconf
}
projects / gentoo.git / commitdiff