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

[Fathi Boudra]

Author: fabo
Date: 2009-05-02 23:37:56 +0000 (Sat, 02 May 2009)
New Revision: 14557

Modified:
   trunk/packages/kdeadmin/debian/changelog
   trunk/packages/kdeadmin/debian/control
   trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
   trunk/packages/kdeadmin/debian/patches/02_kuser_first_uid_gid_fix.diff
Log:
Prepare kdeadmin 4.2.3
Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed).


Modified: trunk/packages/kdeadmin/debian/changelog
===================================================================
--- trunk/packages/kdeadmin/debian/changelog	2009-05-02 19:11:35 UTC (rev 14556)
+++ trunk/packages/kdeadmin/debian/changelog	2009-05-02 23:37:56 UTC (rev 14557)
@@ -1,4 +1,4 @@
-kdeadmin (4:4.2.2-2) UNRELEASED; urgency=low
+kdeadmin (4:4.2.3-1) UNRELEASED; urgency=low
 
   +++ Changes by Sune Vuorela:
 
@@ -7,10 +7,14 @@
 
   +++ Changes by Modestas Vainius:
 
-  * Fix kuser to start UID/GID at 1000 when adding new users (Closes: #434883).
+  * Fix kuser to start UID/GID at 1000 when adding new users. (Closes: #434883)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 19 Apr 2009 23:15:03 +0300
+  +++ Changes by Fathi Boudra:
 
+  * Bump Standards-Version from 3.8.0 to 3.8.1 (no changes needed).
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 02 May 2009 20:59:18 +0200
+
 kdeadmin (4:4.2.2-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/packages/kdeadmin/debian/control
===================================================================
--- trunk/packages/kdeadmin/debian/control	2009-05-02 19:11:35 UTC (rev 14556)
+++ trunk/packages/kdeadmin/debian/control	2009-05-02 23:37:56 UTC (rev 14557)
@@ -5,7 +5,7 @@
 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>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 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.0
+Standards-Version: 3.8.1
 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-05-02 19:11:35 UTC (rev 14556)
+++ trunk/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff	2009-05-02 23:37:56 UTC (rev 14557)
@@ -1,6 +1,6 @@
 --- a/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
 +++ b/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
-@@ -8,7 +8,7 @@
+@@ -8,7 +8,7 @@ SYSTEM_CONFIG_PRINTER_DIR = "/usr/share/
  sys.path.append (SYSTEM_CONFIG_PRINTER_DIR)
  
  try:
@@ -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 @@
+@@ -34,7 +34,7 @@ import thread
  
  #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,7 +20,7 @@
      sys.path.append(SYSTEM_CONFIG_PRINTER_DIR)
  
  from PyQt4.QtCore import *
-@@ -65,9 +65,10 @@
+@@ -65,9 +65,10 @@ cups.require ("1.9.27")
  
  # These come from system-config-printer
  import config
@@ -33,7 +33,7 @@
  
  import dbus
  import dbus.mainloop.qt
-@@ -1695,7 +1696,7 @@
+@@ -1695,7 +1696,7 @@ class NewPrinterGUI(QDialog):
              c = cups.Connection ()
              debugprint ("Fetching PPDs")
              ppds_dict = c.getPPDs()
@@ -42,7 +42,7 @@
                                                       language=language)
              debugprint ("Closing connection (PPDs)")
              del c
-@@ -1921,7 +1922,7 @@
+@@ -1921,7 +1922,7 @@ class NewPrinterGUI(QDialog):
                          ppddict = self.ppds.getInfoFromPPDName (ppdname)
                          make_model = ppddict['ppd-make-and-model']
                          (make, model) = \
@@ -51,7 +51,7 @@
                          self.auto_make = make
                          self.auto_model = model
                  except:
-@@ -2293,7 +2294,7 @@
+@@ -2293,7 +2294,7 @@ class NewPrinterGUI(QDialog):
          if make_and_model and not device.id:
              mk = None
              md = None

Modified: trunk/packages/kdeadmin/debian/patches/02_kuser_first_uid_gid_fix.diff
===================================================================
--- trunk/packages/kdeadmin/debian/patches/02_kuser_first_uid_gid_fix.diff	2009-05-02 19:11:35 UTC (rev 14556)
+++ trunk/packages/kdeadmin/debian/patches/02_kuser_first_uid_gid_fix.diff	2009-05-02 23:37:56 UTC (rev 14557)
@@ -2,7 +2,7 @@
 
 --- a/kuser/CMakeLists.txt
 +++ b/kuser/CMakeLists.txt
-@@ -17,8 +17,8 @@
+@@ -17,8 +17,8 @@ set(KU_HOMEDIR_PERM 0700 CACHE STRING "D
  set(KU_MAILBOX_GID 0 CACHE STRING "Default GID of the created mbox file")
  set(KU_MAILBOX_PERM 0660 CACHE STRING "Default mbox file permissions")
  set(KU_HOMETEMPLATE "/home/%u" CACHE STRING "Default home directory template")