rev 4694 - in kde-extras/guidance: tags tags/0.7.0-1/debian
tags/0.7.0-1/debian/patches trunk/debian trunk/debian/patches
Fathi Boudra
fboudra-guest at costa.debian.org
Sun Oct 15 23:29:07 UTC 2006
Author: fboudra-guest
Date: 2006-10-15 23:29:06 +0000 (Sun, 15 Oct 2006)
New Revision: 4694
Added:
kde-extras/guidance/tags/0.7.0-1/
kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance-powermanager.install
kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance.install
kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance.postinst
kde-extras/guidance/tags/0.7.0-1/debian/patches/10_typos_setup.diff
kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install
kde-extras/guidance/trunk/debian/kde-guidance.install
kde-extras/guidance/trunk/debian/kde-guidance.postinst
kde-extras/guidance/trunk/debian/patches/10_typos_setup.diff
Removed:
kde-extras/guidance/tags/0.7.0-1/debian/patches/10_branch_r542306.diff
kde-extras/guidance/tags/0.7.0-1/debian/patches/11_password_expire.diff
kde-extras/guidance/trunk/debian/patches/10_branch_r542306.diff
kde-extras/guidance/trunk/debian/patches/11_password_expire.diff
Modified:
kde-extras/guidance/tags/0.7.0-1/debian/changelog
kde-extras/guidance/tags/0.7.0-1/debian/control
kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance.init
kde-extras/guidance/tags/0.7.0-1/debian/pyversions
kde-extras/guidance/tags/0.7.0-1/debian/rules
kde-extras/guidance/trunk/debian/changelog
kde-extras/guidance/trunk/debian/control
kde-extras/guidance/trunk/debian/kde-guidance.init
kde-extras/guidance/trunk/debian/pyversions
kde-extras/guidance/trunk/debian/rules
Log:
tags kde-guidance 0.7.0-1
Copied: kde-extras/guidance/tags/0.7.0-1 (from rev 4680, kde-extras/guidance/trunk)
Modified: kde-extras/guidance/tags/0.7.0-1/debian/changelog
===================================================================
--- kde-extras/guidance/trunk/debian/changelog 2006-10-14 02:07:07 UTC (rev 4680)
+++ kde-extras/guidance/tags/0.7.0-1/debian/changelog 2006-10-15 23:29:06 UTC (rev 4694)
@@ -1,9 +1,26 @@
-kde-guidance (0.6.7-4) UNRELEASED; urgency=low
+kde-guidance (0.7.0-1) unstable; urgency=low
- (NOT RELEASED YET)
+ * New upstream release (Closes: #386636)
* Update maintainers
* Maintainer: KDE Extras Team
* Uploaders: Mark Purcell and Fathi Boudra
+ * Put package in unstable
+ * Remove 10_branch_r542306.diff and 11_password_expire.diff patches
+ * Add 10_typos_setup.diff to fix typos in setup.py
+ * Sync with ubuntu package:
+ * add power manager applet
+ * remove stop script symlinks from rc0 and rc6
+ * control:
+ * add python-kde3-dev to build-depends
+ * add python-dbus and sysv-rc to depends
+ * add kde-guidance-powermanager package
+ * pyversions: replace "2.4-" by "2.4", since build fails using python 2.5,
+ problem to import kdedistutils
+ * rules:
+ * Don't add extra /usr prefix when creating symlinks for
+ {display,mount,service,user}config and displayconfig-restore
+ * add kde-guidance-powermanager install
+ * create a script to launch guidance-power-manager instead of a link
-- Fathi Boudra <fboudra at free.fr> Mon, 21 Aug 2006 10:34:01 +0200
Modified: kde-extras/guidance/tags/0.7.0-1/debian/control
===================================================================
--- kde-extras/guidance/trunk/debian/control 2006-10-14 02:07:07 UTC (rev 4680)
+++ kde-extras/guidance/tags/0.7.0-1/debian/control 2006-10-15 23:29:06 UTC (rev 4694)
@@ -5,13 +5,14 @@
Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), chrpath,
kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev,
- pykdeextensions, pyqt-tools, python-kde3, python-sip4-dev,
+ pykdeextensions, pyqt-tools, python-kde3, python-kde3-dev, python-sip4-dev,
python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
Standards-Version: 3.7.2
Package: kde-guidance
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions, python-kde3
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+ pykdeextensions, python-kde3, python-dbus, sysv-rc
Provides: ${python:Provides}
Description: collection of KDE system administration tools for GNU/Linux
Guidance currently consists of four programs designed to help you
@@ -25,3 +26,15 @@
or can be run as standalone applications.
.
Homepage: http://www.simonzone.com/software/guidance
+
+Package: kde-guidance-powermanager
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+ python-kde3, python-dbus, hal
+Provides: ${python:Provides}
+Conflicts: klaptopdaemon, kpowersave
+Description: HAL based power manager applet
+ A power management applet to indicate battery levels and perform hibernate or
+ suspend using HAL.
+ .
+ Homepage: http://www.simonzone.com/software/guidance
Added: kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance-powermanager.install
===================================================================
--- kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance-powermanager.install (rev 0)
+++ kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance-powermanager.install 2006-10-15 23:29:06 UTC (rev 4694)
@@ -0,0 +1,30 @@
+debian/tmp/usr/bin/guidance-power-manager
+debian/tmp/usr/share/icons/hicolor/22x22/apps/power-manager.png
+debian/tmp/usr/share/apps/guidance/pics/ac-adapter.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charged.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-000.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-020.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-040.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-060.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-080.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-100.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-000.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-020.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-040.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-060.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-080.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-100.png
+debian/tmp/usr/share/apps/guidance/pics/energy.png
+debian/tmp/usr/share/apps/guidance/pics/keyboard-power-low.png
+debian/tmp/usr/share/apps/guidance/pics/mouse-power-low.png
+debian/tmp/usr/share/apps/guidance/pics/power-information.png
+debian/tmp/usr/share/apps/guidance/pics/power-manager-128.png
+debian/tmp/usr/share/apps/guidance/pics/power-manager-64.png
+debian/tmp/usr/share/apps/guidance/pics/processor.png
+debian/tmp/usr/share/autostart/guidance-power-manager.desktop
+debian/tmp/usr/share/python-support/kde-guidance/guidance-power-manager.py
+debian/tmp/usr/share/python-support/kde-guidance/guidance_power_manager_ui.py
+debian/tmp/usr/share/python-support/kde-guidance/notify.py
+debian/tmp/usr/share/python-support/kde-guidance/powermanage.py
+debian/tmp/usr/share/python-support/kde-guidance/tooltip.py
+debian/tmp/usr/share/python-support/kde-guidance/hal-test.py
Modified: kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance.init
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.init 2006-10-14 02:07:07 UTC (rev 4680)
+++ kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance.init 2006-10-15 23:29:06 UTC (rev 4694)
@@ -1,4 +1,22 @@
#!/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)
Added: kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance.install
===================================================================
--- kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance.install (rev 0)
+++ kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance.install 2006-10-15 23:29:06 UTC (rev 4694)
@@ -0,0 +1,182 @@
+debian/tmp/usr/lib/kde3/kcm_serviceconfig.so.0.0.0
+debian/tmp/usr/lib/kde3/kcm_serviceconfig.la
+debian/tmp/usr/lib/kde3/kcm_serviceconfig.a
+debian/tmp/usr/lib/kde3/kcm_userconfig.so.0.0.0
+debian/tmp/usr/lib/kde3/kcm_userconfig.la
+debian/tmp/usr/lib/kde3/kcm_userconfig.a
+debian/tmp/usr/lib/kde3/kcm_mountconfig.so.0.0.0
+debian/tmp/usr/lib/kde3/kcm_mountconfig.la
+debian/tmp/usr/lib/kde3/kcm_mountconfig.a
+debian/tmp/usr/lib/kde3/kcm_displayconfig.so.0.0.0
+debian/tmp/usr/lib/kde3/kcm_displayconfig.la
+debian/tmp/usr/lib/kde3/kcm_displayconfig.a
+debian/tmp/usr/lib/kde3/kcm_wineconfig.so.0.0.0
+debian/tmp/usr/lib/kde3/kcm_wineconfig.la
+debian/tmp/usr/lib/kde3/kcm_wineconfig.a
+debian/tmp/usr/lib/python2.4/site-packages/ixf86misc.so
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/daemons.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/userconfig.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/displayconfig.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/daemons.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/index.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/introduction.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/using-testapp.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/commands.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/developers.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/re-1007-unmanagechildren-1.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/faq.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/credits.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/installation.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/requirements.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/compilation.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/configuration.html
+debian/tmp/usr/share/applications/kde/serviceconfig.desktop
+debian/tmp/usr/share/applications/kde/userconfig.desktop
+debian/tmp/usr/share/applications/kde/mountconfig.desktop
+debian/tmp/usr/share/applications/kde/displayconfig.desktop
+debian/tmp/usr/share/applications/kde/wineconfig.desktop
+debian/tmp/usr/share/apps/guidance/pics/laserwarn.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-app-daemons.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-encrypted.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-user.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-group.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-identity.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-password.png
+debian/tmp/usr/share/apps/guidance/pics/kcmpartitions.png
+debian/tmp/usr/share/apps/guidance/pics/kde1.png
+debian/tmp/usr/share/apps/guidance/pics/kde2.png
+debian/tmp/usr/share/apps/guidance/pics/kde3.png
+debian/tmp/usr/share/apps/guidance/pics/kde4.png
+debian/tmp/usr/share/apps/guidance/pics/kde5.png
+debian/tmp/usr/share/apps/guidance/pics/kde6.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-samba.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-hdd.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-cdrom.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-burner.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-floppy.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-blockdevice.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-password.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-memory.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-network.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-lock.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-usbpen.png
+debian/tmp/usr/share/apps/guidance/pics/greenled.png
+debian/tmp/usr/share/apps/guidance/pics/greyled.png
+debian/tmp/usr/share/apps/guidance/pics/exec.png
+debian/tmp/usr/share/apps/guidance/pics/file.png
+debian/tmp/usr/share/apps/guidance/pics/important.png
+debian/tmp/usr/share/apps/guidance/pics/tux.png
+debian/tmp/usr/share/apps/guidance/pics/user.png
+debian/tmp/usr/share/apps/guidance/pics/energystar.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-gfxcard.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-display.png
+debian/tmp/usr/share/apps/guidance/pics/32-wine.png
+debian/tmp/usr/share/apps/guidance/pics/kdewinewizard.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/dualhead
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/dualhead/monitor_1.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/dualhead/monitor_2.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_r90.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide_r90.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_r90.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide_r90.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_4th.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_left_4th.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_right_4th.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam14.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam16.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam18.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam20.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam22.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam24.png
+debian/tmp/usr/share/apps/guidance/fuser_ui.ui
+debian/tmp/usr/share/apps/guidance/vesamodes
+debian/tmp/usr/share/apps/guidance/extramodes
+debian/tmp/usr/share/apps/guidance/widescreenmodes
+debian/tmp/usr/share/apps/guidance/Cards+
+debian/tmp/usr/share/apps/guidance/MonitorsDB
+debian/tmp/usr/share/apps/guidance/pcitable
+debian/tmp/usr/share/apps/guidance/userconfig.pyc
+debian/tmp/usr/share/apps/guidance/serviceconfig.pyc
+debian/tmp/usr/share/apps/guidance/unixauthdb.pyc
+debian/tmp/usr/share/apps/guidance/mountconfig.pyc
+debian/tmp/usr/share/apps/guidance/MicroHAL.pyc
+debian/tmp/usr/share/apps/guidance/SMBShareSelectDialog.pyc
+debian/tmp/usr/share/apps/guidance/SimpleCommandRunner.pyc
+debian/tmp/usr/share/apps/guidance/fuser.pyc
+debian/tmp/usr/share/apps/guidance/sizeview.pyc
+debian/tmp/usr/share/apps/guidance/displayconfig.pyc
+debian/tmp/usr/share/apps/guidance/displayconfigabstraction.pyc
+debian/tmp/usr/share/apps/guidance/displayconfigwidgets.pyc
+debian/tmp/usr/share/apps/guidance/displayconfig-restore.pyc
+debian/tmp/usr/share/apps/guidance/execwithcapture.pyc
+debian/tmp/usr/share/apps/guidance/ScanPCI.pyc
+debian/tmp/usr/share/apps/guidance/ktimerdialog.pyc
+debian/tmp/usr/share/apps/guidance/servertestdialog.pyc
+debian/tmp/usr/share/apps/guidance/xorgconfig.pyc
+debian/tmp/usr/share/apps/guidance/wineconfig.pyc
+debian/tmp/usr/share/apps/guidance/wineread.pyc
+debian/tmp/usr/share/apps/guidance/winewrite.pyc
+debian/tmp/usr/share/apps/guidance/drivedetect.pyc
+debian/tmp/usr/share/apps/guidance/fuser_ui.pyc
+debian/tmp/usr/share/python-support/kde-guidance/displayconfig-hwprobe.py
+debian/tmp/usr/share/python-support/kde-guidance/xf86misc.py
+debian/tmp/usr/share/python-support/kde-guidance/MicroHAL.py
+debian/tmp/usr/share/python-support/kde-guidance/SMBShareSelectDialog.py
+debian/tmp/usr/share/python-support/kde-guidance/ScanPCI.py
+debian/tmp/usr/share/apps/guidance/ktimerdialog.pyc
+debian/tmp/usr/share/apps/guidance/servertestdialog.pyc
+debian/tmp/usr/share/apps/guidance/xorgconfig.pyc
+debian/tmp/usr/share/apps/guidance/wineconfig.pyc
+debian/tmp/usr/share/apps/guidance/wineread.pyc
+debian/tmp/usr/share/apps/guidance/winewrite.pyc
+debian/tmp/usr/share/apps/guidance/drivedetect.pyc
+debian/tmp/usr/share/apps/guidance/fuser_ui.pyc
+debian/tmp/usr/share/python-support/kde-guidance/displayconfig-hwprobe.py
+debian/tmp/usr/share/python-support/kde-guidance/xf86misc.py
+debian/tmp/usr/share/python-support/kde-guidance/MicroHAL.py
+debian/tmp/usr/share/python-support/kde-guidance/SMBShareSelectDialog.py
+debian/tmp/usr/share/python-support/kde-guidance/ScanPCI.py
+debian/tmp/usr/share/python-support/kde-guidance/SimpleCommandRunner.py
+debian/tmp/usr/share/python-support/kde-guidance/displayconfig-restore.py
+debian/tmp/usr/share/python-support/kde-guidance/displayconfig.py
+debian/tmp/usr/share/python-support/kde-guidance/displayconfigabstraction.py
+debian/tmp/usr/share/python-support/kde-guidance/displayconfigwidgets.py
+debian/tmp/usr/share/python-support/kde-guidance/drivedetect.py
+debian/tmp/usr/share/python-support/kde-guidance/execwithcapture.py
+debian/tmp/usr/share/python-support/kde-guidance/fuser.py
+debian/tmp/usr/share/python-support/kde-guidance/fuser_ui.py
+debian/tmp/usr/share/python-support/kde-guidance/ktimerdialog.py
+debian/tmp/usr/share/python-support/kde-guidance/mountconfig.py
+debian/tmp/usr/share/python-support/kde-guidance/servertestdialog.py
+debian/tmp/usr/share/python-support/kde-guidance/serviceconfig.py
+debian/tmp/usr/share/python-support/kde-guidance/sizeview.py
+debian/tmp/usr/share/python-support/kde-guidance/unixauthdb.py
+debian/tmp/usr/share/python-support/kde-guidance/userconfig.py
+debian/tmp/usr/share/python-support/kde-guidance/wineconfig.py
+debian/tmp/usr/share/python-support/kde-guidance/wineread.py
+debian/tmp/usr/share/python-support/kde-guidance/winewrite.py
+debian/tmp/usr/share/python-support/kde-guidance/xorgconfig.py
+debian/tmp/etc/X11/Xsession.d/40guidance-displayconfig_restore
+debian/tmp/usr/lib/kde3/kcm_serviceconfig.so.0
+debian/tmp/usr/lib/kde3/kcm_serviceconfig.so
+debian/tmp/usr/lib/kde3/kcm_userconfig.so.0
+debian/tmp/usr/lib/kde3/kcm_userconfig.so
+debian/tmp/usr/lib/kde3/kcm_mountconfig.so.0
+debian/tmp/usr/lib/kde3/kcm_mountconfig.so
+debian/tmp/usr/lib/kde3/kcm_displayconfig.so.0
+debian/tmp/usr/lib/kde3/kcm_displayconfig.so
+debian/tmp/usr/lib/kde3/kcm_wineconfig.so.0
+debian/tmp/usr/lib/kde3/kcm_wineconfig.so
+debian/tmp/usr/share/lintian/overrides/kde-guidance
Added: kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance.postinst
===================================================================
--- kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance.postinst (rev 0)
+++ kde-extras/guidance/tags/0.7.0-1/debian/kde-guidance.postinst 2006-10-15 23:29:06 UTC (rev 4694)
@@ -0,0 +1,6 @@
+#!/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
+
+#DEBHELPER#
Deleted: kde-extras/guidance/tags/0.7.0-1/debian/patches/10_branch_r542306.diff
Added: kde-extras/guidance/tags/0.7.0-1/debian/patches/10_typos_setup.diff
===================================================================
--- kde-extras/guidance/tags/0.7.0-1/debian/patches/10_typos_setup.diff (rev 0)
+++ kde-extras/guidance/tags/0.7.0-1/debian/patches/10_typos_setup.diff 2006-10-15 23:29:06 UTC (rev 4694)
@@ -0,0 +1,48 @@
+diff -Nur guidance-0.7.0/setup.py guidance-0.7.0.new/setup.py
+--- guidance-0.7.0/setup.py 2006-10-12 22:20:32.000000000 +0200
++++ guidance-0.7.0.new/setup.py 2006-10-15 21:49:38.000000000 +0200
+@@ -85,25 +85,25 @@
+ 'kde/wineconfig/pics/kdewinewizard.png',
+ 'kde/powermanager/pics/ac-adapter.png',
+ 'kde/powermanager/pics/battery-charged.png',
+- 'kde/powermanager/picsbattery-charging-000.png',
+- 'kde/powermanager/picsbattery-charging-020.png',
+- 'kde/powermanager/picsbattery-charging-040.png',
+- 'kde/powermanager/picsbattery-charging-060.png',
+- 'kde/powermanager/picsbattery-charging-080.png',
+- 'kde/powermanager/picsbattery-charging-100.png',
+- 'kde/powermanager/picsbattery-discharging-000.png',
+- 'kde/powermanager/picsbattery-discharging-020.png',
+- 'kde/powermanager/picsbattery-discharging-040.png',
+- 'kde/powermanager/picsbattery-discharging-060.png',
+- 'kde/powermanager/picsbattery-discharging-080.png',
+- 'kde/powermanager/picsbattery-discharging-100.png',
+- 'kde/powermanager/picsenergy.png',
+- 'kde/powermanager/picskeyboard-power-low.png',
+- 'kde/powermanager/picsmouse-power-low.png',
+- 'kde/powermanager/picspower-information.png',
+- 'kde/powermanager/picspower-manager-128.png',
+- 'kde/powermanager/picspower-manager-64.png',
+- 'kde/powermanager/picsprocessor.png']),
++ 'kde/powermanager/pics/battery-charging-000.png',
++ 'kde/powermanager/pics/battery-charging-020.png',
++ 'kde/powermanager/pics/battery-charging-040.png',
++ 'kde/powermanager/pics/battery-charging-060.png',
++ 'kde/powermanager/pics/battery-charging-080.png',
++ 'kde/powermanager/pics/battery-charging-100.png',
++ 'kde/powermanager/pics/battery-discharging-000.png',
++ 'kde/powermanager/pics/battery-discharging-020.png',
++ 'kde/powermanager/pics/battery-discharging-040.png',
++ 'kde/powermanager/pics/battery-discharging-060.png',
++ 'kde/powermanager/pics/battery-discharging-080.png',
++ 'kde/powermanager/pics/battery-discharging-100.png',
++ 'kde/powermanager/pics/energy.png',
++ 'kde/powermanager/pics/keyboard-power-low.png',
++ 'kde/powermanager/pics/mouse-power-low.png',
++ 'kde/powermanager/pics/power-information.png',
++ 'kde/powermanager/pics/power-manager-128.png',
++ 'kde/powermanager/pics/power-manager-64.png',
++ 'kde/powermanager/pics/processor.png']),
+ ('pics/displayconfig/dualhead',
+ ['kde/displayconfig/pics/dualhead/monitor_1.png',
+ 'kde/displayconfig/pics/dualhead/monitor_2.png']),
Deleted: kde-extras/guidance/tags/0.7.0-1/debian/patches/11_password_expire.diff
Modified: kde-extras/guidance/tags/0.7.0-1/debian/pyversions
===================================================================
--- kde-extras/guidance/trunk/debian/pyversions 2006-10-14 02:07:07 UTC (rev 4680)
+++ kde-extras/guidance/tags/0.7.0-1/debian/pyversions 2006-10-15 23:29:06 UTC (rev 4694)
@@ -1 +1 @@
-2.4-
+2.4
Modified: kde-extras/guidance/tags/0.7.0-1/debian/rules
===================================================================
--- kde-extras/guidance/trunk/debian/rules 2006-10-14 02:07:07 UTC (rev 4680)
+++ kde-extras/guidance/tags/0.7.0-1/debian/rules 2006-10-15 23:29:06 UTC (rev 4694)
@@ -6,6 +6,7 @@
include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_kde-guidance := debian/displayconfig.1 debian/mountconfig.1 debian/serviceconfig.1 debian/userconfig.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/usr/share/python-support/kde-guidance
@@ -39,17 +40,51 @@
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
# 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
- (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/displayconfig.py displayconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/displayconfig-restore.py displayconfig-restore)
- (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/mountconfig.py mountconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/serviceconfig.py serviceconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/userconfig.py userconfig)
+ mkdir -p debian/kde-guidance/usr/bin
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/displayconfig.py displayconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/displayconfig-restore.py displayconfig-restore)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/mountconfig.py mountconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/serviceconfig.py serviceconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/userconfig.py userconfig)
+ #(cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/wineconfig.py wineconfig)
+install/kde-guidance-powermanager::
+ # 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 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)
+
+ # move python modules in PYSUPPORT_PATH
+ mv powermanager/*.py $(PYSUPPORT_PATH)
+
+ # generate guidance-power-manager script
+ echo "#!/bin/sh" > $(DEB_DESTDIR)/usr/bin/guidance-power-manager
+ echo "/usr/share/python-support/kde-guidance/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)/guidance-power-manager.py
+ chmod 0755 $(PYSUPPORT_PATH)/powermanage.py
+
clean::
rm -rf build
@@ -61,9 +96,3 @@
rm -f install_log.txt
rm -f po/*.gmo
-
-get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]
- @@dpatch-get-origtargz ../tarballs
-
Modified: kde-extras/guidance/trunk/debian/changelog
===================================================================
--- kde-extras/guidance/trunk/debian/changelog 2006-10-15 15:49:01 UTC (rev 4693)
+++ kde-extras/guidance/trunk/debian/changelog 2006-10-15 23:29:06 UTC (rev 4694)
@@ -1,9 +1,26 @@
-kde-guidance (0.6.7-4) UNRELEASED; urgency=low
+kde-guidance (0.7.0-1) unstable; urgency=low
- (NOT RELEASED YET)
+ * New upstream release (Closes: #386636)
* Update maintainers
* Maintainer: KDE Extras Team
* Uploaders: Mark Purcell and Fathi Boudra
+ * Put package in unstable
+ * Remove 10_branch_r542306.diff and 11_password_expire.diff patches
+ * Add 10_typos_setup.diff to fix typos in setup.py
+ * Sync with ubuntu package:
+ * add power manager applet
+ * remove stop script symlinks from rc0 and rc6
+ * control:
+ * add python-kde3-dev to build-depends
+ * add python-dbus and sysv-rc to depends
+ * add kde-guidance-powermanager package
+ * pyversions: replace "2.4-" by "2.4", since build fails using python 2.5,
+ problem to import kdedistutils
+ * rules:
+ * Don't add extra /usr prefix when creating symlinks for
+ {display,mount,service,user}config and displayconfig-restore
+ * add kde-guidance-powermanager install
+ * create a script to launch guidance-power-manager instead of a link
-- Fathi Boudra <fboudra at free.fr> Mon, 21 Aug 2006 10:34:01 +0200
Modified: kde-extras/guidance/trunk/debian/control
===================================================================
--- kde-extras/guidance/trunk/debian/control 2006-10-15 15:49:01 UTC (rev 4693)
+++ kde-extras/guidance/trunk/debian/control 2006-10-15 23:29:06 UTC (rev 4694)
@@ -5,13 +5,14 @@
Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), chrpath,
kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev,
- pykdeextensions, pyqt-tools, python-kde3, python-sip4-dev,
+ pykdeextensions, pyqt-tools, python-kde3, python-kde3-dev, python-sip4-dev,
python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
Standards-Version: 3.7.2
Package: kde-guidance
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions, python-kde3
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+ pykdeextensions, python-kde3, python-dbus, sysv-rc
Provides: ${python:Provides}
Description: collection of KDE system administration tools for GNU/Linux
Guidance currently consists of four programs designed to help you
@@ -25,3 +26,15 @@
or can be run as standalone applications.
.
Homepage: http://www.simonzone.com/software/guidance
+
+Package: kde-guidance-powermanager
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+ python-kde3, python-dbus, hal
+Provides: ${python:Provides}
+Conflicts: klaptopdaemon, kpowersave
+Description: HAL based power manager applet
+ A power management applet to indicate battery levels and perform hibernate or
+ suspend using HAL.
+ .
+ Homepage: http://www.simonzone.com/software/guidance
Added: kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install (rev 0)
+++ kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install 2006-10-15 23:29:06 UTC (rev 4694)
@@ -0,0 +1,30 @@
+debian/tmp/usr/bin/guidance-power-manager
+debian/tmp/usr/share/icons/hicolor/22x22/apps/power-manager.png
+debian/tmp/usr/share/apps/guidance/pics/ac-adapter.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charged.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-000.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-020.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-040.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-060.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-080.png
+debian/tmp/usr/share/apps/guidance/pics/battery-charging-100.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-000.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-020.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-040.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-060.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-080.png
+debian/tmp/usr/share/apps/guidance/pics/battery-discharging-100.png
+debian/tmp/usr/share/apps/guidance/pics/energy.png
+debian/tmp/usr/share/apps/guidance/pics/keyboard-power-low.png
+debian/tmp/usr/share/apps/guidance/pics/mouse-power-low.png
+debian/tmp/usr/share/apps/guidance/pics/power-information.png
+debian/tmp/usr/share/apps/guidance/pics/power-manager-128.png
+debian/tmp/usr/share/apps/guidance/pics/power-manager-64.png
+debian/tmp/usr/share/apps/guidance/pics/processor.png
+debian/tmp/usr/share/autostart/guidance-power-manager.desktop
+debian/tmp/usr/share/python-support/kde-guidance/guidance-power-manager.py
+debian/tmp/usr/share/python-support/kde-guidance/guidance_power_manager_ui.py
+debian/tmp/usr/share/python-support/kde-guidance/notify.py
+debian/tmp/usr/share/python-support/kde-guidance/powermanage.py
+debian/tmp/usr/share/python-support/kde-guidance/tooltip.py
+debian/tmp/usr/share/python-support/kde-guidance/hal-test.py
Modified: kde-extras/guidance/trunk/debian/kde-guidance.init
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.init 2006-10-15 15:49:01 UTC (rev 4693)
+++ kde-extras/guidance/trunk/debian/kde-guidance.init 2006-10-15 23:29:06 UTC (rev 4694)
@@ -1,4 +1,22 @@
#!/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)
Added: kde-extras/guidance/trunk/debian/kde-guidance.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.install (rev 0)
+++ kde-extras/guidance/trunk/debian/kde-guidance.install 2006-10-15 23:29:06 UTC (rev 4694)
@@ -0,0 +1,182 @@
+debian/tmp/usr/lib/kde3/kcm_serviceconfig.so.0.0.0
+debian/tmp/usr/lib/kde3/kcm_serviceconfig.la
+debian/tmp/usr/lib/kde3/kcm_serviceconfig.a
+debian/tmp/usr/lib/kde3/kcm_userconfig.so.0.0.0
+debian/tmp/usr/lib/kde3/kcm_userconfig.la
+debian/tmp/usr/lib/kde3/kcm_userconfig.a
+debian/tmp/usr/lib/kde3/kcm_mountconfig.so.0.0.0
+debian/tmp/usr/lib/kde3/kcm_mountconfig.la
+debian/tmp/usr/lib/kde3/kcm_mountconfig.a
+debian/tmp/usr/lib/kde3/kcm_displayconfig.so.0.0.0
+debian/tmp/usr/lib/kde3/kcm_displayconfig.la
+debian/tmp/usr/lib/kde3/kcm_displayconfig.a
+debian/tmp/usr/lib/kde3/kcm_wineconfig.so.0.0.0
+debian/tmp/usr/lib/kde3/kcm_wineconfig.la
+debian/tmp/usr/lib/kde3/kcm_wineconfig.a
+debian/tmp/usr/lib/python2.4/site-packages/ixf86misc.so
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/daemons.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/userconfig.png
+debian/tmp/usr/share/icons/crystalsvg/16x16/apps/displayconfig.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/daemons.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
+debian/tmp/usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/index.cache.bz2
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/index.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/introduction.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/using-testapp.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/commands.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/developers.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/re-1007-unmanagechildren-1.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/faq.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/credits.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/installation.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/requirements.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/compilation.html
+debian/tmp/usr/share/doc/kde/HTML/en/guidance/configuration.html
+debian/tmp/usr/share/applications/kde/serviceconfig.desktop
+debian/tmp/usr/share/applications/kde/userconfig.desktop
+debian/tmp/usr/share/applications/kde/mountconfig.desktop
+debian/tmp/usr/share/applications/kde/displayconfig.desktop
+debian/tmp/usr/share/applications/kde/wineconfig.desktop
+debian/tmp/usr/share/apps/guidance/pics/laserwarn.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-app-daemons.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-encrypted.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-user.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-group.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-identity.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-password.png
+debian/tmp/usr/share/apps/guidance/pics/kcmpartitions.png
+debian/tmp/usr/share/apps/guidance/pics/kde1.png
+debian/tmp/usr/share/apps/guidance/pics/kde2.png
+debian/tmp/usr/share/apps/guidance/pics/kde3.png
+debian/tmp/usr/share/apps/guidance/pics/kde4.png
+debian/tmp/usr/share/apps/guidance/pics/kde5.png
+debian/tmp/usr/share/apps/guidance/pics/kde6.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-samba.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-hdd.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-cdrom.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-burner.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-floppy.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-blockdevice.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-password.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-memory.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-network.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-lock.png
+debian/tmp/usr/share/apps/guidance/pics/hi16-usbpen.png
+debian/tmp/usr/share/apps/guidance/pics/greenled.png
+debian/tmp/usr/share/apps/guidance/pics/greyled.png
+debian/tmp/usr/share/apps/guidance/pics/exec.png
+debian/tmp/usr/share/apps/guidance/pics/file.png
+debian/tmp/usr/share/apps/guidance/pics/important.png
+debian/tmp/usr/share/apps/guidance/pics/tux.png
+debian/tmp/usr/share/apps/guidance/pics/user.png
+debian/tmp/usr/share/apps/guidance/pics/energystar.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-gfxcard.png
+debian/tmp/usr/share/apps/guidance/pics/hi32-display.png
+debian/tmp/usr/share/apps/guidance/pics/32-wine.png
+debian/tmp/usr/share/apps/guidance/pics/kdewinewizard.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/dualhead
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/dualhead/monitor_1.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/dualhead/monitor_2.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_r90.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide_r90.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_r90.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide_r90.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_4th.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_left_4th.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_right_4th.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam14.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam16.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam18.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam20.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam22.png
+debian/tmp/usr/share/apps/guidance/pics/displayconfig/gammapics/MGam24.png
+debian/tmp/usr/share/apps/guidance/fuser_ui.ui
+debian/tmp/usr/share/apps/guidance/vesamodes
+debian/tmp/usr/share/apps/guidance/extramodes
+debian/tmp/usr/share/apps/guidance/widescreenmodes
+debian/tmp/usr/share/apps/guidance/Cards+
+debian/tmp/usr/share/apps/guidance/MonitorsDB
+debian/tmp/usr/share/apps/guidance/pcitable
+debian/tmp/usr/share/apps/guidance/userconfig.pyc
+debian/tmp/usr/share/apps/guidance/serviceconfig.pyc
+debian/tmp/usr/share/apps/guidance/unixauthdb.pyc
+debian/tmp/usr/share/apps/guidance/mountconfig.pyc
+debian/tmp/usr/share/apps/guidance/MicroHAL.pyc
+debian/tmp/usr/share/apps/guidance/SMBShareSelectDialog.pyc
+debian/tmp/usr/share/apps/guidance/SimpleCommandRunner.pyc
+debian/tmp/usr/share/apps/guidance/fuser.pyc
+debian/tmp/usr/share/apps/guidance/sizeview.pyc
+debian/tmp/usr/share/apps/guidance/displayconfig.pyc
+debian/tmp/usr/share/apps/guidance/displayconfigabstraction.pyc
+debian/tmp/usr/share/apps/guidance/displayconfigwidgets.pyc
+debian/tmp/usr/share/apps/guidance/displayconfig-restore.pyc
+debian/tmp/usr/share/apps/guidance/execwithcapture.pyc
+debian/tmp/usr/share/apps/guidance/ScanPCI.pyc
+debian/tmp/usr/share/apps/guidance/ktimerdialog.pyc
+debian/tmp/usr/share/apps/guidance/servertestdialog.pyc
+debian/tmp/usr/share/apps/guidance/xorgconfig.pyc
+debian/tmp/usr/share/apps/guidance/wineconfig.pyc
+debian/tmp/usr/share/apps/guidance/wineread.pyc
+debian/tmp/usr/share/apps/guidance/winewrite.pyc
+debian/tmp/usr/share/apps/guidance/drivedetect.pyc
+debian/tmp/usr/share/apps/guidance/fuser_ui.pyc
+debian/tmp/usr/share/python-support/kde-guidance/displayconfig-hwprobe.py
+debian/tmp/usr/share/python-support/kde-guidance/xf86misc.py
+debian/tmp/usr/share/python-support/kde-guidance/MicroHAL.py
+debian/tmp/usr/share/python-support/kde-guidance/SMBShareSelectDialog.py
+debian/tmp/usr/share/python-support/kde-guidance/ScanPCI.py
+debian/tmp/usr/share/apps/guidance/ktimerdialog.pyc
+debian/tmp/usr/share/apps/guidance/servertestdialog.pyc
+debian/tmp/usr/share/apps/guidance/xorgconfig.pyc
+debian/tmp/usr/share/apps/guidance/wineconfig.pyc
+debian/tmp/usr/share/apps/guidance/wineread.pyc
+debian/tmp/usr/share/apps/guidance/winewrite.pyc
+debian/tmp/usr/share/apps/guidance/drivedetect.pyc
+debian/tmp/usr/share/apps/guidance/fuser_ui.pyc
+debian/tmp/usr/share/python-support/kde-guidance/displayconfig-hwprobe.py
+debian/tmp/usr/share/python-support/kde-guidance/xf86misc.py
+debian/tmp/usr/share/python-support/kde-guidance/MicroHAL.py
+debian/tmp/usr/share/python-support/kde-guidance/SMBShareSelectDialog.py
+debian/tmp/usr/share/python-support/kde-guidance/ScanPCI.py
+debian/tmp/usr/share/python-support/kde-guidance/SimpleCommandRunner.py
+debian/tmp/usr/share/python-support/kde-guidance/displayconfig-restore.py
+debian/tmp/usr/share/python-support/kde-guidance/displayconfig.py
+debian/tmp/usr/share/python-support/kde-guidance/displayconfigabstraction.py
+debian/tmp/usr/share/python-support/kde-guidance/displayconfigwidgets.py
+debian/tmp/usr/share/python-support/kde-guidance/drivedetect.py
+debian/tmp/usr/share/python-support/kde-guidance/execwithcapture.py
+debian/tmp/usr/share/python-support/kde-guidance/fuser.py
+debian/tmp/usr/share/python-support/kde-guidance/fuser_ui.py
+debian/tmp/usr/share/python-support/kde-guidance/ktimerdialog.py
+debian/tmp/usr/share/python-support/kde-guidance/mountconfig.py
+debian/tmp/usr/share/python-support/kde-guidance/servertestdialog.py
+debian/tmp/usr/share/python-support/kde-guidance/serviceconfig.py
+debian/tmp/usr/share/python-support/kde-guidance/sizeview.py
+debian/tmp/usr/share/python-support/kde-guidance/unixauthdb.py
+debian/tmp/usr/share/python-support/kde-guidance/userconfig.py
+debian/tmp/usr/share/python-support/kde-guidance/wineconfig.py
+debian/tmp/usr/share/python-support/kde-guidance/wineread.py
+debian/tmp/usr/share/python-support/kde-guidance/winewrite.py
+debian/tmp/usr/share/python-support/kde-guidance/xorgconfig.py
+debian/tmp/etc/X11/Xsession.d/40guidance-displayconfig_restore
+debian/tmp/usr/lib/kde3/kcm_serviceconfig.so.0
+debian/tmp/usr/lib/kde3/kcm_serviceconfig.so
+debian/tmp/usr/lib/kde3/kcm_userconfig.so.0
+debian/tmp/usr/lib/kde3/kcm_userconfig.so
+debian/tmp/usr/lib/kde3/kcm_mountconfig.so.0
+debian/tmp/usr/lib/kde3/kcm_mountconfig.so
+debian/tmp/usr/lib/kde3/kcm_displayconfig.so.0
+debian/tmp/usr/lib/kde3/kcm_displayconfig.so
+debian/tmp/usr/lib/kde3/kcm_wineconfig.so.0
+debian/tmp/usr/lib/kde3/kcm_wineconfig.so
+debian/tmp/usr/share/lintian/overrides/kde-guidance
Added: kde-extras/guidance/trunk/debian/kde-guidance.postinst
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.postinst (rev 0)
+++ kde-extras/guidance/trunk/debian/kde-guidance.postinst 2006-10-15 23:29:06 UTC (rev 4694)
@@ -0,0 +1,6 @@
+#!/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
+
+#DEBHELPER#
Deleted: kde-extras/guidance/trunk/debian/patches/10_branch_r542306.diff
Added: kde-extras/guidance/trunk/debian/patches/10_typos_setup.diff
===================================================================
--- kde-extras/guidance/trunk/debian/patches/10_typos_setup.diff (rev 0)
+++ kde-extras/guidance/trunk/debian/patches/10_typos_setup.diff 2006-10-15 23:29:06 UTC (rev 4694)
@@ -0,0 +1,48 @@
+diff -Nur guidance-0.7.0/setup.py guidance-0.7.0.new/setup.py
+--- guidance-0.7.0/setup.py 2006-10-12 22:20:32.000000000 +0200
++++ guidance-0.7.0.new/setup.py 2006-10-15 21:49:38.000000000 +0200
+@@ -85,25 +85,25 @@
+ 'kde/wineconfig/pics/kdewinewizard.png',
+ 'kde/powermanager/pics/ac-adapter.png',
+ 'kde/powermanager/pics/battery-charged.png',
+- 'kde/powermanager/picsbattery-charging-000.png',
+- 'kde/powermanager/picsbattery-charging-020.png',
+- 'kde/powermanager/picsbattery-charging-040.png',
+- 'kde/powermanager/picsbattery-charging-060.png',
+- 'kde/powermanager/picsbattery-charging-080.png',
+- 'kde/powermanager/picsbattery-charging-100.png',
+- 'kde/powermanager/picsbattery-discharging-000.png',
+- 'kde/powermanager/picsbattery-discharging-020.png',
+- 'kde/powermanager/picsbattery-discharging-040.png',
+- 'kde/powermanager/picsbattery-discharging-060.png',
+- 'kde/powermanager/picsbattery-discharging-080.png',
+- 'kde/powermanager/picsbattery-discharging-100.png',
+- 'kde/powermanager/picsenergy.png',
+- 'kde/powermanager/picskeyboard-power-low.png',
+- 'kde/powermanager/picsmouse-power-low.png',
+- 'kde/powermanager/picspower-information.png',
+- 'kde/powermanager/picspower-manager-128.png',
+- 'kde/powermanager/picspower-manager-64.png',
+- 'kde/powermanager/picsprocessor.png']),
++ 'kde/powermanager/pics/battery-charging-000.png',
++ 'kde/powermanager/pics/battery-charging-020.png',
++ 'kde/powermanager/pics/battery-charging-040.png',
++ 'kde/powermanager/pics/battery-charging-060.png',
++ 'kde/powermanager/pics/battery-charging-080.png',
++ 'kde/powermanager/pics/battery-charging-100.png',
++ 'kde/powermanager/pics/battery-discharging-000.png',
++ 'kde/powermanager/pics/battery-discharging-020.png',
++ 'kde/powermanager/pics/battery-discharging-040.png',
++ 'kde/powermanager/pics/battery-discharging-060.png',
++ 'kde/powermanager/pics/battery-discharging-080.png',
++ 'kde/powermanager/pics/battery-discharging-100.png',
++ 'kde/powermanager/pics/energy.png',
++ 'kde/powermanager/pics/keyboard-power-low.png',
++ 'kde/powermanager/pics/mouse-power-low.png',
++ 'kde/powermanager/pics/power-information.png',
++ 'kde/powermanager/pics/power-manager-128.png',
++ 'kde/powermanager/pics/power-manager-64.png',
++ 'kde/powermanager/pics/processor.png']),
+ ('pics/displayconfig/dualhead',
+ ['kde/displayconfig/pics/dualhead/monitor_1.png',
+ 'kde/displayconfig/pics/dualhead/monitor_2.png']),
Deleted: kde-extras/guidance/trunk/debian/patches/11_password_expire.diff
Modified: kde-extras/guidance/trunk/debian/pyversions
===================================================================
--- kde-extras/guidance/trunk/debian/pyversions 2006-10-15 15:49:01 UTC (rev 4693)
+++ kde-extras/guidance/trunk/debian/pyversions 2006-10-15 23:29:06 UTC (rev 4694)
@@ -1 +1 @@
-2.4-
+2.4
Modified: kde-extras/guidance/trunk/debian/rules
===================================================================
--- kde-extras/guidance/trunk/debian/rules 2006-10-15 15:49:01 UTC (rev 4693)
+++ kde-extras/guidance/trunk/debian/rules 2006-10-15 23:29:06 UTC (rev 4694)
@@ -6,6 +6,7 @@
include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+#DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_kde-guidance := debian/displayconfig.1 debian/mountconfig.1 debian/serviceconfig.1 debian/userconfig.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/usr/share/python-support/kde-guidance
@@ -39,17 +40,51 @@
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
# 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
- (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/displayconfig.py displayconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/displayconfig-restore.py displayconfig-restore)
- (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/mountconfig.py mountconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/serviceconfig.py serviceconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/userconfig.py userconfig)
+ mkdir -p debian/kde-guidance/usr/bin
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/displayconfig.py displayconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/displayconfig-restore.py displayconfig-restore)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/mountconfig.py mountconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/serviceconfig.py serviceconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/userconfig.py userconfig)
+ #(cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/wineconfig.py wineconfig)
+install/kde-guidance-powermanager::
+ # 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 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)
+
+ # move python modules in PYSUPPORT_PATH
+ mv powermanager/*.py $(PYSUPPORT_PATH)
+
+ # generate guidance-power-manager script
+ echo "#!/bin/sh" > $(DEB_DESTDIR)/usr/bin/guidance-power-manager
+ echo "/usr/share/python-support/kde-guidance/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)/guidance-power-manager.py
+ chmod 0755 $(PYSUPPORT_PATH)/powermanage.py
+
clean::
rm -rf build
@@ -61,9 +96,3 @@
rm -f install_log.txt
rm -f po/*.gmo
-
-get-orig-source:
- @@dh_testdir
- @@[ -d ../tarballs/. ]
- @@dpatch-get-origtargz ../tarballs
-
More information about the pkg-kde-commits
mailing list