rev 10969 - in kde-extras/guidance/trunk/debian: . lintian patches

Michael Meskes meskes at alioth.debian.org
Wed Jun 11 15:02:32 UTC 2008 

Author: meskes
Date: 2008-06-11 15:02:31 +0000 (Wed, 11 Jun 2008)
New Revision: 10969

Added:
   kde-extras/guidance/trunk/debian/displayconfigrc
   kde-extras/guidance/trunk/debian/guidance-backends.dirs
   kde-extras/guidance/trunk/debian/guidance-backends.init
   kde-extras/guidance/trunk/debian/guidance-backends.install
   kde-extras/guidance/trunk/debian/guidance-backends.postinst
   kde-extras/guidance/trunk/debian/kde-guidance-powermanager.dirs
   kde-extras/guidance/trunk/debian/kde-guidance.dirs
   kde-extras/guidance/trunk/debian/kde-guidance.links
   kde-extras/guidance/trunk/debian/lintian/
   kde-extras/guidance/trunk/debian/lintian/kde-guidance
   kde-extras/guidance/trunk/debian/patches/02_no_universe.diff
Removed:
   kde-extras/guidance/trunk/debian/dirs
   kde-extras/guidance/trunk/debian/kde-guidance.init
   kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides
   kde-extras/guidance/trunk/debian/kde-guidance.postinst
Modified:
   kde-extras/guidance/trunk/debian/changelog
   kde-extras/guidance/trunk/debian/control
   kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install
   kde-extras/guidance/trunk/debian/kde-guidance.install
   kde-extras/guidance/trunk/debian/patches/23_kde-powermanager_gpmhelper.patch
   kde-extras/guidance/trunk/debian/rules
Log:
Added guidance-backend package
Moved init script to new package because that's where the program is that is called during boot process.
Changed installation directory to integrate with python
Enabled grubconfig.
Cleaned up debian/rules.
Added displayconfigrc file to make kde-guidance use the X server setting
Fixed one patch to work with python 2.4.
Added patch to make wineconfig use apt-get instead of adept and not ask about universe.



Modified: kde-extras/guidance/trunk/debian/changelog
===================================================================
--- kde-extras/guidance/trunk/debian/changelog	2008-06-11 13:24:07 UTC (rev 10968)
+++ kde-extras/guidance/trunk/debian/changelog	2008-06-11 15:02:31 UTC (rev 10969)
@@ -1,3 +1,20 @@
+kde-guidance (0.8.0-4) unstable; urgency=low
+
+  * Added guidance-backend package, closes: #473797
+  * Moved init script to new package because that's where the program is
+    that is called during boot process.
+  * Changed installation directory to integrate with python,
+    closes: #475172, #463220
+  * Enabled grubconfig.
+  * Cleaned up debian/rules.
+  * Added displayconfigrc file to make kde-guidance use the X server setting,
+    closes: #405133
+  * Fixed one patch to work with python 2.4.
+  * Added patch to make wineconfig use apt-get instead of adept and not ask
+    about universe, closes: #445571
+
+ -- Michael Meskes <meskes at debian.org>  Wed, 11 Jun 2008 12:53:05 +0200
+
 kde-guidance (0.8.0-3) unstable; urgency=low
 
   [ Thomas Viehmann ]

Modified: kde-extras/guidance/trunk/debian/control
===================================================================
--- kde-extras/guidance/trunk/debian/control	2008-06-11 13:24:07 UTC (rev 10968)
+++ kde-extras/guidance/trunk/debian/control	2008-06-11 15:02:31 UTC (rev 10969)
@@ -14,7 +14,7 @@
 Package: kde-guidance
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- pykdeextensions, python-kde3, sysv-rc, python-qt-dev
+ pykdeextensions, python-kde3, sysv-rc, python-qt-dev, guidance-backends
 Provides: ${python:Provides}
 Conflicts: python2.4-iconvcodec
 Description: collection of KDE system administration tools for GNU/Linux
@@ -24,10 +24,20 @@
   o  serviceconfig - Service/daemon administration
   o  mountconfig - Disk and filesystem administration
   o  displayconfig - Screen and display configuration
