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

Modestas Vainius modax-guest at alioth.debian.org
Fri Dec 5 21:24:38 UTC 2008 

Author: modax-guest
Date: 2008-12-05 21:24:37 +0000 (Fri, 05 Dec 2008)
New Revision: 12856

Added:
   branches/kde4.2/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff
   branches/kde4.2/packages/kdeadmin/debian/patches/series
   branches/kde4.2/packages/kdeadmin/debian/system-config-printer-kde.install
Modified:
   branches/kde4.2/packages/kdeadmin/debian/changelog
   branches/kde4.2/packages/kdeadmin/debian/control
   branches/kde4.2/packages/kdeadmin/debian/installgen
   branches/kde4.2/packages/kdeadmin/debian/not-installed
   branches/kde4.2/packages/kdeadmin/debian/rules
Log:
Enable system-config-printer-kde

Modified: branches/kde4.2/packages/kdeadmin/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/changelog	2008-12-05 20:56:24 UTC (rev 12855)
+++ branches/kde4.2/packages/kdeadmin/debian/changelog	2008-12-05 21:24:37 UTC (rev 12856)
@@ -1,4 +1,4 @@
-kdeadmin (4:4.1.82+svn892103-0r1) UNRELEASED; urgency=low
+kdeadmin (4:4.1.82+svn892103-0r2) UNRELEASED; urgency=low
 
   * New upstream development snapshot.
 
@@ -8,8 +8,11 @@
   * Bump Standards-Version to 3.8.0: add README.source.
   * Remove explicit cmake build dependency.
   * Add debian/installgen.
+  * Add system-config-printer-kde utility (new package):
+    - 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, 28 Nov 2008 20:38:51 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Dec 2008 23:21:35 +0200
 
 kdeadmin (4:4.1.3-1) experimental; urgency=low
 

Modified: branches/kde4.2/packages/kdeadmin/debian/control
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/control	2008-12-05 20:56:24 UTC (rev 12855)
+++ branches/kde4.2/packages/kdeadmin/debian/control	2008-12-05 21:24:37 UTC (rev 12856)
@@ -4,7 +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>, Matthew Rosewarne <mrosewarne at inoutbox.com>
 Build-Depends: cdbs (>= 0.4.51), debhelper (>= 6), quilt,
- kdepimlibs5-dev (>= 4:4.1.80), docbook-to-man
+ kdepimlibs5-dev (>= 4:4.1.80), docbook-to-man,
+ python-kde4 (>= 4:4.1.82), python-qt4-dev (>= 4.4.4), python-cups, python-cupsutils
 Standards-Version: 3.8.0
 Homepage: http://www.kde.org/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/branches/kde4/packages/kdeadmin
@@ -16,6 +17,7 @@
 Depends: kcron (>= ${source:Version}), knetworkconf (>= ${source:Version}),
  kpackage (>= ${source:Version}), ksystemlog (>= ${source:Version}),
  kuser (>= ${source:Version})
+Recommends: system-config-printer-kde (>= ${source:Version})
 Description: system administration tools from the official KDE 4 release
  KDE is produced by an international technology team that creates free and open
  source software for desktop and portable computing. Among KDE's products are a
@@ -85,6 +87,17 @@
  .
  This package is part of the KDE 4 administration module.
 
+Package: system-config-printer-kde
+Section: admin
+Architecture: all
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends},
+ python-kde4 (>= 4:4.1.82), system-config-printer
+Description: KDE 4 printer configuration utility
+ This package contains a KDE4 based application which can be used to configure
+ and manage printers.
+ .
+ This package is part of the KDE 4 administration module.
+
 Package: kdeadmin-dbg
 Section: libdevel
 Architecture: any

Modified: branches/kde4.2/packages/kdeadmin/debian/installgen
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/installgen	2008-12-05 20:56:24 UTC (rev 12855)
+++ branches/kde4.2/packages/kdeadmin/debian/installgen	2008-12-05 21:24:37 UTC (rev 12856)
@@ -14,5 +14,8 @@
 [kuser]
 from:/kuser/
 
