rev 12938 - in branches/kde4.2/packages/kdeadmin/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-12-14 14:22:02 +0000 (Sun, 14 Dec 2008)
New Revision: 12938

Modified:
   branches/kde4.2/packages/kdeadmin/debian/changelog
   branches/kde4.2/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
Log:
Remove patch hunk. Bug fixed upstream

Modified: branches/kde4.2/packages/kdeadmin/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/changelog	2008-12-14 14:08:57 UTC (rev 12937)
+++ branches/kde4.2/packages/kdeadmin/debian/changelog	2008-12-14 14:22:02 UTC (rev 12938)
@@ -1,4 +1,4 @@
-kdeadmin (4:4.1.85+svn896376-0r1) UNRELEASED; urgency=low
+kdeadmin (4:4.1.85+svn896376-0r2) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -12,7 +12,7 @@
     - add 01_system_config_printer_kde_cupsutils.diff patch to fix import
       paths of cupshelpers which are cupsutils on Debian.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Dec 2008 23:57:46 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 14 Dec 2008 16:19:35 +0200
 
 kdeadmin (4:4.1.3-1) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff	2008-12-14 14:08:57 UTC (rev 12937)
+++ branches/kde4.2/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff	2008-12-14 14:22:02 UTC (rev 12938)
@@ -33,19 +33,6 @@
  
  import dbus
  import dbus.mainloop.qt
-@@ -1311,9 +1312,9 @@
-         printer = self.printer
-         self.lblPMakeModel.setText(printer.make_and_model)
-         state = self.printer_states.get (printer.state, i18nc("Printer state", "Unknown"))
--	reason = printer.other_attributes.get ('printer-state-message', '')
--	if len (reason) > 0:
--	    state += ' - ' + reason
-+	    reason = printer.other_attributes.get ('printer-state-message', '')
-+#	    if len (reason) > 0:
-+#	        state += ' - ' + reason
-         self.lblPState.setText(state)
-         if len (self.changed) == 0:
-             debugprint ("no changes yet: full printer properties update")
 @@ -1695,7 +1696,7 @@
              c = cups.Connection ()
              debugprint ("Fetching PPDs")