+  o  wineconfig - Wine configuration
  .
  These tools are available in KDE Control Center, System Settings 
  or can be run as standalone applications.
 
+Package: guidance-backends
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
+Replaces: kde-guidance (<< 0.8.0-4)
+Description: collection of system administration tools for GNU/Linux
+ This package contains the platform neutral backends used in the
+ Guidance configuration tools.
+
 Package: kde-guidance-powermanager
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},

Deleted: kde-extras/guidance/trunk/debian/dirs

Added: kde-extras/guidance/trunk/debian/displayconfigrc
===================================================================
--- kde-extras/guidance/trunk/debian/displayconfigrc	                        (rev 0)
+++ kde-extras/guidance/trunk/debian/displayconfigrc	2008-06-11 15:02:31 UTC (rev 10969)
@@ -0,0 +1 @@
+dpi=xserver

Added: kde-extras/guidance/trunk/debian/guidance-backends.dirs
===================================================================
--- kde-extras/guidance/trunk/debian/guidance-backends.dirs	                        (rev 0)
+++ kde-extras/guidance/trunk/debian/guidance-backends.dirs	2008-06-11 15:02:31 UTC (rev 10969)
@@ -0,0 +1,4 @@
+usr/lib/python2.5/site-packages
+usr/share/python-support/guidance-backends
+usr/share/apps/guidance
+var/lib/guidance

Copied: kde-extras/guidance/trunk/debian/guidance-backends.init (from rev 10967, kde-extras/guidance/trunk/debian/kde-guidance.init)
===================================================================
--- kde-extras/guidance/trunk/debian/guidance-backends.init	                        (rev 0)
+++ kde-extras/guidance/trunk/debian/guidance-backends.init	2008-06-11 15:02:31 UTC (rev 10969)
@@ -0,0 +1,33 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          kde-guidance
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      1
+# Short-Description: displayconfig hardware probe
+# Description:       displayconfig hardware probe. This program should be run
+#                    during boot time. It quickly examines the graphics cards
+#                    (read: PCI devices) in the computer and compares they to
+#                    the list in the file guidance-gfxhardware-snapshot. If the
+#                    two lists differ then the Debian package manager is
+#                    automatically called to regenerate /etc/X11/xorg.conf.
+#                    This hopefully should mean that people can swap gfx cards
+#                    in and out and always have a system that will run Xorg.
+#                    (even though the config will be most likely be suboptimal.
+#                    Suboptimal is better than no X server).
+### END INIT INFO
+
+case "$1" in
+  start)
+  	/usr/share/python-support/guidance-backends/displayconfig-hwprobe.py
+	;;
+  stop)
+	;;
+  restart|force-reload)
+	;;
+  *)
+	;;
+esac
+
+exit 0

Added: kde-extras/guidance/trunk/debian/guidance-backends.install
===================================================================
--- kde-extras/guidance/trunk/debian/guidance-backends.install	                        (rev 0)
+++ kde-extras/guidance/trunk/debian/guidance-backends.install	2008-06-11 15:02:31 UTC (rev 10969)
@@ -0,0 +1,22 @@
+usr/share/apps/guidance/pcitable 
+usr/share/apps/guidance/Cards+
+usr/share/apps/guidance/MonitorsDB
+usr/share/apps/guidance/vesamodes
+usr/share/apps/guidance/extramodes
+usr/share/apps/guidance/widescreenmodes
+
+usr/lib/python2.5/site-packages/ixf86misc.so
+usr/lib/python2.5/site-packages/xf86misc.py usr/share/python-support/guidance-backends
+
+usr/share/apps/guidance/MicroHAL.py usr/share/python-support/guidance-backends
+usr/share/apps/guidance/ScanPCI.py usr/share/python-support/guidance-backends
+usr/share/apps/guidance/infimport.py usr/share/python-support/guidance-backends
+usr/share/apps/guidance/displayconfigabstraction.py usr/share/python-support/guidance-backends
+usr/share/apps/guidance/displayconfig-restore.py usr/share/python-support/guidance-backends
+usr/share/apps/guidance/drivedetect.py usr/share/python-support/guidance-backends
+usr/share/apps/guidance/execwithcapture.py usr/share/python-support/guidance-backends
+usr/share/apps/guidance/wineread.py usr/share/python-support/guidance-backends
+usr/share/apps/guidance/winewrite.py usr/share/python-support/guidance-backends
+usr/share/apps/guidance/xorgconfig.py usr/share/python-support/guidance-backends
+
+../../displayconfig/displayconfig-hwprobe.py usr/share/python-support/guidance-backends