+[system-config-printer-kde]
+from:/system-config-printer-kde/
+
 [lilo-config_virtual]
 missing from:/lilo-config/

Modified: branches/kde4.2/packages/kdeadmin/debian/not-installed
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/not-installed	2008-12-05 20:56:24 UTC (rev 12855)
+++ branches/kde4.2/packages/kdeadmin/debian/not-installed	2008-12-05 21:24:37 UTC (rev 12856)
@@ -1,16 +1,4 @@
-
-#secpoliciy is not shipped because it is useless
-./usr/bin/secpolicy
-
-
 #This file serves no purpose that we can see, and conflicts
 #with GNOME system tools, so be sure to leave it out.
 ./usr/lib/pkgconfig/system-tools-backends.pc
 
-#we don't currently ship lilo-config. Adding a build-dep on lilo makes these automatically built
-./usr/lib/kde4/kcm_lilo.so
-./usr/share/doc/kde4/HTML/en/lilo-config/common
-./usr/share/doc/kde4/HTML/en/lilo-config/index.cache.bz2
-./usr/share/doc/kde4/HTML/en/lilo-config/index.docbook
-./usr/share/kde4/services/lilo.desktop
-

Added: 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	                        (rev 0)
+++ branches/kde4.2/packages/kdeadmin/debian/patches/01_system_config_printer_kde_cupsutils.diff	2008-12-05 21:24:37 UTC (rev 12856)
@@ -0,0 +1,22 @@
+--- a/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
++++ b/system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py
+@@ -8,7 +8,7 @@
+ sys.path.append (SYSTEM_CONFIG_PRINTER_DIR)
+ 
+ try:
+-    import cupshelpers.ppds, cupshelpers.cupshelpers
++    import cupsutils.ppds, cupsutils.cupshelpers
+ except:
+     exit(1)
+ print "Groovy"
+--- a/system-config-printer-kde/system-config-printer-kde.py
++++ b/system-config-printer-kde/system-config-printer-kde.py
+@@ -65,7 +65,7 @@
+ 
+ # These come from system-config-printer
+ import config
+-import cupshelpers  #, options
++import cupsutils as cupshelpers  #, options
+ from smburi import SMBURI
+ from debug import *
+ 

Added: branches/kde4.2/packages/kdeadmin/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/patches/series	                        (rev 0)
+++ branches/kde4.2/packages/kdeadmin/debian/patches/series	2008-12-05 21:24:37 UTC (rev 12856)
@@ -0,0 +1 @@
+01_system_config_printer_kde_cupsutils.diff

Modified: branches/kde4.2/packages/kdeadmin/debian/rules
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/rules	2008-12-05 20:56:24 UTC (rev 12855)
+++ branches/kde4.2/packages/kdeadmin/debian/rules	2008-12-05 21:24:37 UTC (rev 12856)
@@ -1,4 +1,8 @@
 #!/usr/bin/make -f
 
+#DEB_CMAKE_EXTRA_FLAGS += -DINSTALL_SYSTEM_CONFIG_PRINTER=TRUE
+
 include debian/cdbs/kde.mk
 
+binary-install/system-config-printer-kde::
+	dh_pysupport -p$(cdbs_curpkg)

Added: branches/kde4.2/packages/kdeadmin/debian/system-config-printer-kde.install
===================================================================
--- branches/kde4.2/packages/kdeadmin/debian/system-config-printer-kde.install	                        (rev 0)
+++ branches/kde4.2/packages/kdeadmin/debian/system-config-printer-kde.install	2008-12-05 21:24:37 UTC (rev 12856)
@@ -0,0 +1,5 @@
+usr/bin/system-config-printer-kde
+usr/share/applications/kde4/system-config-printer-kde.desktop
+usr/share/kde4/apps/system-config-printer-kde/new-printer.ui
+usr/share/kde4/apps/system-config-printer-kde/system-config-printer-kde.py
+usr/share/kde4/apps/system-config-printer-kde/system-config-printer.ui

More information about the pkg-kde-commits mailing list