rev 6286 - in kde-extras/guidance: tags tags/0.8.0-1/debian tags/0.8.0-1/debian/patches trunk/debian trunk/debian/patches
Fathi Boudra
fboudra-guest at alioth.debian.org
Sat May 19 12:24:53 UTC 2007
Author: fboudra-guest
Date: 2007-05-19 12:24:52 +0000 (Sat, 19 May 2007)
New Revision: 6286
Added:
kde-extras/guidance/tags/0.8.0-1/
kde-extras/guidance/tags/0.8.0-1/debian/patches/
kde-extras/guidance/tags/0.8.0-1/debian/patches/10_wineconfig_icon.diff
kde-extras/guidance/tags/0.8.0-1/debian/patches/11_no_cpu_freq.diff
kde-extras/guidance/tags/0.8.0-1/debian/patches/12_pm_fix_indentation_actioncollection.diff
kde-extras/guidance/tags/0.8.0-1/debian/patches/13_nvidia_typo.diff
kde-extras/guidance/tags/0.8.0-1/debian/patches/14_powermanager_fixes.diff
kde-extras/guidance/trunk/debian/patches/
kde-extras/guidance/trunk/debian/patches/10_wineconfig_icon.diff
kde-extras/guidance/trunk/debian/patches/11_no_cpu_freq.diff
kde-extras/guidance/trunk/debian/patches/12_pm_fix_indentation_actioncollection.diff
kde-extras/guidance/trunk/debian/patches/13_nvidia_typo.diff
kde-extras/guidance/trunk/debian/patches/14_powermanager_fixes.diff
Removed:
kde-extras/guidance/tags/0.8.0-1/debian/pycompat
kde-extras/guidance/trunk/debian/pycompat
Modified:
kde-extras/guidance/tags/0.8.0-1/debian/changelog
kde-extras/guidance/tags/0.8.0-1/debian/control
kde-extras/guidance/tags/0.8.0-1/debian/kde-guidance-powermanager.install
kde-extras/guidance/tags/0.8.0-1/debian/kde-guidance.install
kde-extras/guidance/tags/0.8.0-1/debian/kde-guidance.postinst
kde-extras/guidance/tags/0.8.0-1/debian/rules
kde-extras/guidance/tags/0.8.0-1/debian/watch
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/kde-guidance.postinst
kde-extras/guidance/trunk/debian/rules
kde-extras/guidance/trunk/debian/watch
Log:
* Tags kde-guidance-0.8.0-1
* Update guidance to 0.8.0 release
* Merge some Ubuntu changes (patches and rules)
Copied: kde-extras/guidance/tags/0.8.0-1 (from rev 6279, kde-extras/guidance/trunk)
Modified: kde-extras/guidance/tags/0.8.0-1/debian/changelog
===================================================================
--- kde-extras/guidance/trunk/debian/changelog 2007-05-19 07:19:38 UTC (rev 6279)
+++ kde-extras/guidance/tags/0.8.0-1/debian/changelog 2007-05-19 12:24:52 UTC (rev 6286)
@@ -1,12 +1,35 @@
-kde-guidance (0.8.0-1) UNRELEASED; urgency=low
+kde-guidance (0.8.0-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
- * New upstream release
- * Add debian/watch
+ [ Fathi Boudra ]
+ * Add x11proto-scrnsaver-dev build dependency.
+ * Update kde-guidance.install:
+ * Add wineconfig icons.
+ * Remove bytecompiled modules (pyc).
+ * Remove fuser_ui.ui file.
+ * Remove old displayconfig-hwprobe.py init links in kde-guidance.postinst.
+ * Update kde-guidance-powermanager.install. Add powermanager_ui.py.
+ * Remove pycompat file. Deprecated.
+ * Update rules:
+ * Use DEB_DH_INSTALL_ARGS.
+ * Add wineconfig icons.
+ * Update powermanager icons/pics path.
+ * Add preliminary grubconfig support.
+ * Merge Ubuntu related changes (interpreter fix and clean desktop files).
+ * Merge Ubuntu common-install-prehook-impl target.
+ * Merge Ubuntu patches:
+ * 10_wineconfig_icon: fix icon name in .desktop file.
+ * 11_no_cpu_freq: fix no cpu frequency scaling.
+ * 12_pm_fix_indentation_actioncollection: fix indentation.
+ * 13_nvidia_typo: fix crash with nvidia non-free driver.
+ * 14_powermanager_fixes: fix shows discharging if battery full.
- -- Mark Purcell <msp at debian.org> Sat, 31 Mar 2007 11:55:13 +0100
+ [ Mark Purcell ]
+ * Add debian/watch.
+ -- Fathi Boudra <fboudra at free.fr> Fri, 18 May 2007 19:45:51 +0200
+
kde-guidance (0.7.1~svn20070204-1) experimental; urgency=low
[ Fathi Boudra ]
Modified: kde-extras/guidance/tags/0.8.0-1/debian/control
===================================================================
--- kde-extras/guidance/trunk/debian/control 2007-05-19 07:19:38 UTC (rev 6279)
+++ kde-extras/guidance/tags/0.8.0-1/debian/control 2007-05-19 12:24:52 UTC (rev 6286)
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
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, libxss-dev,
- libxxf86vm-dev, pykdeextensions, pyqt-tools, python-kde3, python-kde3-dev,
- python-sip4-dev, python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
+Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-dev,
+ libpythonize0-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
+ pykdeextensions, pyqt-tools, python-kde3, python-kde3-dev, python-sip4-dev,
+ python-support (>= 0.6), python-all-dev (>= 2.3.5-11), x11proto-scrnsaver-dev
Standards-Version: 3.7.2
Package: kde-guidance
Modified: kde-extras/guidance/tags/0.8.0-1/debian/kde-guidance-powermanager.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install 2007-05-19 07:19:38 UTC (rev 6279)
+++ kde-extras/guidance/tags/0.8.0-1/debian/kde-guidance-powermanager.install 2007-05-19 12:24:52 UTC (rev 6286)
@@ -1,12 +1,13 @@
-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-*.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
+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/python-support/kde-guidance/guidance-power-manager.py
+usr/share/python-support/kde-guidance/guidance_power_manager_ui.py
+usr/share/python-support/kde-guidance/notify.py
+usr/share/python-support/kde-guidance/powermanage.py
+usr/share/python-support/kde-guidance/powermanager_ui.py
+usr/share/python-support/kde-guidance/tooltip.py
+usr/share/python-support/kde-guidance/hal-test.py
Modified: kde-extras/guidance/tags/0.8.0-1/debian/kde-guidance.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.install 2007-05-19 07:19:38 UTC (rev 6279)
+++ kde-extras/guidance/tags/0.8.0-1/debian/kde-guidance.install 2007-05-19 12:24:52 UTC (rev 6286)
@@ -1,182 +1,153 @@
-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/python*/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
+usr/lib/kde3/kcm_serviceconfig.so.0.0.0
+usr/lib/kde3/kcm_serviceconfig.la
+usr/lib/kde3/kcm_serviceconfig.a
+usr/lib/kde3/kcm_userconfig.so.0.0.0
+usr/lib/kde3/kcm_userconfig.la
+usr/lib/kde3/kcm_userconfig.a
+usr/lib/kde3/kcm_mountconfig.so.0.0.0
+usr/lib/kde3/kcm_mountconfig.la
+usr/lib/kde3/kcm_mountconfig.a
+usr/lib/kde3/kcm_displayconfig.so.0.0.0
+usr/lib/kde3/kcm_displayconfig.la
+usr/lib/kde3/kcm_displayconfig.a
+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/share/icons/crystalsvg/16x16/apps/daemons.png
+usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
+usr/share/icons/crystalsvg/16x16/apps/userconfig.png
+usr/share/icons/crystalsvg/16x16/apps/displayconfig.png
+usr/share/icons/crystalsvg/16x16/apps/wineconfig.png
+usr/share/icons/crystalsvg/32x32/apps/daemons.png
+usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
+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
+usr/share/doc/kde/HTML/en/guidance/using-testapp.html
+usr/share/doc/kde/HTML/en/guidance/commands.html
+usr/share/doc/kde/HTML/en/guidance/developers.html
+usr/share/doc/kde/HTML/en/guidance/re-1007-unmanagechildren-1.html
+usr/share/doc/kde/HTML/en/guidance/faq.html
+usr/share/doc/kde/HTML/en/guidance/credits.html
+usr/share/doc/kde/HTML/en/guidance/installation.html
+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
+usr/share/apps/guidance/pics/hi32-user.png
+usr/share/apps/guidance/pics/hi32-group.png
+usr/share/apps/guidance/pics/hi32-identity.png
+usr/share/apps/guidance/pics/hi32-password.png
+usr/share/apps/guidance/pics/kcmpartitions.png
+usr/share/apps/guidance/pics/kde1.png
+usr/share/apps/guidance/pics/kde2.png
+usr/share/apps/guidance/pics/kde3.png
+usr/share/apps/guidance/pics/kde4.png
+usr/share/apps/guidance/pics/kde5.png
+usr/share/apps/guidance/pics/kde6.png
+usr/share/apps/guidance/pics/hi32-samba.png
+usr/share/apps/guidance/pics/hi16-hdd.png
+usr/share/apps/guidance/pics/hi16-cdrom.png
+usr/share/apps/guidance/pics/hi16-burner.png
+usr/share/apps/guidance/pics/hi16-floppy.png
+usr/share/apps/guidance/pics/hi16-blockdevice.png
+usr/share/apps/guidance/pics/hi16-password.png
+usr/share/apps/guidance/pics/hi16-memory.png
+usr/share/apps/guidance/pics/hi16-network.png
+usr/share/apps/guidance/pics/hi16-lock.png
+usr/share/apps/guidance/pics/hi16-usbpen.png
+usr/share/apps/guidance/pics/greenled.png
+usr/share/apps/guidance/pics/greyled.png
+usr/share/apps/guidance/pics/exec.png
+usr/share/apps/guidance/pics/file.png
+usr/share/apps/guidance/pics/important.png
+usr/share/apps/guidance/pics/tux.png
+usr/share/apps/guidance/pics/user.png
+usr/share/apps/guidance/pics/energystar.png
+usr/share/apps/guidance/pics/hi32-gfxcard.png
+usr/share/apps/guidance/pics/hi32-display.png
+usr/share/apps/guidance/pics/32-wine.png
+usr/share/apps/guidance/pics/kdewinewizard.png
+usr/share/apps/guidance/pics/displayconfig
+usr/share/apps/guidance/pics/displayconfig/dualhead
+usr/share/apps/guidance/pics/displayconfig/dualhead/monitor_1.png
+usr/share/apps/guidance/pics/displayconfig/dualhead/monitor_2.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_r90.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide_r90.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_r90.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide_r90.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_4th.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_left_4th.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_right_4th.png
+usr/share/apps/guidance/pics/displayconfig/gammapics
+usr/share/apps/guidance/pics/displayconfig/gammapics/MGam14.png
+usr/share/apps/guidance/pics/displayconfig/gammapics/MGam16.png
+usr/share/apps/guidance/pics/displayconfig/gammapics/MGam18.png
+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/python-support/kde-guidance/displayconfig-hwprobe.py
+usr/share/python-support/kde-guidance/xf86misc.py
+usr/share/python-support/kde-guidance/MicroHAL.py
+usr/share/python-support/kde-guidance/SMBShareSelectDialog.py
+usr/share/python-support/kde-guidance/ScanPCI.py
+usr/share/python-support/kde-guidance/displayconfig-hwprobe.py
+usr/share/python-support/kde-guidance/xf86misc.py
+usr/share/python-support/kde-guidance/MicroHAL.py
+usr/share/python-support/kde-guidance/SMBShareSelectDialog.py
+usr/share/python-support/kde-guidance/ScanPCI.py
+usr/share/python-support/kde-guidance/SimpleCommandRunner.py
+usr/share/python-support/kde-guidance/displayconfig-restore.py
+usr/share/python-support/kde-guidance/displayconfig.py
+usr/share/python-support/kde-guidance/displayconfigabstraction.py
+usr/share/python-support/kde-guidance/displayconfigwidgets.py
+usr/share/python-support/kde-guidance/drivedetect.py
+usr/share/python-support/kde-guidance/execwithcapture.py
+usr/share/python-support/kde-guidance/fuser.py
+usr/share/python-support/kde-guidance/fuser_ui.py
+#usr/share/python-support/kde-guidance/grubconfig.py
+usr/share/python-support/kde-guidance/ktimerdialog.py
+usr/share/python-support/kde-guidance/mountconfig.py
+usr/share/python-support/kde-guidance/servertestdialog.py
+usr/share/python-support/kde-guidance/serviceconfig.py
+usr/share/python-support/kde-guidance/sizeview.py
+usr/share/python-support/kde-guidance/unixauthdb.py
+usr/share/python-support/kde-guidance/userconfig.py
+usr/share/python-support/kde-guidance/wineconfig.py
+usr/share/python-support/kde-guidance/wineread.py
+usr/share/python-support/kde-guidance/winewrite.py
+usr/share/python-support/kde-guidance/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
Modified: kde-extras/guidance/tags/0.8.0-1/debian/kde-guidance.postinst
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.postinst 2007-05-19 07:19:38 UTC (rev 6279)
+++ kde-extras/guidance/tags/0.8.0-1/debian/kde-guidance.postinst 2007-05-19 12:24:52 UTC (rev 6286)
@@ -3,4 +3,7 @@
# 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
+
#DEBHELPER#
Added: kde-extras/guidance/tags/0.8.0-1/debian/patches/10_wineconfig_icon.diff
===================================================================
--- kde-extras/guidance/tags/0.8.0-1/debian/patches/10_wineconfig_icon.diff (rev 0)
+++ kde-extras/guidance/tags/0.8.0-1/debian/patches/10_wineconfig_icon.diff 2007-05-19 12:24:52 UTC (rev 6286)
@@ -0,0 +1,12 @@
+diff -Nur kde-guidance-0.8.0/wineconfig/wineconfig.desktop kde-guidance-0.8.0.new/wineconfig/wineconfig.desktop
+--- kde-guidance-0.8.0/wineconfig/wineconfig.desktop 2007-03-27 22:43:34.000000000 +0200
++++ kde-guidance-0.8.0.new/wineconfig/wineconfig.desktop 2007-05-18 20:01:35.000000000 +0200
+@@ -18,7 +18,7 @@
+ GenericName[pt]=Editor de Configuração do Wine
+ GenericName[pt_BR]=Editor de Configuração do Wine
+ GenericName[sv]=Wine inställningseditor
+-Icon=wineconfig.svg
++Icon=wineconfig
+ MimeType=
+ Name=Windows Applications
+ Name[de]=Windows-Programme
Added: kde-extras/guidance/tags/0.8.0-1/debian/patches/11_no_cpu_freq.diff
===================================================================
--- kde-extras/guidance/tags/0.8.0-1/debian/patches/11_no_cpu_freq.diff (rev 0)
+++ kde-extras/guidance/tags/0.8.0-1/debian/patches/11_no_cpu_freq.diff 2007-05-19 12:24:52 UTC (rev 6286)
@@ -0,0 +1,13 @@
+diff -Nur kde-guidance-0.8.0/powermanager/guidance-power-manager.py kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py
+--- kde-guidance-0.8.0/powermanager/guidance-power-manager.py 2007-03-26 17:14:50.000000000 +0200
++++ kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py 2007-05-18 20:03:03.000000000 +0200
+@@ -660,7 +660,8 @@
+ self.checkIdletime()
+
+ # CPU stuff
+- self._updateCpuWidgets()
++ if self.powermanager.hasCpuFreq:
++ self._updateCpuWidgets()
+
+ if self.powermanager.hasBattery:
+ on_battery = self.powermanager.onBattery()
Added: kde-extras/guidance/tags/0.8.0-1/debian/patches/12_pm_fix_indentation_actioncollection.diff
===================================================================
--- kde-extras/guidance/tags/0.8.0-1/debian/patches/12_pm_fix_indentation_actioncollection.diff (rev 0)
+++ kde-extras/guidance/tags/0.8.0-1/debian/patches/12_pm_fix_indentation_actioncollection.diff 2007-05-19 12:24:52 UTC (rev 6286)
@@ -0,0 +1,15 @@
+diff -Nur kde-guidance-0.8.0/powermanager/guidance-power-manager.py kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py
+--- kde-guidance-0.8.0/powermanager/guidance-power-manager.py 2007-05-18 20:03:33.000000000 +0200
++++ kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py 2007-05-18 20:05:29.000000000 +0200
+@@ -823,10 +823,7 @@
+ self.CpuProgress[cpu].setEnabled(True)
+ self.CpuProgress[cpu].setTotalSteps(cpustate['max'])
+ self.CpuProgress[cpu].setProgress(cpustate['cur'])
+-
+- self.systray.actionCollection().action(policy).setChecked(True)
+-
+-
++ self.systray.actionCollection().action(policy).setChecked(True)
+
+ def changePoweredBrightness(self, level=None):
+ """ Mains-powered brigthness slider has been moved. """
Added: kde-extras/guidance/tags/0.8.0-1/debian/patches/13_nvidia_typo.diff
===================================================================
--- kde-extras/guidance/tags/0.8.0-1/debian/patches/13_nvidia_typo.diff (rev 0)
+++ kde-extras/guidance/tags/0.8.0-1/debian/patches/13_nvidia_typo.diff 2007-05-19 12:24:52 UTC (rev 6286)
@@ -0,0 +1,17 @@
+diff -Nur kde-guidance-0.8.0/displayconfig/displayconfigabstraction.py kde-guidance-0.8.0.new/displayconfig/displayconfigabstraction.py
+--- kde-guidance-0.8.0/displayconfig/displayconfigabstraction.py 2007-03-26 17:14:51.000000000 +0200
++++ kde-guidance-0.8.0.new/displayconfig/displayconfigabstraction.py 2007-05-18 20:09:07.000000000 +0200
+@@ -2498,8 +2498,12 @@
+ # FIXME x86_64 => 'lib64'
+
+ if (os.path.exists("/usr/X11R6/lib/modules/drivers/nvidia_drv.o") and \
+- os.path.exists("/usr/X11R6/lib/modules/extensions/libglx.so")) or \
++ os.path.exists("/usr/X11R6/lib/modules/extensions/libglx.so")) \
++ or \
+ (os.path.exists("/usr/lib/xorg/modules/drivers/nvidia_drv.o") and \
++ os.path.exists("/usr/lib/xorg/modules/libglx.so")) \
++ or \
++ (os.path.exists("/usr/lib/xorg/modules/drivers/nvidia_drv.so") and \
+ os.path.exists("/usr/lib/xorg/modules/libglx.so")):
+ self.proprietary_drivers.append("nvidia")
+
Added: kde-extras/guidance/tags/0.8.0-1/debian/patches/14_powermanager_fixes.diff
===================================================================
--- kde-extras/guidance/tags/0.8.0-1/debian/patches/14_powermanager_fixes.diff (rev 0)
+++ kde-extras/guidance/tags/0.8.0-1/debian/patches/14_powermanager_fixes.diff 2007-05-19 12:24:52 UTC (rev 6286)
@@ -0,0 +1,180 @@
+diff -Nur kde-guidance-0.8.0/powermanager/guidance-power-manager.py kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py
+--- kde-guidance-0.8.0/powermanager/guidance-power-manager.py 2007-05-18 20:11:28.000000000 +0200
++++ kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py 2007-05-18 20:12:35.000000000 +0200
+@@ -451,6 +451,10 @@
+ """ Lock the screen and initiate a suspend to RAM (S3). """
+ if self.config.readBoolEntry("lockOnResume", True):
+ self.lockScreen()
++ try:
++ self.warningPopup.hide()
++ except AttributeError:
++ pass # No warningpopup, that's OK.
+ self.powermanager.suspend()
+ self.powermanager.resetIdleSeconds()
+
+@@ -458,27 +462,31 @@
+ """ Lock the screen and initiate a suspend to disk (S4). """
+ if self.config.readBoolEntry("lockOnResume", True):
+ self.lockScreen()
++ try:
++ self.warningPopup.hide()
++ except AttributeError:
++ pass # No warningpopup, that's OK.
+ self.powermanager.hibernate()
+ self.powermanager.resetIdleSeconds()
+
+ def shutdown(self):
+ """ Perform system shutdown. """
+ self.powermanager.shutdown()
+-
++
+ def setCpuPolicyDynamic(self):
+- """Change frequ for all cpu"""
+- self.powermanager.setCpuPolicy('dynamic')
+- self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['dynamic']))
+-
++ """Change frequ for all cpu"""
++ self.powermanager.setCpuPolicy('dynamic')
++ self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['dynamic']))
++
+ def setCpuPolicyPerformance(self):
+- """Change frequ for all cpu"""
+- self.powermanager.setCpuPolicy('performance')
+- self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['performance']))
++ """Change frequ for all cpu"""
++ self.powermanager.setCpuPolicy('performance')
++ self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['performance']))
+
+ def setCpuPolicyPowersave(self):
+- """Change frequ for all cpu"""
+- self.powermanager.setCpuPolicy('powersave')
+- self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['powersave']))
++ """Change frequ for all cpu"""
++ self.powermanager.setCpuPolicy('powersave')
++ self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['powersave']))
+
+ def trySuspend(self):
+ """ If supported, lock the screen and initiate a suspend to RAM (S3). """
+@@ -823,8 +831,9 @@
+ self.CpuProgress[cpu].setEnabled(True)
+ self.CpuProgress[cpu].setTotalSteps(cpustate['max'])
+ self.CpuProgress[cpu].setProgress(cpustate['cur'])
++
+ self.systray.actionCollection().action(policy).setChecked(True)
+-
++
+ def changePoweredBrightness(self, level=None):
+ """ Mains-powered brigthness slider has been moved. """
+ # Check if the state applies and adjust brightness immediately.
+@@ -947,7 +956,7 @@
+ if self.act_call[action] == None:
+ return # doing nothing anyway
+ if idlesec > idleTime:
+- note = i18n("System idle for at least %s minutes, %s now." % (idleTime, self.act_notify[action]))
++ note = i18n("System idle for at least %1 minutes, %2 now.").arg(idleTime).arg(self.act_notify[action])
+ self.notify(note, self.act_icon[action])
+ QTimer.singleShot(2000, self.act_call[action])
+
+@@ -1053,7 +1062,7 @@
+
+
+ if __name__ == "__main__":
+- aboutdata = KAboutData("power-manager", "Power Manager", "0.5",
++ aboutdata = KAboutData("power-manager", "Power Manager", "0.8.0",
+ "Handles battery, display and suspend modes for your computer.", KAboutData.License_GPL,
+ "(C) 2006-2007 Sebastian Kügler, Canonical Ltd, Luka Renko",
+ None, None, "jriddell at ubuntu.com")
+diff -Nur kde-guidance-0.8.0/powermanager/powermanage.py kde-guidance-0.8.0.new/powermanager/powermanage.py
+--- kde-guidance-0.8.0/powermanager/powermanage.py 2007-03-26 17:14:50.000000000 +0200
++++ kde-guidance-0.8.0.new/powermanager/powermanage.py 2007-05-18 20:12:35.000000000 +0200
+@@ -72,8 +72,11 @@
+ self.SCREENSAVER_BLANKONLY = True
+
+
+- xg = xf86misc.XF86Server()
+- self.xscreen = xg.getDefaultScreen()
++ try:
++ xg = xf86misc.XF86Server()
++ self.xscreen = xg.getDefaultScreen()
++ except xf86misc.XF86Error:
++ print "Problem connecting to X server for idletime detection."
+ # Currently only used in the test method
+ self.display_dark = 0.5
+ self.display_light = 1
+@@ -170,8 +173,12 @@
+ """ Read battery status from HAL and return
+ (battery state, charge percentage, remaining seconds).
+ """
+- properties = self.batteries[batt].GetAllProperties(dbus_interface="org.freedesktop.Hal.Device")
+-
++ try:
++ properties = self.batteries[batt].GetAllProperties(dbus_interface="org.freedesktop.Hal.Device")
++ except dbus.DBusException:
++ print "problem getting battery state from dbus."
++ return "not present", 0, 0, 0, 0, 0
++
+ if not properties['battery.present']:
+ return "not present", 0, 0, 0, 0, 0
+ else:
+@@ -184,7 +191,10 @@
+ if properties["battery.rechargeable.is_charging"]:
+ state = "charging"
+ elif properties["battery.rechargeable.is_discharging"]:
+- state = "discharging"
++ if self.onBattery():
++ state = "discharging"
++ else:
++ state = "charged"
+ elif not properties["battery.rechargeable.is_discharging"] \
+ and not properties["battery.rechargeable.is_charging"]:
+ if current == 0:
+@@ -256,14 +266,26 @@
+ self.brightness_properties = self.brightnessObject.GetAllProperties(
+ dbus_interface="org.freedesktop.Hal.Device")
+ self.brightness_levels = self.brightness_properties[u'laptop_panel.num_levels']
+-
++ try:
++ self.old_b = self.brightness_levels[-1] # Setting cached brightness value to brightest
++ except TypeError,e:
++ return 0 # Really don't know what to do here, but don't crash in any case.
++
+ def getBrightness(self):
+ """ Read brightness from HAL. """
+ if not self.hasBrightness:
+ debug("Brightness setting not supported.")
+ return
+- b = self.brightnessObject.GetBrightness(
++ try:
++ b = self.brightnessObject.GetBrightness(
+ dbus_interface="org.freedesktop.Hal.Device.LaptopPanel")
++ except dbus.DBusException, e:
++ # Sometimes, right after resume, the HAL call
++ # fails, in that case, we return the last value
++ # and hope that it goes well next time.
++ print "Warning: in getBrightness(): ", e
++ return self.old_b
++ self.old_b = b
+ return b
+
+ def adjustBrightness(self, level):
+@@ -455,7 +477,7 @@
+ print "Skipping DiskPM, not root."
+
+ if self.hasLid:
+- if self.getLidClosedState() == True:
++ if self.getLidClosedState():
+ print "Lid is closed."
+ else:
+ print "Lid is currently open."
+diff -Nur kde-guidance-0.8.0/powermanager/tooltip.ui kde-guidance-0.8.0.new/powermanager/tooltip.ui
+--- kde-guidance-0.8.0/powermanager/tooltip.ui 2007-03-16 20:28:18.000000000 +0100
++++ kde-guidance-0.8.0.new/powermanager/tooltip.ui 2007-05-18 20:12:35.000000000 +0200
+@@ -23,7 +23,7 @@
+ </property>
+ <property name="minimumSize">
+ <size>
+- <width>220</width>
++ <width>240</width>
+ <height>0</height>
+ </size>
+ </property>
Deleted: kde-extras/guidance/tags/0.8.0-1/debian/pycompat
Modified: kde-extras/guidance/tags/0.8.0-1/debian/rules
===================================================================
--- kde-extras/guidance/trunk/debian/rules 2007-05-19 07:19:38 UTC (rev 6279)
+++ kde-extras/guidance/tags/0.8.0-1/debian/rules 2007-05-19 12:24:52 UTC (rev 6286)
@@ -7,6 +7,7 @@
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_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
@@ -21,6 +22,10 @@
$(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/hi32-display.png \
$(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
+ install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/32-wine.png \
+ $(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/wineconfig.png
+ 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 \
@@ -44,6 +49,7 @@
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.*
@@ -58,13 +64,28 @@
(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)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/wineconfig.py wineconfig)
+# (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/grubconfig.py grubconfig)
+ : # 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; \
+ else \
+ mv -f $$i.temp $$i; \
+ chmod 755 $$i; \
+ echo "fixed interpreter: $$i"; \
+ fi; \
+ done
+
install/kde-guidance-powermanager::
# install icon to right place
- install -D -p -m0644 powermanager/icons/battery-charging-100.png \
+ 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 powermanager/icons/*.png \
+ install -D -p -m0644 kde/powermanager/pics/*.png \
$(DEB_DESTDIR)/usr/share/apps/guidance/pics/
# install desktop file
@@ -87,17 +108,68 @@
# fix script-not-executable
chmod 0755 $(PYSUPPORT_PATH)/powermanage.py
+ : # 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; \
+ else \
+ mv -f $$i.temp $$i; \
+ chmod 755 $$i; \
+ echo "fixed interpreter: $$i"; \
+ fi; \
+ done
+
clean::
rm -rf build
rm -rf doc/en/*html doc/en/*bz2
- rm -f serviceconfig/kcm_serviceconfig.cpp
- rm -f mountconfig/kcm_mountconfig.cpp
- rm -f displayconfig/kcm_displayconfig.cpp
+ rm -f serviceconfig/kcm_serviceconfig.cpp
+ rm -f mountconfig/kcm_mountconfig.cpp
+ rm -f displayconfig/kcm_displayconfig.cpp
rm -f userconfig/kcm_userconfig.cpp
rm -f install_log.txt
rm -f po/*.gmo
+ rm -f po/*.pot
+ # clean up edited .desktop etc files
+ if [ -f /usr/lib/kubuntu-desktop-i18n/createdesktop.pl ]; then \
+ sh /usr/lib/kubuntu-desktop-i18n/findfiles LIST; \
+ for file in `cat LIST`; do \
+ sed -i '/X-Ubuntu-Gettext-Domain=/d' $${file}; \
+ done; \
+ rm -f LIST; \
+ fi
+
+common-install-prehook-impl::
+ 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 \
+ sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+ done
+
+ # generate .po files for .desktop etc files
+ if [ -z $${KUBUNTU_DESKTOP_POT} ]; then \
+ KUBUNTU_DESKTOP_POT=$(DEB_SOURCE_PACKAGE); \
+ fi; \
+ echo KUBUNTU_DESKTOP_POT: $${KUBUNTU_DESKTOP_POT}; \
+ if [ -f /usr/lib/kubuntu-desktop-i18n/createdesktop.pl ]; then \
+ sh /usr/lib/kubuntu-desktop-i18n/findfiles LIST; \
+ cat LIST; \
+ perl /usr/lib/kubuntu-desktop-i18n/createdesktop.pl --file-list=LIST --base-dir=. > desktop.$${KUBUNTU_DESKTOP_POT}.tmp; \
+ msguniq --to-code=UTF-8 --no-wrap -o desktop.$${KUBUNTU_DESKTOP_POT} desktop.$${KUBUNTU_DESKTOP_POT}.tmp 2>/dev/null; \
+ python /usr/lib/kubuntu-desktop-i18n/msgsplit desktop.$${KUBUNTU_DESKTOP_POT}; \
+ mv desktop.$${KUBUNTU_DESKTOP_POT} po/desktop_$${KUBUNTU_DESKTOP_POT}.pot; \
+ rm -f desktop.$${KUBUNTU_DESKTOP_POT} desktop.$${KUBUNTU_DESKTOP_POT}.tmp; \
+ # add translation domain to files \
+ for file in `cat LIST`; do \
+ echo X-Ubuntu-Gettext-Domain=desktop_$${KUBUNTU_DESKTOP_POT} >> $${file}; \
+ done; \
+ rm -f LIST; \
+ fi
+
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]
Modified: kde-extras/guidance/tags/0.8.0-1/debian/watch
===================================================================
--- kde-extras/guidance/trunk/debian/watch 2007-05-19 07:19:38 UTC (rev 6279)
+++ kde-extras/guidance/tags/0.8.0-1/debian/watch 2007-05-19 12:24:52 UTC (rev 6286)
@@ -1,7 +1,2 @@
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
version=3
-
http://www.simonzone.com/software/guidance/guidance-(.*)\.tar\.bz2 debian svn-upgrade
-
Modified: kde-extras/guidance/trunk/debian/changelog
===================================================================
--- kde-extras/guidance/trunk/debian/changelog 2007-05-19 11:46:40 UTC (rev 6285)
+++ kde-extras/guidance/trunk/debian/changelog 2007-05-19 12:24:52 UTC (rev 6286)
@@ -1,12 +1,35 @@
-kde-guidance (0.8.0-1) UNRELEASED; urgency=low
+kde-guidance (0.8.0-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
- * New upstream release
- * Add debian/watch
+ [ Fathi Boudra ]
+ * Add x11proto-scrnsaver-dev build dependency.
+ * Update kde-guidance.install:
+ * Add wineconfig icons.
+ * Remove bytecompiled modules (pyc).
+ * Remove fuser_ui.ui file.
+ * Remove old displayconfig-hwprobe.py init links in kde-guidance.postinst.
+ * Update kde-guidance-powermanager.install. Add powermanager_ui.py.
+ * Remove pycompat file. Deprecated.
+ * Update rules:
+ * Use DEB_DH_INSTALL_ARGS.
+ * Add wineconfig icons.
+ * Update powermanager icons/pics path.
+ * Add preliminary grubconfig support.
+ * Merge Ubuntu related changes (interpreter fix and clean desktop files).
+ * Merge Ubuntu common-install-prehook-impl target.
+ * Merge Ubuntu patches:
+ * 10_wineconfig_icon: fix icon name in .desktop file.
+ * 11_no_cpu_freq: fix no cpu frequency scaling.
+ * 12_pm_fix_indentation_actioncollection: fix indentation.
+ * 13_nvidia_typo: fix crash with nvidia non-free driver.
+ * 14_powermanager_fixes: fix shows discharging if battery full.
- -- Mark Purcell <msp at debian.org> Sat, 31 Mar 2007 11:55:13 +0100
+ [ Mark Purcell ]
+ * Add debian/watch.
+ -- Fathi Boudra <fboudra at free.fr> Fri, 18 May 2007 19:45:51 +0200
+
kde-guidance (0.7.1~svn20070204-1) experimental; urgency=low
[ Fathi Boudra ]
Modified: kde-extras/guidance/trunk/debian/control
===================================================================
--- kde-extras/guidance/trunk/debian/control 2007-05-19 11:46:40 UTC (rev 6285)
+++ kde-extras/guidance/trunk/debian/control 2007-05-19 12:24:52 UTC (rev 6286)
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
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, libxss-dev,
- libxxf86vm-dev, pykdeextensions, pyqt-tools, python-kde3, python-kde3-dev,
- python-sip4-dev, python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
+Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-dev,
+ libpythonize0-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
+ pykdeextensions, pyqt-tools, python-kde3, python-kde3-dev, python-sip4-dev,
+ python-support (>= 0.6), python-all-dev (>= 2.3.5-11), x11proto-scrnsaver-dev
Standards-Version: 3.7.2
Package: kde-guidance
Modified: kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install 2007-05-19 11:46:40 UTC (rev 6285)
+++ kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install 2007-05-19 12:24:52 UTC (rev 6286)
@@ -1,12 +1,13 @@
-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-*.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
+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/python-support/kde-guidance/guidance-power-manager.py
+usr/share/python-support/kde-guidance/guidance_power_manager_ui.py
+usr/share/python-support/kde-guidance/notify.py
+usr/share/python-support/kde-guidance/powermanage.py
+usr/share/python-support/kde-guidance/powermanager_ui.py
+usr/share/python-support/kde-guidance/tooltip.py
+usr/share/python-support/kde-guidance/hal-test.py
Modified: kde-extras/guidance/trunk/debian/kde-guidance.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.install 2007-05-19 11:46:40 UTC (rev 6285)
+++ kde-extras/guidance/trunk/debian/kde-guidance.install 2007-05-19 12:24:52 UTC (rev 6286)
@@ -1,182 +1,153 @@
-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/python*/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
+usr/lib/kde3/kcm_serviceconfig.so.0.0.0
+usr/lib/kde3/kcm_serviceconfig.la
+usr/lib/kde3/kcm_serviceconfig.a
+usr/lib/kde3/kcm_userconfig.so.0.0.0
+usr/lib/kde3/kcm_userconfig.la
+usr/lib/kde3/kcm_userconfig.a
+usr/lib/kde3/kcm_mountconfig.so.0.0.0
+usr/lib/kde3/kcm_mountconfig.la
+usr/lib/kde3/kcm_mountconfig.a
+usr/lib/kde3/kcm_displayconfig.so.0.0.0
+usr/lib/kde3/kcm_displayconfig.la
+usr/lib/kde3/kcm_displayconfig.a
+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/share/icons/crystalsvg/16x16/apps/daemons.png
+usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
+usr/share/icons/crystalsvg/16x16/apps/userconfig.png
+usr/share/icons/crystalsvg/16x16/apps/displayconfig.png
+usr/share/icons/crystalsvg/16x16/apps/wineconfig.png
+usr/share/icons/crystalsvg/32x32/apps/daemons.png
+usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
+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
+usr/share/doc/kde/HTML/en/guidance/using-testapp.html
+usr/share/doc/kde/HTML/en/guidance/commands.html
+usr/share/doc/kde/HTML/en/guidance/developers.html
+usr/share/doc/kde/HTML/en/guidance/re-1007-unmanagechildren-1.html
+usr/share/doc/kde/HTML/en/guidance/faq.html
+usr/share/doc/kde/HTML/en/guidance/credits.html
+usr/share/doc/kde/HTML/en/guidance/installation.html
+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
+usr/share/apps/guidance/pics/hi32-user.png
+usr/share/apps/guidance/pics/hi32-group.png
+usr/share/apps/guidance/pics/hi32-identity.png
+usr/share/apps/guidance/pics/hi32-password.png
+usr/share/apps/guidance/pics/kcmpartitions.png
+usr/share/apps/guidance/pics/kde1.png
+usr/share/apps/guidance/pics/kde2.png
+usr/share/apps/guidance/pics/kde3.png
+usr/share/apps/guidance/pics/kde4.png
+usr/share/apps/guidance/pics/kde5.png
+usr/share/apps/guidance/pics/kde6.png
+usr/share/apps/guidance/pics/hi32-samba.png
+usr/share/apps/guidance/pics/hi16-hdd.png
+usr/share/apps/guidance/pics/hi16-cdrom.png
+usr/share/apps/guidance/pics/hi16-burner.png
+usr/share/apps/guidance/pics/hi16-floppy.png
+usr/share/apps/guidance/pics/hi16-blockdevice.png
+usr/share/apps/guidance/pics/hi16-password.png
+usr/share/apps/guidance/pics/hi16-memory.png
+usr/share/apps/guidance/pics/hi16-network.png
+usr/share/apps/guidance/pics/hi16-lock.png
+usr/share/apps/guidance/pics/hi16-usbpen.png
+usr/share/apps/guidance/pics/greenled.png
+usr/share/apps/guidance/pics/greyled.png
+usr/share/apps/guidance/pics/exec.png
+usr/share/apps/guidance/pics/file.png
+usr/share/apps/guidance/pics/important.png
+usr/share/apps/guidance/pics/tux.png
+usr/share/apps/guidance/pics/user.png
+usr/share/apps/guidance/pics/energystar.png
+usr/share/apps/guidance/pics/hi32-gfxcard.png
+usr/share/apps/guidance/pics/hi32-display.png
+usr/share/apps/guidance/pics/32-wine.png
+usr/share/apps/guidance/pics/kdewinewizard.png
+usr/share/apps/guidance/pics/displayconfig
+usr/share/apps/guidance/pics/displayconfig/dualhead
+usr/share/apps/guidance/pics/displayconfig/dualhead/monitor_1.png
+usr/share/apps/guidance/pics/displayconfig/dualhead/monitor_2.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_r90.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide_r90.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_r90.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide_r90.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_4th.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_left_4th.png
+usr/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_right_4th.png
+usr/share/apps/guidance/pics/displayconfig/gammapics
+usr/share/apps/guidance/pics/displayconfig/gammapics/MGam14.png
+usr/share/apps/guidance/pics/displayconfig/gammapics/MGam16.png
+usr/share/apps/guidance/pics/displayconfig/gammapics/MGam18.png
+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/python-support/kde-guidance/displayconfig-hwprobe.py
+usr/share/python-support/kde-guidance/xf86misc.py
+usr/share/python-support/kde-guidance/MicroHAL.py
+usr/share/python-support/kde-guidance/SMBShareSelectDialog.py
+usr/share/python-support/kde-guidance/ScanPCI.py
+usr/share/python-support/kde-guidance/displayconfig-hwprobe.py
+usr/share/python-support/kde-guidance/xf86misc.py
+usr/share/python-support/kde-guidance/MicroHAL.py
+usr/share/python-support/kde-guidance/SMBShareSelectDialog.py
+usr/share/python-support/kde-guidance/ScanPCI.py
+usr/share/python-support/kde-guidance/SimpleCommandRunner.py
+usr/share/python-support/kde-guidance/displayconfig-restore.py
+usr/share/python-support/kde-guidance/displayconfig.py
+usr/share/python-support/kde-guidance/displayconfigabstraction.py
+usr/share/python-support/kde-guidance/displayconfigwidgets.py
+usr/share/python-support/kde-guidance/drivedetect.py
+usr/share/python-support/kde-guidance/execwithcapture.py
+usr/share/python-support/kde-guidance/fuser.py
+usr/share/python-support/kde-guidance/fuser_ui.py
+#usr/share/python-support/kde-guidance/grubconfig.py
+usr/share/python-support/kde-guidance/ktimerdialog.py
+usr/share/python-support/kde-guidance/mountconfig.py
+usr/share/python-support/kde-guidance/servertestdialog.py
+usr/share/python-support/kde-guidance/serviceconfig.py
+usr/share/python-support/kde-guidance/sizeview.py
+usr/share/python-support/kde-guidance/unixauthdb.py
+usr/share/python-support/kde-guidance/userconfig.py
+usr/share/python-support/kde-guidance/wineconfig.py
+usr/share/python-support/kde-guidance/wineread.py
+usr/share/python-support/kde-guidance/winewrite.py
+usr/share/python-support/kde-guidance/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
Modified: kde-extras/guidance/trunk/debian/kde-guidance.postinst
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.postinst 2007-05-19 11:46:40 UTC (rev 6285)
+++ kde-extras/guidance/trunk/debian/kde-guidance.postinst 2007-05-19 12:24:52 UTC (rev 6286)
@@ -3,4 +3,7 @@
# 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
+
#DEBHELPER#
Added: kde-extras/guidance/trunk/debian/patches/10_wineconfig_icon.diff
===================================================================
--- kde-extras/guidance/trunk/debian/patches/10_wineconfig_icon.diff (rev 0)
+++ kde-extras/guidance/trunk/debian/patches/10_wineconfig_icon.diff 2007-05-19 12:24:52 UTC (rev 6286)
@@ -0,0 +1,12 @@
+diff -Nur kde-guidance-0.8.0/wineconfig/wineconfig.desktop kde-guidance-0.8.0.new/wineconfig/wineconfig.desktop
+--- kde-guidance-0.8.0/wineconfig/wineconfig.desktop 2007-03-27 22:43:34.000000000 +0200
++++ kde-guidance-0.8.0.new/wineconfig/wineconfig.desktop 2007-05-18 20:01:35.000000000 +0200
+@@ -18,7 +18,7 @@
+ GenericName[pt]=Editor de Configuração do Wine
+ GenericName[pt_BR]=Editor de Configuração do Wine
+ GenericName[sv]=Wine inställningseditor
+-Icon=wineconfig.svg
++Icon=wineconfig
+ MimeType=
+ Name=Windows Applications
+ Name[de]=Windows-Programme
Added: kde-extras/guidance/trunk/debian/patches/11_no_cpu_freq.diff
===================================================================
--- kde-extras/guidance/trunk/debian/patches/11_no_cpu_freq.diff (rev 0)
+++ kde-extras/guidance/trunk/debian/patches/11_no_cpu_freq.diff 2007-05-19 12:24:52 UTC (rev 6286)
@@ -0,0 +1,13 @@
+diff -Nur kde-guidance-0.8.0/powermanager/guidance-power-manager.py kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py
+--- kde-guidance-0.8.0/powermanager/guidance-power-manager.py 2007-03-26 17:14:50.000000000 +0200
++++ kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py 2007-05-18 20:03:03.000000000 +0200
+@@ -660,7 +660,8 @@
+ self.checkIdletime()
+
+ # CPU stuff
+- self._updateCpuWidgets()
++ if self.powermanager.hasCpuFreq:
++ self._updateCpuWidgets()
+
+ if self.powermanager.hasBattery:
+ on_battery = self.powermanager.onBattery()
Added: kde-extras/guidance/trunk/debian/patches/12_pm_fix_indentation_actioncollection.diff
===================================================================
--- kde-extras/guidance/trunk/debian/patches/12_pm_fix_indentation_actioncollection.diff (rev 0)
+++ kde-extras/guidance/trunk/debian/patches/12_pm_fix_indentation_actioncollection.diff 2007-05-19 12:24:52 UTC (rev 6286)
@@ -0,0 +1,15 @@
+diff -Nur kde-guidance-0.8.0/powermanager/guidance-power-manager.py kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py
+--- kde-guidance-0.8.0/powermanager/guidance-power-manager.py 2007-05-18 20:03:33.000000000 +0200
++++ kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py 2007-05-18 20:05:29.000000000 +0200
+@@ -823,10 +823,7 @@
+ self.CpuProgress[cpu].setEnabled(True)
+ self.CpuProgress[cpu].setTotalSteps(cpustate['max'])
+ self.CpuProgress[cpu].setProgress(cpustate['cur'])
+-
+- self.systray.actionCollection().action(policy).setChecked(True)
+-
+-
++ self.systray.actionCollection().action(policy).setChecked(True)
+
+ def changePoweredBrightness(self, level=None):
+ """ Mains-powered brigthness slider has been moved. """
Added: kde-extras/guidance/trunk/debian/patches/13_nvidia_typo.diff
===================================================================
--- kde-extras/guidance/trunk/debian/patches/13_nvidia_typo.diff (rev 0)
+++ kde-extras/guidance/trunk/debian/patches/13_nvidia_typo.diff 2007-05-19 12:24:52 UTC (rev 6286)
@@ -0,0 +1,17 @@
+diff -Nur kde-guidance-0.8.0/displayconfig/displayconfigabstraction.py kde-guidance-0.8.0.new/displayconfig/displayconfigabstraction.py
+--- kde-guidance-0.8.0/displayconfig/displayconfigabstraction.py 2007-03-26 17:14:51.000000000 +0200
++++ kde-guidance-0.8.0.new/displayconfig/displayconfigabstraction.py 2007-05-18 20:09:07.000000000 +0200
+@@ -2498,8 +2498,12 @@
+ # FIXME x86_64 => 'lib64'
+
+ if (os.path.exists("/usr/X11R6/lib/modules/drivers/nvidia_drv.o") and \
+- os.path.exists("/usr/X11R6/lib/modules/extensions/libglx.so")) or \
++ os.path.exists("/usr/X11R6/lib/modules/extensions/libglx.so")) \
++ or \
+ (os.path.exists("/usr/lib/xorg/modules/drivers/nvidia_drv.o") and \
++ os.path.exists("/usr/lib/xorg/modules/libglx.so")) \
++ or \
++ (os.path.exists("/usr/lib/xorg/modules/drivers/nvidia_drv.so") and \
+ os.path.exists("/usr/lib/xorg/modules/libglx.so")):
+ self.proprietary_drivers.append("nvidia")
+
Added: kde-extras/guidance/trunk/debian/patches/14_powermanager_fixes.diff
===================================================================
--- kde-extras/guidance/trunk/debian/patches/14_powermanager_fixes.diff (rev 0)
+++ kde-extras/guidance/trunk/debian/patches/14_powermanager_fixes.diff 2007-05-19 12:24:52 UTC (rev 6286)
@@ -0,0 +1,180 @@
+diff -Nur kde-guidance-0.8.0/powermanager/guidance-power-manager.py kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py
+--- kde-guidance-0.8.0/powermanager/guidance-power-manager.py 2007-05-18 20:11:28.000000000 +0200
++++ kde-guidance-0.8.0.new/powermanager/guidance-power-manager.py 2007-05-18 20:12:35.000000000 +0200
+@@ -451,6 +451,10 @@
+ """ Lock the screen and initiate a suspend to RAM (S3). """
+ if self.config.readBoolEntry("lockOnResume", True):
+ self.lockScreen()
++ try:
++ self.warningPopup.hide()
++ except AttributeError:
++ pass # No warningpopup, that's OK.
+ self.powermanager.suspend()
+ self.powermanager.resetIdleSeconds()
+
+@@ -458,27 +462,31 @@
+ """ Lock the screen and initiate a suspend to disk (S4). """
+ if self.config.readBoolEntry("lockOnResume", True):
+ self.lockScreen()
++ try:
++ self.warningPopup.hide()
++ except AttributeError:
++ pass # No warningpopup, that's OK.
+ self.powermanager.hibernate()
+ self.powermanager.resetIdleSeconds()
+
+ def shutdown(self):
+ """ Perform system shutdown. """
+ self.powermanager.shutdown()
+-
++
+ def setCpuPolicyDynamic(self):
+- """Change frequ for all cpu"""
+- self.powermanager.setCpuPolicy('dynamic')
+- self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['dynamic']))
+-
++ """Change frequ for all cpu"""
++ self.powermanager.setCpuPolicy('dynamic')
++ self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['dynamic']))
++
+ def setCpuPolicyPerformance(self):
+- """Change frequ for all cpu"""
+- self.powermanager.setCpuPolicy('performance')
+- self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['performance']))
++ """Change frequ for all cpu"""
++ self.powermanager.setCpuPolicy('performance')
++ self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['performance']))
+
+ def setCpuPolicyPowersave(self):
+- """Change frequ for all cpu"""
+- self.powermanager.setCpuPolicy('powersave')
+- self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['powersave']))
++ """Change frequ for all cpu"""
++ self.powermanager.setCpuPolicy('powersave')
++ self.notify(i18n("CPU frequency policy changed to %1.").arg(self.freq_name['powersave']))
+
+ def trySuspend(self):
+ """ If supported, lock the screen and initiate a suspend to RAM (S3). """
+@@ -823,8 +831,9 @@
+ self.CpuProgress[cpu].setEnabled(True)
+ self.CpuProgress[cpu].setTotalSteps(cpustate['max'])
+ self.CpuProgress[cpu].setProgress(cpustate['cur'])
++
+ self.systray.actionCollection().action(policy).setChecked(True)
+-
++
+ def changePoweredBrightness(self, level=None):
+ """ Mains-powered brigthness slider has been moved. """
+ # Check if the state applies and adjust brightness immediately.
+@@ -947,7 +956,7 @@
+ if self.act_call[action] == None:
+ return # doing nothing anyway
+ if idlesec > idleTime:
+- note = i18n("System idle for at least %s minutes, %s now." % (idleTime, self.act_notify[action]))
++ note = i18n("System idle for at least %1 minutes, %2 now.").arg(idleTime).arg(self.act_notify[action])
+ self.notify(note, self.act_icon[action])
+ QTimer.singleShot(2000, self.act_call[action])
+
+@@ -1053,7 +1062,7 @@
+
+
+ if __name__ == "__main__":
+- aboutdata = KAboutData("power-manager", "Power Manager", "0.5",
++ aboutdata = KAboutData("power-manager", "Power Manager", "0.8.0",
+ "Handles battery, display and suspend modes for your computer.", KAboutData.License_GPL,
+ "(C) 2006-2007 Sebastian Kügler, Canonical Ltd, Luka Renko",
+ None, None, "jriddell at ubuntu.com")
+diff -Nur kde-guidance-0.8.0/powermanager/powermanage.py kde-guidance-0.8.0.new/powermanager/powermanage.py
+--- kde-guidance-0.8.0/powermanager/powermanage.py 2007-03-26 17:14:50.000000000 +0200
++++ kde-guidance-0.8.0.new/powermanager/powermanage.py 2007-05-18 20:12:35.000000000 +0200
+@@ -72,8 +72,11 @@
+ self.SCREENSAVER_BLANKONLY = True
+
+
+- xg = xf86misc.XF86Server()
+- self.xscreen = xg.getDefaultScreen()
++ try:
++ xg = xf86misc.XF86Server()
++ self.xscreen = xg.getDefaultScreen()
++ except xf86misc.XF86Error:
++ print "Problem connecting to X server for idletime detection."
+ # Currently only used in the test method
+ self.display_dark = 0.5
+ self.display_light = 1
+@@ -170,8 +173,12 @@
+ """ Read battery status from HAL and return
+ (battery state, charge percentage, remaining seconds).
+ """
+- properties = self.batteries[batt].GetAllProperties(dbus_interface="org.freedesktop.Hal.Device")
+-
++ try:
++ properties = self.batteries[batt].GetAllProperties(dbus_interface="org.freedesktop.Hal.Device")
++ except dbus.DBusException:
++ print "problem getting battery state from dbus."
++ return "not present", 0, 0, 0, 0, 0
++
+ if not properties['battery.present']:
+ return "not present", 0, 0, 0, 0, 0
+ else:
+@@ -184,7 +191,10 @@
+ if properties["battery.rechargeable.is_charging"]:
+ state = "charging"
+ elif properties["battery.rechargeable.is_discharging"]:
+- state = "discharging"
++ if self.onBattery():
++ state = "discharging"
++ else:
++ state = "charged"
+ elif not properties["battery.rechargeable.is_discharging"] \
+ and not properties["battery.rechargeable.is_charging"]:
+ if current == 0:
+@@ -256,14 +266,26 @@
+ self.brightness_properties = self.brightnessObject.GetAllProperties(
+ dbus_interface="org.freedesktop.Hal.Device")
+ self.brightness_levels = self.brightness_properties[u'laptop_panel.num_levels']
+-
++ try:
++ self.old_b = self.brightness_levels[-1] # Setting cached brightness value to brightest
++ except TypeError,e:
++ return 0 # Really don't know what to do here, but don't crash in any case.
++
+ def getBrightness(self):
+ """ Read brightness from HAL. """
+ if not self.hasBrightness:
+ debug("Brightness setting not supported.")
+ return
+- b = self.brightnessObject.GetBrightness(
++ try:
++ b = self.brightnessObject.GetBrightness(
+ dbus_interface="org.freedesktop.Hal.Device.LaptopPanel")
++ except dbus.DBusException, e:
++ # Sometimes, right after resume, the HAL call
++ # fails, in that case, we return the last value
++ # and hope that it goes well next time.
++ print "Warning: in getBrightness(): ", e
++ return self.old_b
++ self.old_b = b
+ return b
+
+ def adjustBrightness(self, level):
+@@ -455,7 +477,7 @@
+ print "Skipping DiskPM, not root."
+
+ if self.hasLid:
+- if self.getLidClosedState() == True:
++ if self.getLidClosedState():
+ print "Lid is closed."
+ else:
+ print "Lid is currently open."
+diff -Nur kde-guidance-0.8.0/powermanager/tooltip.ui kde-guidance-0.8.0.new/powermanager/tooltip.ui
+--- kde-guidance-0.8.0/powermanager/tooltip.ui 2007-03-16 20:28:18.000000000 +0100
++++ kde-guidance-0.8.0.new/powermanager/tooltip.ui 2007-05-18 20:12:35.000000000 +0200
+@@ -23,7 +23,7 @@
+ </property>
+ <property name="minimumSize">
+ <size>
+- <width>220</width>
++ <width>240</width>
+ <height>0</height>
+ </size>
+ </property>
Deleted: kde-extras/guidance/trunk/debian/pycompat
Modified: kde-extras/guidance/trunk/debian/rules
===================================================================
--- kde-extras/guidance/trunk/debian/rules 2007-05-19 11:46:40 UTC (rev 6285)
+++ kde-extras/guidance/trunk/debian/rules 2007-05-19 12:24:52 UTC (rev 6286)
@@ -7,6 +7,7 @@
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_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
@@ -21,6 +22,10 @@
$(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/hi32-display.png \
$(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
+ install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/32-wine.png \
+ $(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/wineconfig.png
+ 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 \
@@ -44,6 +49,7 @@
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.*
@@ -58,13 +64,28 @@
(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)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/wineconfig.py wineconfig)
+# (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/grubconfig.py grubconfig)
+ : # 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; \
+ else \
+ mv -f $$i.temp $$i; \
+ chmod 755 $$i; \
+ echo "fixed interpreter: $$i"; \
+ fi; \
+ done
+
install/kde-guidance-powermanager::
# install icon to right place
- install -D -p -m0644 powermanager/icons/battery-charging-100.png \
+ 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 powermanager/icons/*.png \
+ install -D -p -m0644 kde/powermanager/pics/*.png \
$(DEB_DESTDIR)/usr/share/apps/guidance/pics/
# install desktop file
@@ -87,17 +108,68 @@
# fix script-not-executable
chmod 0755 $(PYSUPPORT_PATH)/powermanage.py
+ : # 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; \
+ else \
+ mv -f $$i.temp $$i; \
+ chmod 755 $$i; \
+ echo "fixed interpreter: $$i"; \
+ fi; \
+ done
+
clean::
rm -rf build
rm -rf doc/en/*html doc/en/*bz2
- rm -f serviceconfig/kcm_serviceconfig.cpp
- rm -f mountconfig/kcm_mountconfig.cpp
- rm -f displayconfig/kcm_displayconfig.cpp
+ rm -f serviceconfig/kcm_serviceconfig.cpp
+ rm -f mountconfig/kcm_mountconfig.cpp
+ rm -f displayconfig/kcm_displayconfig.cpp
rm -f userconfig/kcm_userconfig.cpp
rm -f install_log.txt
rm -f po/*.gmo
+ rm -f po/*.pot
+ # clean up edited .desktop etc files
+ if [ -f /usr/lib/kubuntu-desktop-i18n/createdesktop.pl ]; then \
+ sh /usr/lib/kubuntu-desktop-i18n/findfiles LIST; \
+ for file in `cat LIST`; do \
+ sed -i '/X-Ubuntu-Gettext-Domain=/d' $${file}; \
+ done; \
+ rm -f LIST; \
+ fi
+
+common-install-prehook-impl::
+ 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 \
+ sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+ done
+
+ # generate .po files for .desktop etc files
+ if [ -z $${KUBUNTU_DESKTOP_POT} ]; then \
+ KUBUNTU_DESKTOP_POT=$(DEB_SOURCE_PACKAGE); \
+ fi; \
+ echo KUBUNTU_DESKTOP_POT: $${KUBUNTU_DESKTOP_POT}; \
+ if [ -f /usr/lib/kubuntu-desktop-i18n/createdesktop.pl ]; then \
+ sh /usr/lib/kubuntu-desktop-i18n/findfiles LIST; \
+ cat LIST; \
+ perl /usr/lib/kubuntu-desktop-i18n/createdesktop.pl --file-list=LIST --base-dir=. > desktop.$${KUBUNTU_DESKTOP_POT}.tmp; \
+ msguniq --to-code=UTF-8 --no-wrap -o desktop.$${KUBUNTU_DESKTOP_POT} desktop.$${KUBUNTU_DESKTOP_POT}.tmp 2>/dev/null; \
+ python /usr/lib/kubuntu-desktop-i18n/msgsplit desktop.$${KUBUNTU_DESKTOP_POT}; \
+ mv desktop.$${KUBUNTU_DESKTOP_POT} po/desktop_$${KUBUNTU_DESKTOP_POT}.pot; \
+ rm -f desktop.$${KUBUNTU_DESKTOP_POT} desktop.$${KUBUNTU_DESKTOP_POT}.tmp; \
+ # add translation domain to files \
+ for file in `cat LIST`; do \
+ echo X-Ubuntu-Gettext-Domain=desktop_$${KUBUNTU_DESKTOP_POT} >> $${file}; \
+ done; \
+ rm -f LIST; \
+ fi
+
get-orig-source:
@@dh_testdir
@@[ -d ../tarballs/. ]
Modified: kde-extras/guidance/trunk/debian/watch
===================================================================
--- kde-extras/guidance/trunk/debian/watch 2007-05-19 11:46:40 UTC (rev 6285)
+++ kde-extras/guidance/trunk/debian/watch 2007-05-19 12:24:52 UTC (rev 6286)
@@ -1,7 +1,2 @@
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
version=3
-
http://www.simonzone.com/software/guidance/guidance-(.*)\.tar\.bz2 debian svn-upgrade
-
More information about the pkg-kde-commits
mailing list