Copied: kde-extras/guidance/trunk/debian/guidance-backends.postinst (from rev 10967, kde-extras/guidance/trunk/debian/kde-guidance.postinst)
===================================================================
--- kde-extras/guidance/trunk/debian/guidance-backends.postinst	                        (rev 0)
+++ kde-extras/guidance/trunk/debian/guidance-backends.postinst	2008-06-11 15:02:31 UTC (rev 10969)
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+# Remove shutdown and reboot links; this init script does not need them.
+rm -f /etc/rc0.d/K20kde-guidance /etc/rc6.d/K20kde-guidance
+
+#remove script from older times
+update-rc.d -f displayconfig-hwprobe.py remove
+update-rc.d -f kde-guidance remove
+
+#DEBHELPER#

Added: kde-extras/guidance/trunk/debian/kde-guidance-powermanager.dirs
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance-powermanager.dirs	                        (rev 0)
+++ kde-extras/guidance/trunk/debian/kde-guidance-powermanager.dirs	2008-06-11 15:02:31 UTC (rev 10969)
@@ -0,0 +1,2 @@
+usr/share/autostart
+

Modified: kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install	2008-06-11 13:24:07 UTC (rev 10968)
+++ kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install	2008-06-11 15:02:31 UTC (rev 10969)
@@ -1,13 +1,16 @@
 usr/bin/guidance-power-manager
+
 usr/share/icons/hicolor/22x22/apps/power-manager.png
-usr/share/apps/guidance/pics/ac-adapter.png
-usr/share/apps/guidance/pics/battery*.png
-usr/share/apps/guidance/pics/processor.png
-usr/share/autostart/guidance-power-manager.desktop
-usr/share/guidance/python/guidance-power-manager.py
-usr/share/guidance/python/guidance_power_manager_ui.py
-usr/share/guidance/python/notify.py
-usr/share/guidance/python/powermanage.py
-usr/share/guidance/python/powermanager_ui.py
-usr/share/guidance/python/tooltip.py
-usr/share/guidance/python/hal-test.py
+../../kde/powermanager/pics/ac-adapter.png usr/share/apps/guidance/pics
+../../kde/powermanager/pics/battery*.png usr/share/apps/guidance/pics
+../../kde/powermanager/pics/processor.png usr/share/apps/guidance/pics
+
+usr/share/apps/guidance/guidance-power-manager.py usr/share/python-support/kde-guidance-powermanager
+usr/share/apps/guidance/powermanage.py usr/share/python-support/kde-guidance-powermanager
+usr/share/apps/guidance/gpmhelper.py usr/share/python-support/kde-guidance-powermanager
+usr/share/apps/guidance/powermanager_ui.py usr/share/python-support/kde-guidance-powermanager
+
+../../powermanager/guidance_power_manager_ui.py usr/share/python-support/kde-guidance-powermanager
+../../powermanager/notify.py usr/share/python-support/kde-guidance-powermanager
+../../powermanager/tooltip.py usr/share/python-support/kde-guidance-powermanager
+../../powermanager/guidance-power-manager.desktop usr/share/autostart

Copied: kde-extras/guidance/trunk/debian/kde-guidance.dirs (from rev 10967, kde-extras/guidance/trunk/debian/dirs)
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.dirs	                        (rev 0)
+++ kde-extras/guidance/trunk/debian/kde-guidance.dirs	2008-06-11 15:02:31 UTC (rev 10969)
@@ -0,0 +1,3 @@
+usr/share/python-support/kde-guidance
+usr/bin
+etc/kde3

