rev 15318 - in trunk/packages/kdeadmin/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2009-07-17 11:04:26 +0000 (Fri, 17 Jul 2009)
New Revision: 15318

Modified:
   trunk/packages/kdeadmin/debian/changelog
   trunk/packages/kdeadmin/debian/control
   trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
Log:
Prepare kdeadmin 4.2.96.
Refresh patch 01


Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2009-07-17 10:10:28 UTC (rev 15317)
+++ trunk/packages/kdeadmin/debian/changelog	2009-07-17 11:04:26 UTC (rev 15318)
@@ -1,16 +1,25 @@
-kdeadmin (4:4.2.4-2) UNRELEASED; urgency=low
+kdeadmin (4:4.2.96-1) experimental; urgency=low
 
+  * New upstream release.
+
   +++ Changes by Didier Raboud
+
   * Fix "gnome/gtk/glade dependencies" in system-config-printer-kde by
     including Josselin Mouette's patch to cope with system-config-printer
     split. (Closes: #525558)
 
   +++ Changes by Martin Alfke
+
   * Remove patch 03_set_knetworkconf_backends_scriptsdir.diff
     which has been included upstream
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 30 Jun 2009 17:20:52 +0200
+  +++ Changes by Fathi Boudra:
 
+  * Bump kdepimlibs-dev build dependency to >= 4:4.2.96.
+  * Bump Standards-Version from 3.8.1 to 3.8.2 (no changes needed).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 17 Jul 2009 12:17:57 +0200
+
 kdeadmin (4:4.2.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/kdeadmin/debian/control
===================================================================
--- trunk/packages/kdeadmin/debian/control	2009-07-17 10:10:28 UTC (rev 15317)
+++ trunk/packages/kdeadmin/debian/control	2009-07-17 11:04:26 UTC (rev 15318)
@@ -4,8 +4,8 @@
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Sune Vuorela <debian at pusling.com>, Fathi Boudra <fabo at debian.org>, Armin Berres <trigger+debian at space-based.de>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7), quilt, pkg-kde-tools (>= 0.4.2),
- kdepimlibs5-dev (>= 4:4.2.2), docbook-to-man, python-support
-Standards-Version: 3.8.1
+ kdepimlibs5-dev (>= 4:4.2.96), docbook-to-man, python-support
+Standards-Version: 3.8.2
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/trunk/packages/kdeadmin
 Vcs-Svn: svn://svn.debian.org/pkg-kde/trunk/packages/kdeadmin

Modified: trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff	2009-07-17 10:10:28 UTC (rev 15317)
+++ trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff	2009-07-17 11:04:26 UTC (rev 15318)
@@ -11,7 +11,7 @@
  print "Groovy"
 --- a/system-config-printer-kde/system-config-printer-kde.py
 +++ b/system-config-printer-kde/system-config-printer-kde.py
-@@ -34,7 +34,7 @@ import thread
+@@ -35,7 +35,7 @@ import sys, os, time, traceback, re, tem
  
  #load modules from system-config-printer-common (debug, smburi), change path here if you have it installed elsewhere
  SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/system-config-printer"
@@ -20,20 +20,21 @@
      sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
  
  from PyQt4.QtCore import *
-@@ -65,9 +65,10 @@ cups.require ("1.9.27")
+@@ -67,10 +67,11 @@ cups.require ("1.9.27")
  
  # These come from system-config-printer
  import config
--import cupshelpers  #, options
+-import cupshelpers, options
 +import cupsutils.ppds
-+from cupsutils import cupshelpers  #, options
++from cupsutils import cupshelpers, options
+ from optionwidgets import OptionWidget
  from smburi import SMBURI
 -from debug import *
 +from cupsutils.debug import *
  
  import dbus
  import dbus.mainloop.qt
-@@ -1695,7 +1696,7 @@ class NewPrinterGUI(QDialog):
+@@ -2297,7 +2298,7 @@ class NewPrinterGUI(QDialog):
              c = cups.Connection ()
              debugprint ("Fetching PPDs")
              ppds_dict = c.getPPDs()
@@ -42,7 +43,7 @@
                                                       language=language)
              debugprint ("Closing connection (PPDs)")
              del c
-@@ -1921,7 +1922,7 @@ class NewPrinterGUI(QDialog):
+@@ -2523,7 +2524,7 @@ class NewPrinterGUI(QDialog):
                          ppddict = self.ppds.getInfoFromPPDName (ppdname)
                          make_model = ppddict['ppd-make-and-model']
                          (make, model) = \
@@ -51,7 +52,7 @@
                          self.auto_make = make
                          self.auto_model = model
                  except:
-@@ -2293,7 +2294,7 @@ class NewPrinterGUI(QDialog):
+@@ -2892,7 +2893,7 @@ class NewPrinterGUI(QDialog):
          if make_and_model and not device.id:
              mk = None
              md = None