Deleted: kde-extras/guidance/trunk/debian/kde-guidance.init

Modified: kde-extras/guidance/trunk/debian/kde-guidance.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.install	2008-06-11 13:24:07 UTC (rev 10968)
+++ kde-extras/guidance/trunk/debian/kde-guidance.install	2008-06-11 15:02:31 UTC (rev 10969)
@@ -13,7 +13,17 @@
 usr/lib/kde3/kcm_wineconfig.so.0.0.0
 usr/lib/kde3/kcm_wineconfig.la
 usr/lib/kde3/kcm_wineconfig.a
-usr/lib/python*/site-packages/ixf86misc.so usr/lib/guidance/python/
+usr/lib/kde3/kcm_serviceconfig.so.0
+usr/lib/kde3/kcm_serviceconfig.so
+usr/lib/kde3/kcm_userconfig.so.0
+usr/lib/kde3/kcm_userconfig.so
+usr/lib/kde3/kcm_mountconfig.so.0
+usr/lib/kde3/kcm_mountconfig.so
+usr/lib/kde3/kcm_displayconfig.so.0
+usr/lib/kde3/kcm_displayconfig.so
+usr/lib/kde3/kcm_wineconfig.so.0
+usr/lib/kde3/kcm_wineconfig.so
+
 usr/share/icons/crystalsvg/16x16/apps/daemons.png
 usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
 usr/share/icons/crystalsvg/16x16/apps/userconfig.png
@@ -24,6 +34,7 @@
 usr/share/icons/crystalsvg/32x32/apps/userconfig.png
 usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
 usr/share/icons/crystalsvg/32x32/apps/wineconfig.png
+
 usr/share/doc/kde/HTML/en/guidance/index.cache.bz2
 usr/share/doc/kde/HTML/en/guidance/index.html
 usr/share/doc/kde/HTML/en/guidance/introduction.html
@@ -37,11 +48,13 @@
 usr/share/doc/kde/HTML/en/guidance/requirements.html
 usr/share/doc/kde/HTML/en/guidance/compilation.html
 usr/share/doc/kde/HTML/en/guidance/configuration.html
+
 usr/share/applications/kde/serviceconfig.desktop
 usr/share/applications/kde/userconfig.desktop
 usr/share/applications/kde/mountconfig.desktop
 usr/share/applications/kde/displayconfig.desktop
 usr/share/applications/kde/wineconfig.desktop
+
 usr/share/apps/guidance/pics/laserwarn.png
 usr/share/apps/guidance/pics/hi32-app-daemons.png
 usr/share/apps/guidance/pics/hi16-encrypted.png
@@ -102,52 +115,24 @@
 usr/share/apps/guidance/pics/displayconfig/gammapics/MGam20.png
 usr/share/apps/guidance/pics/displayconfig/gammapics/MGam22.png
 usr/share/apps/guidance/pics/displayconfig/gammapics/MGam24.png
-usr/share/apps/guidance/vesamodes
-usr/share/apps/guidance/extramodes
-usr/share/apps/guidance/widescreenmodes
-usr/share/apps/guidance/Cards+
-usr/share/apps/guidance/MonitorsDB
-usr/share/apps/guidance/pcitable
-usr/share/guidance/python/displayconfig-hwprobe.py
-usr/share/guidance/python/xf86misc.py
-usr/share/guidance/python/MicroHAL.py
-usr/share/guidance/python/SMBShareSelectDialog.py
-usr/share/guidance/python/ScanPCI.py
-usr/share/guidance/python/displayconfig-hwprobe.py
-usr/share/guidance/python/xf86misc.py
-usr/share/guidance/python/MicroHAL.py
-usr/share/guidance/python/SMBShareSelectDialog.py
-usr/share/guidance/python/ScanPCI.py
-usr/share/guidance/python/SimpleCommandRunner.py
-usr/share/guidance/python/displayconfig-restore.py
-usr/share/guidance/python/displayconfig.py
-usr/share/guidance/python/displayconfigabstraction.py
-usr/share/guidance/python/displayconfigwidgets.py
-usr/share/guidance/python/drivedetect.py
-usr/share/guidance/python/execwithcapture.py
-usr/share/guidance/python/fuser.py
-usr/share/guidance/python/fuser_ui.py
-#usr/share/guidance/python/grubconfig.py
-usr/share/guidance/python/ktimerdialog.py
-usr/share/guidance/python/mountconfig.py
-usr/share/guidance/python/servertestdialog.py
-usr/share/guidance/python/serviceconfig.py
-usr/share/guidance/python/sizeview.py
-usr/share/guidance/python/unixauthdb.py
-usr/share/guidance/python/userconfig.py
-usr/share/guidance/python/wineconfig.py
-usr/share/guidance/python/wineread.py
-usr/share/guidance/python/winewrite.py
-usr/share/guidance/python/xorgconfig.py
+
 etc/X11/Xsession.d/40guidance-displayconfig_restore
-usr/lib/kde3/kcm_serviceconfig.so.0
-usr/lib/kde3/kcm_serviceconfig.so
-usr/lib/kde3/kcm_userconfig.so.0
-usr/lib/kde3/kcm_userconfig.so
-usr/lib/kde3/kcm_mountconfig.so.0
-usr/lib/kde3/kcm_mountconfig.so
-usr/lib/kde3/kcm_displayconfig.so.0
-usr/lib/kde3/kcm_displayconfig.so
-usr/lib/kde3/kcm_wineconfig.so.0
-usr/lib/kde3/kcm_wineconfig.so
-usr/share/lintian/overrides/kde-guidance
+
+usr/share/apps/guidance/SMBShareSelectDialog.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/SimpleCommandRunner.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/displayconfig.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/displayconfigwidgets.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/fuser.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/fuser_ui.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/grubconfig.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/ktimerdialog.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/mountconfig.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/servertestdialog.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/serviceconfig.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/sizeview.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/unixauthdb.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/userconfig.py usr/share/python-support/kde-guidance
+usr/share/apps/guidance/wineconfig.py usr/share/python-support/kde-guidance
+
+../lintian/kde-guidance usr/share/lintian/overrides
+../displayconfigrc /etc/kde3

Added: kde-extras/guidance/trunk/debian/kde-guidance.links
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.links	                        (rev 0)
+++ kde-extras/guidance/trunk/debian/kde-guidance.links	2008-06-11 15:02:31 UTC (rev 10969)
@@ -0,0 +1,7 @@
+/usr/share/python-support/kde-guidance/displayconfig.py /usr/bin/displayconfig
+/usr/share/python-support/kde-guidance/mountconfig.py /usr/bin/mountconfig
+/usr/share/python-support/kde-guidance/serviceconfig.py /usr/bin/serviceconfig
+/usr/share/python-support/kde-guidance/userconfig.py /usr/bin/userconfig
+/usr/share/python-support/kde-guidance/wineconfig.py /usr/bin/wineconfig
+/usr/share/python-support/kde-guidance/grubconfig.py /usr/bin/grubconfig
+/usr/share/python-support/guidance-backends/displayconfig-restore.py /usr/bin/displayconfig-restore

Deleted: kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides

Deleted: kde-extras/guidance/trunk/debian/kde-guidance.postinst

Added: kde-extras/guidance/trunk/debian/lintian/kde-guidance
===================================================================
--- kde-extras/guidance/trunk/debian/lintian/kde-guidance	                        (rev 0)
+++ kde-extras/guidance/trunk/debian/lintian/kde-guidance	2008-06-11 15:02:31 UTC (rev 10969)
@@ -0,0 +1,3 @@
+# false positive warnings from lintian
+kde-guidance: postinst-has-useless-call-to-ldconfig
+kde-guidance: postrm-has-useless-call-to-ldconfig

Added: kde-extras/guidance/trunk/debian/patches/02_no_universe.diff
===================================================================
--- kde-extras/guidance/trunk/debian/patches/02_no_universe.diff	                        (rev 0)
+++ kde-extras/guidance/trunk/debian/patches/02_no_universe.diff	2008-06-11 15:02:31 UTC (rev 10969)
@@ -0,0 +1,45 @@
+diff -ruN kde-guidance-0.8.0.orig/wineconfig/wineconfig.py kde-guidance-0.8.0/wineconfig/wineconfig.py
+--- kde-guidance-0.8.0.orig/wineconfig/wineconfig.py	2008-06-11 16:42:30.000000000 +0200
++++ kde-guidance-0.8.0/wineconfig/wineconfig.py	2008-06-11 16:42:13.000000000 +0200
+@@ -96,8 +96,7 @@
+                     "can be used to run some programs designed for Windows.  " + \
+                     "Would you " + \
+                     "like to install it?\n" + \
+-                    "You will need administrative privileges, and the " + \
+-                    "community-maintained (universe) repository will be enabled."), \
++                    "You will need administrative privileges."), \
+                 i18n("Windows Applications"))
+             if install == KMessageBox.Yes:
+                 self.InstallWine()
+@@ -283,24 +282,17 @@
+             
+     def InstallWine(self):
+         """ Allows the user to enable the proper repositories and
+-        install wine.
+-        Currently Kubuntu specific, requires kdesudo, adept_batch
+-        and software-properties-kde """
++        install wine."""
+         if not isroot:
+-            if os.system("kdesudo \"software-properties-kde --enable-component universe\""):
++            if os.system("kdesudo \"apt-get -y install wine\""):
+                 KMessageBox.error(self, i18n("There was a problem running " + \
+-                    "software-properties-kde.  Make sure " + \
+-                    "software-properties-kde is installed."))
+-            elif os.system("kdesudo \"adept_batch install wine\""):
+-                KMessageBox.error(self, i18n("There was a problem running " + \
+-                    "adept_batch.  Make sure " + \
+-                    "Adept is installed."))
++                    "apt-get. Make sure " + \
++                    "apt-get is installed and configured."))
+         else:
+-            if os.system("software-properties-kde --enable-component=universe" + \
+-                " && adept_batch install wine"):
++            if os.system("apt-get -y install wine"):
+                 KMessageBox.error(self, i18n("There was a problem running " + \
+-                    "software-properties-kde and adept_batch.  Make sure " + \
+-                    "Adept and software-properties-kde are installed."))
++                    "apt-get. Make sure " + \
++                    "apt-get is installed and configured."))
+                     
+     def CreateWindowsInstall(self,winepath = None):
+         if not winepath:

Modified: kde-extras/guidance/trunk/debian/patches/23_kde-powermanager_gpmhelper.patch
===================================================================
--- kde-extras/guidance/trunk/debian/patches/23_kde-powermanager_gpmhelper.patch	2008-06-11 13:24:07 UTC (rev 10968)
+++ kde-extras/guidance/trunk/debian/patches/23_kde-powermanager_gpmhelper.patch	2008-06-11 15:02:31 UTC (rev 10969)
@@ -30,7 +30,7 @@
 +import gobject
 +from dcopext import DCOPClient, DCOPObj, DCOPApp
 +
-+class GPMHelper():
++class GPMHelper:
 +    def mother_alive(self):
 +        """Check that our mother is still alive"""
 +        found = False

Modified: kde-extras/guidance/trunk/debian/rules
===================================================================
--- kde-extras/guidance/trunk/debian/rules	2008-06-11 13:24:07 UTC (rev 10968)
+++ kde-extras/guidance/trunk/debian/rules	2008-06-11 15:02:31 UTC (rev 10969)
@@ -4,16 +4,16 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-DEB_INSTALL_MANPAGES_kde-guidance := debian/displayconfig.1 debian/mountconfig.1 debian/serviceconfig.1 debian/userconfig.1
-PYSUPPORT_PATH = $(DEB_DESTDIR)/usr/share/guidance/python
-DEB_PYTHON_PRIVATE_MODULES_DIRS = /usr/share/guidance/python /usr/lib/guidance/python
+DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
 
+DEB_INSTALL_MANPAGES_kde-guidance := debian/displayconfig.1  debian/mountconfig.1  debian/serviceconfig.1  debian/userconfig.1
+
 install/kde-guidance::
 	# install icons to right place
+	# with the files being renamed we cannot have dh_install handle this
 	install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/hi32-app-daemons.png \
 		$(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/daemons.png
 	install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/kcmpartitions.png \
@@ -27,52 +27,20 @@
 	install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
 		$(DEB_DESTDIR)/usr/share/icons/crystalsvg/16x16/apps/wineconfig.png
 
-	# install lintian overrides
-	install -D -p -m0644 debian/kde-guidance.lintian-overrides \
-		$(DEB_DESTDIR)/usr/share/lintian/overrides/kde-guidance
-
-	# install displayconfig-hwprobe.py script
-	install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
-		$(PYSUPPORT_PATH)/displayconfig-hwprobe.py
-
-	# copy python modules in PYSUPPORT_PATH
-	(for d in `ls -d $(DEB_DESTDIR)/usr/lib/python*`; do \
-		cp -f $$d/site-packages/*.py $(PYSUPPORT_PATH); done)
-	cp $(DEB_DESTDIR)/usr/share/apps/guidance/*.py $(PYSUPPORT_PATH)
-
-        # fix script-not-executable
-	chmod 0755 $(PYSUPPORT_PATH)/xf86misc.py
-	chmod 0755 $(PYSUPPORT_PATH)/displayconfigabstraction.py
-	chmod 0755 $(PYSUPPORT_PATH)/execwithcapture.py
-	chmod 0755 $(PYSUPPORT_PATH)/fuser.py
-	chmod 0755 $(PYSUPPORT_PATH)/ktimerdialog.py
-	chmod 0755 $(PYSUPPORT_PATH)/sizeview.py
-	chmod 0755 $(PYSUPPORT_PATH)/drivedetect.py
-	chmod 0755 $(PYSUPPORT_PATH)/wineread.py
-	chmod 0755 $(PYSUPPORT_PATH)/winewrite.py
-#	chmod 0755 $(PYSUPPORT_PATH)/grubconfig.py
-
 	# fix binary-or-shlib-defines-rpath
 	chrpath -d $(DEB_DESTDIR)/usr/lib/kde3/kcm_*.so.*
 
 	# fix executable-not-elf-or-script
 	chmod 0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/kdewinewizard.png
 
-	# fix the link properly
-	mkdir -p debian/kde-guidance/usr/bin
-	(cd debian/kde-guidance/usr/bin; ln -sf ../share/guidance/python/displayconfig.py displayconfig)
-	(cd debian/kde-guidance/usr/bin; ln -sf ../share/guidance/python/displayconfig-restore.py displayconfig-restore)
-	(cd debian/kde-guidance/usr/bin; ln -sf ../share/guidance/python/mountconfig.py mountconfig)
-	(cd debian/kde-guidance/usr/bin; ln -sf ../share/guidance/python/serviceconfig.py serviceconfig)
-	(cd debian/kde-guidance/usr/bin; ln -sf ../share/guidance/python/userconfig.py userconfig)
-	(cd debian/kde-guidance/usr/bin; ln -sf ../share/guidance/python/wineconfig.py wineconfig)
-#	(cd debian/kde-guidance/usr/bin; ln -sf ../share/guidance/python/grubconfig.py grubconfig)
+        # fix script-not-executable
+	chmod 0755 $(DEB_DESTDIR)/usr/share/apps/guidance/fuser.py
+	chmod 0755 $(DEB_DESTDIR)/usr/share/apps/guidance/grubconfig.py
 
-	# Replace all '#!' calls to python with /usr/bin/python
-	# and make them executable and add sys.path
-	# some care must be taken to not process twice
-	for i in $$(find debian/tmp -type f | xargs grep -L 'import sys ; sys.path\[:0\] = \["/usr/share/guidance/python/","/usr/lib/guidance/python/"\]' ); do \
-		sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1\n# -*- coding: UTF-8 -*-\nimport sys ; sys.path[:0] = ["/usr/share/guidance/python/"\,"/usr/lib/guidance/python/"],' \
+	: # Replace all '#!' calls to python with /usr/bin/python
+	: # and make them executable
+	for i in `find debian/kde-guidance -type f`; do \
+		sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
 			$$i > $$i.temp; \
 		if cmp --quiet $$i $$i.temp; then \
 			rm -f $$i.temp; \
@@ -87,34 +55,20 @@
 	# install icon to right place
 	install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
 		$(DEB_DESTDIR)/usr/share/icons/hicolor/22x22/apps/power-manager.png
-	install -D -p -m0644 kde/powermanager/pics/*.png \
-		$(DEB_DESTDIR)/usr/share/apps/guidance/pics/
 
-	# install desktop file
-	install -D -p -m0644 powermanager/guidance-power-manager.desktop \
-		$(DEB_DESTDIR)/usr/share/autostart/guidance-power-manager.desktop
-
-	# generate form implementation using pykde user interface compiler
-	(cd powermanager; kdepyuic guidance_power_manager_ui.ui)
-	(cd powermanager; kdepyuic tooltip.ui)
-	(cd powermanager; kdepyuic notify.ui)
-
-	# copy python modules in PYSUPPORT_PATH
-	cp powermanager/*.py $(PYSUPPORT_PATH)
-
 	# generate guidance-power-manager script
 	echo "#!/bin/sh" > $(DEB_DESTDIR)/usr/bin/guidance-power-manager
-	echo "/usr/share/guidance/python/guidance-power-manager.py &" >> $(DEB_DESTDIR)/usr/bin/guidance-power-manager
+	echo "/usr/share/python-support/kde-guidance-powermanager/guidance-power-manager.py &" >> $(DEB_DESTDIR)/usr/bin/guidance-power-manager
 	chmod +x $(DEB_DESTDIR)/usr/bin/guidance-power-manager
 
 	# fix script-not-executable
-	chmod 0755 $(PYSUPPORT_PATH)/powermanage.py
+	chmod 0755 $(DEB_DESTDIR)/usr/share/apps/guidance/powermanage.py
+	chmod 0755 $(DEB_DESTDIR)/usr/share/apps/guidance/gpmhelper.py
 
-	# Replace all '#!' calls to python with /usr/bin/python
-	# and make them executable and add sys.path
-	# some care must be taken to not process twice
-	for i in $$(find debian/tmp -type f | xargs grep -L 'import sys ; sys.path\[:0\] = \["/usr/share/guidance/python/","/usr/lib/guidance/python/"\]' ); do \
-		sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1\n# -*- coding: UTF-8 -*-\nimport sys ; sys.path[:0] = ["/usr/share/guidance/python/"\,"/usr/lib/guidance/python/"],' \
+	: # Replace all '#!' calls to python with /usr/bin/python
+	: # and make them executable
+	for i in `find debian/kde-guidance-powermanager -type f`; do \
+		sed '1s,#!.*python[^ ]*\(.*\),#! /usr/bin/python\1,' \
 			$$i > $$i.temp; \
 		if cmp --quiet $$i $$i.temp; then \
 			rm -f $$i.temp; \
@@ -138,13 +92,25 @@
 	rm -f po/*.pot
 
 common-install-prehook-impl::
+	# generate form implementation using pykde user interface compiler
+	(cd powermanager; kdepyuic guidance_power_manager_ui.ui)
+	(cd powermanager; kdepyuic tooltip.ui)
+	(cd powermanager; kdepyuic notify.ui)
+
 	mkdir -p po
-	-XGETTEXT=/usr/bin/kde-xgettext EXTRACTATTR=/usr/bin/extractattr sh $(DEB_SRCDIR)/admin/cvs.sh extract-messages
-	-for file in po/*pot; do \
+	touch list
+	find -name "*.py" >> list
+	xgettext -ki18n -LPython -flist -o po/guidance.pot
+	rm list
+
+	for file in po/*pot; do \
 		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
 	done
 
-get-orig-source-dpatch:
+	rm -f kde-guidance/usr/share/python-support/kde-guidance/.version
+	rm -f kde-guidance/usr/share/python-support/kde-guidance-powermanager/.version
+
+get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]
 	@@dpatch-get-origtargz ../tarballs

More information about the pkg-kde-commits mailing list