Added python packages to Ubuntu Maverick

23 files changed, 2696 insertions, 0 deletions

diff --git a/ubuntu/maverick/applications/kde-guidance/debian/README.Debian b/ubuntu/maverick/applications/kde-guidance/debian/README.Debian
new file mode 100644
index 000000000..b0302c211
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/README.Debian
@@ -0,0 +1,107 @@
+Debian kde-extras Team
+----------------------
+
+1. Contacts
+-----------
+
+General help requests
+	<debian-kde@lists.debian.org>	mailing list
+	#debian-kde			on irc
+
+Packaging queries
+	<debian-qt-kde@lists.debian.org>  mailing list
+	#debian-qt-kde			  on irc
+
+Maintainers
+	<pkg-kde-extras@lists.alioth.debian.org>	mailing list
+
+
+2. Subversion repository
+------------------------
+  
+You can browse it only at:
+
+http://svn.debian.org/wsvn/pkg-kde/kde-extras/
+
+To "checkout" the repository use these commands:
+
+	$ svn co svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
+
+Authorized SSH keys are controlled at https://alioth.debian.org/account/
+
+The repository layout is:
+
+- packagename/
+    - trunk/
+    - branches/
+    - tags/
+        - 0.7.2-1/
+        - 0.7.2-2/
+        - 0.7.2-2ubuntu1/
+        - 0.7.2-2ubuntu2/
+        - 0.7.2-2ubuntu3/
+        - 0.8.0/
+        ...
+
+If only one version of the package is available at the time, development must 
+be made at trunk/ dir, copying the dir to tags/'pkg-version' each time a new 
+release is made.
+
+When, at some point, the need to have two different versions at the same time 
+arises (for example, if we need a version to be in unstable and a different one
+to be in experimental), experimental development will be made in trunk/ and 
+if a new unstable package needs to be cooked, copying 
+tag/'latest_version_in_sid' to tag/'latest_version_in_sid'+1 will make the
+trick.
+
+3. Using svn-buildpackage
+--------------------------
+
+Packages with an upstream tarball will require you to set the mergeWithUpstream
+property first (from the package root) so that svn-buildpackage will look for
+the .orig.tar.gz in the ../tarballs directory.
+	
+	% svn propset mergeWithUpstream 1 debian
+
+Please note that this only works for packages which have only the debian/
+directory committed. Consequently, you must use CDBS's simple-patchsys.mk or
+dpatch to modify the upstream sources.
+
+After you have finished and committed your Debian patches via
+	
+	% svn commit [PACKAGE]
+
+as well as copying the orig.tar.gz to ../tarballs/ if necessary, you may build
+your package with the following commands:
+
+	% svn-buildpackage --svn-ignore-new -rfakeroot
+
+Please, don't commit tarballs/ or build-area/ directories to SVN.
+
+4. Tarballs and Build-area directories
+------------------------------------
+
+During pkg development before uploaded to debian the tarballs can be found at:
+
+	http://pkg-kde.alioth.debian.org/kde-extra/orig.tar.gz/
+
+You need to place those dirs in the parent directory of the one from which you're 
+running svn-buildpackage. Usually this means placing tarballs/ and build-area/ dirs 
+in 'pkgname'/ dir, at the same level as trunk/
+
+If you want to compile inside one version in tags/ dir, you'll need to place those
+dirs inside that dir. Of course the easiest and cleanest way of doing it is 
+by making a symlink of those dirs inside tags/ dir.
+
+5. Using svn-inject
+-------------------
+
+To inject a new package into the Debian KDE Extras svn archive you should use svn-inject(1)
+as follows:
+
+        svn-inject -o <package>.dsc svn+ssh://${ALIOTH_USERNAME}@svn.debian.org/svn/pkg-kde/kde-extras
+
+Type in your alioth password a few hundred times :-) and your package should be
+uploaded to the archive.  Note you will also need to manually copy the
+package.orig.tar.gz to your tarballs directory.  The -o option is important as
+this ensures that we 'Only keep modified files under SVN control'
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/changelog b/ubuntu/maverick/applications/kde-guidance/debian/changelog
new file mode 100644
index 000000000..fbd50fb8f
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/changelog
@@ -0,0 +1,1103 @@
+kde-guidance-trinity (0.8.0svn20080103-0ubuntu17.15) karmic; urgency=low
+
+  * Repaired displayconfig scripting and paths
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 25 Oct 2009 21:47:00 -0600
+
+kde-guidance-trinity (0.8.0svn20080103-0ubuntu17.5) karmic; urgency=low
+
+  * Karmic rebuild
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 26 Jul 2009 17:59:00 -0600
+
+kde-guidance-trinity (0.8.0svn20080103-0ubuntu17.4) jaunty; urgency=low
+
+  * Rebuild against Python 2.6
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Wed, 22 Apr 2009 22:44:00 -0600
+
+kde-guidance-trinity (0.8.0svn20080103-0ubuntu16.5) intrepid; urgency=low
+
+  * Fixed broken links (closes bug #58)
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 03 Apr 2009 11:18:00 -0600
+
+kde-guidance-trinity (0.8.0svn20080103-0ubuntu16.4) intrepid; urgency=low
+
+  * Added -trinity suffix, altered paths
+
+ -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Sun, 08 Mar 2009 16:31:00 -0600
+
+kde-guidance (0.8.0svn20080103-0ubuntu16.2) hardy-proposed; urgency=low
+
+  * kubuntu_35_displayconfig_detect_nvidia_driver.patch:
+    - Detect proprietary driver 'nvidia' again as some of the nvidia
+      driver files used for detection has been moved. (LP: #271655)
+
+ -- Andreas Wenning <awen@awen.dk>  Thu, 18 Sep 2008 14:24:31 +0200
+
+kde-guidance (0.8.0svn20080103-0ubuntu16.1) hardy-proposed; urgency=low
+
+  [ Anthony Fok ]
+  * kubuntu_32_displayconfig_update_refresh_rate.patch:
+    - The refresh rate was not updated for the selected resolution, so
+      resolution change could fail. (LP: #82279)
+  * kubuntu_33_displayconfig_add_new_video_cards.patch:
+    - Added 8086:29b2 for "Intel Q35";
+  * debian/copyright: s/FDL/GFDL/;
+
+  [ Andreas Wenning ]
+  * kubuntu_34_kde-powermanager_no_lid_special_behaviour_disable.patch:
+    - No need to call power plugged/unplugged in init if no lid is
+      found; this just make us crash. (LP: #231163)
+  * Edited kubuntu_23_kde-powermanager_gpmhelper.patch to prevent
+    multiple brightness- or hibernate-calls happening on certain
+    machines. Already implemented for sleep-calls. (LP: #207473)
+
+ -- Andreas Wenning <awen@awen.dk>  Thu, 05 Jun 2008 16:24:38 +0200
+
+kde-guidance (0.8.0svn20080103-0ubuntu16) hardy; urgency=low
+
+  * kubuntu_26_kde-powermanager_handle_hal_dbus_restarts.patch:
+    - don't try to restart HAL if it is not running, let gpm displays
+      "the battery has been removed" so that the user knows that he
+      can't relay on gpm to check his battery state
+    - don't try to restart DBus at all, it's not supported upstream and
+      can cause trouble
+
+ -- Guillaume Martres <smarter@ubuntu.com>  Thu, 17 Apr 2008 14:18:43 +0200
+
+kde-guidance (0.8.0svn20080103-0ubuntu15) hardy; urgency=low
+
+  [ Andreas Wenning ]
+  * Added kubuntu_29_kde-powermanager_display_consumption_rate.patch to
+    display current consumption rate. (LP: #214774).
+  * Readded kubuntu_30_displayconfig_no_xorg_correct_detection.patch
+    which doesn't break the api. displayconfig will detect the hardware
+    automatically and write a xorg.conf if none is present on startup.
+    (LP: #203378).
+
+  [ Yuriy Kozlov ]
+  * Added kubuntu_31_wineconfig_no_i18_on_keys.patch to remove i18n from
+    dictionary keys, which caused crashes on non en_US locales.  Should be
+    removed if synced with upstream. (LP: #82723)
+
+ -- Yuriy Kozlov <yuriy-kozlov@kubuntu.org>  Sun, 13 Apr 2008 12:49:35 -0400
+
+kde-guidance (0.8.0svn20080103-0ubuntu14) hardy; urgency=low
+
+  * Disable kubuntu_30_displayconfig_no_xorg_correct_detection.patch. It
+    breaks the API, and the previous change did not even state a bug number.
+    This broke jockey, displayconfig-gtk, and other reverse dependencies and
+    is absolutely inappropriate right before a release. (LP: #214914 and a
+    magnitude of 100 duplicates)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Sat, 12 Apr 2008 18:17:24 +0200
+
+kde-guidance (0.8.0svn20080103-0ubuntu13) hardy; urgency=low
+
+  * Added kubuntu_30_displayconfig_no_xorg_correct_detection.patch
+    so we will detect the hardware automatically and write a xorg.conf
+    if none is present on startup.
+
+ -- Andreas Wenning <awen@awen.dk>  Thu, 10 Apr 2008 00:59:19 +0200
+
+kde-guidance (0.8.0svn20080103-0ubuntu12) hardy; urgency=low
+
+  * Patch kubuntu_28_kde-powermanager_i18n_strings.patch adds missing
+    translatable string.
+
+ -- Andreas Wenning <awen@awen.dk>  Wed, 09 Apr 2008 00:13:18 +0200
+
+kde-guidance (0.8.0svn20080103-0ubuntu11) hardy; urgency=low
+
+  [ Andreas Wenning ]
+  * Added kubuntu_24_displayconfig_no_gamma.patch: As we cannot check if
+    the video driver supports live gamma changes, we should catch any
+    exceptions generated by lacking support. (LP: #201092, #201468).
+  * Added kubuntu_25_kde-powermanager_allways_change_brightness.patch
+    which disables the internal check for not setting the same bright-
+    ness as last time. Some laptops can change brightness in hardware
+    and other programs can change it through HAL, so we should allways
+    try to change the brightness.
+
+  [ Guillaume Martres ]
+  * Added kubuntu_26_kde-powermanager_handle_hal_dbus_restarts.patch so
+    the powermanager better handles dbus/hal restarts. (LP: #123812).
+
+  [ Scott Kitterman ]
+  * Added kubuntu_27_displayconfig-restore_try_getsize_again.patch to try to
+    get size from screen 0 if the first attempt failed (LP: #206509)
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 05 Apr 2008 20:06:50 -0400
+
+kde-guidance (0.8.0svn20080103-0ubuntu10) hardy; urgency=low
+
+  [ Andreas Wenning ]
+  * Added kubuntu_21_kde-powermanager_unique-check.patch:
+    - Fixed guidance-power-managers check for being a unique app.
+  * Added kubuntu_23_kde-powermanager_gpmhelper.patch:
+    - Added gpmhelper.py to listen for HAL button-events and issue
+      dcop calls to guidance-power-manager.
+    - guidance-power-manager will now start gpmhelper.py.
+    - Patched setup.py to build/install gpmhelper.py
+  * Changed debian/rules and debian/kde-guidance-powermanager.install
+    to install gpmhelper.py
+  * Added depends for kde-guidance-powermanager to python-gobject as
+    this is the only mainloop to work with DBusGMainLoop.
+
+  [ Scott Kitterman ]
+  * In kubuntu_14_displayconfig_no_xorg_no_serverlayout.patch simplify fake
+    xorg.conf invented if it's missing - match xorg.conf generatedy by
+    Hardy's Bulletproof X
+  * Update kununtu_13_displayconfig_add_new_monitors.patch with new monitors
+
+ -- Scott Kitterman <scott@kitterman.com>  Sun, 30 Mar 2008 19:11:55 -0400
+
+kde-guidance (0.8.0svn20080103-0ubuntu9) hardy; urgency=low
+
+  [ Andreas Wenning ]
+  * Added kubuntu_22_userconfig_utf8.patch which fixes unicode problems present
+    under some locales. (LP: #205487)
+
+  [ Scott Kitterman ]
+  * Add kubuntu_20_displayconfig_dynamic_driver_list.patch to dynamically list
+    all available driver vendors and not depend on a hard coded list 
+    (LP: #149793)
+
+ -- Scott Kitterman <scott@kitterman.com>  Sat, 29 Mar 2008 23:10:20 -0400
+
+kde-guidance (0.8.0svn20080103-0ubuntu8) hardy; urgency=low
+
+  * Update kubuntu_12_powermanager_survive_no_brightness.patch so it correctly
+    catches the error (LP: #183656)
+  * Add kubuntu_18_displayconfig_no_resolutions.patch so displayconfig doesn't
+    crash if current display size or refresh rate can't be fetched
+    (LP: #147721)
+  * Add kubuntu_19_powermanager_new_names.patch to use new hal keys 
+    (LP: #204768)
+    - Patch thanks to Mikael Gerdin
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 25 Mar 2008 11:48:16 -0400
+
+kde-guidance (0.8.0svn20080103-0ubuntu7) hardy; urgency=low
+
+  * Added debian/patches/kubuntu_17_kde-powermanager_brightness.patch
+    which fixes the brightness slider when number of brightness levels
+    is too small.
+
+ -- Andreas Wenning <awen@awen.dk>  Mon, 17 Mar 2008 23:02:36 +0100
+
+kde-guidance (0.8.0svn20080103-0ubuntu6) hardy; urgency=low
+
+  * Bump standards version to 3.7.3 without further change
+  * Rename kubuntu_14_displayconfig_survive_no_serverlayout.patch to be
+    kubuntu_14_displayconfig_no_xorg_no_serverlayout.patch
+    - Don't crash if xorg.conf is missing (LP: #93749):
+      - In xorgconfig, create an emtpy xorg.conf if none exists and lie and 
+        pretend a minimal, largely generic xorg.conf exists
+      - In xorgconfig, if not running with Admin priviledges just trap the no
+        xorg.conf error and continue
+      - In displayconfig, assume xorg.conf belongs in /etc/X11 and create it
+        if it happens to be missing when trying to save out a configuration
+      - This is not a fully satisfactory solution to this problem - users will
+        have to select their monitor, restart X, and then make their settings
+    - In xorgconfig, as previously patched, add a ServerLayout section if an
+      existing xorg.conf is missing one (LP: #173768)
+  * Add kubuntu_16_displayconfig_no_xrrqueryextention.patch to avoid crashing
+    if the XRRQueryExtension is not found (LP: #146945)
+
+ -- Scott Kitterman <scott@kitterman.com>  Mon, 17 Mar 2008 15:23:49 -0400
+
+kde-guidance (0.8.0svn20080103-0ubuntu5) hardy; urgency=low
+
+  * debian/patches/kubuntu_15_powermanager_suspend.patch so we can
+    suspend.
+
+ -- Andreas Wenning <awen@awen.dk>  Thu, 13 Mar 2008 11:33:46 +0100
+
+kde-guidance (0.8.0svn20080103-0ubuntu4) hardy; urgency=low
+
+  * Add kubuntu_14_displayconfig_survive_no_serverlayout.patch so 
+    displaymanager doesn't crash if xorg.conf has no ServerLayout section 
+    (LP: #173768)
+  * Add to kubuntu_12_powermanager_survive_no_brightness.patch so it doesn't
+    crash if DBUS thinks there is brightness, but is wrong
+
+ -- Scott Kitterman <scott@kitterman.com>  Wed, 12 Mar 2008 10:19:57 -0400
+
+kde-guidance (0.8.0svn20080103-0ubuntu3) hardy; urgency=low
+
+  * Add Add kubuntu_09_mountconfig_no_extensions.patch to remove uneeded call
+    to pykdeextensions in mountconfig so that pyqt3 no longer needs to be
+    patched to provide -dev files in the regular package (LP: #197867)
+  * Add kubuntu_10_displayconfig_tryagain.patch so that if displayconfig
+    thinks a proprietary driver is installed, but it can't find it, it 
+    will try to find a non-proprietary driver instead of crashing (LP: #198269)
+  * Add kubuntu_11_wineconfg_amd64.patch so that wineconfig looks in the right
+    dir for wine on AMD64 (LP: #151982) - Patch should be removed for the next
+    svn snapshot or release as a fix has been committed upstream already
+  * Add kubuntu_12_powermanager_survive_no_brightness.patch so that if the old
+    brightness cannot be gotten from DBUS, powermanager won't crash 
+    (LP: #183656) and (LP: #198071)
+  * Add kununtu_13_displayconfig_add_new_monitors.patch to update MonitorsDB
+    with a upstream snapshot of MonitorsDB from hwdata (LP: #192899)
+
+ -- Scott Kitterman <scott@kitterman.com>  Sun, 09 Mar 2008 19:53:42 -0400
+
+kde-guidance (0.8.0svn20080103-0ubuntu2) hardy; urgency=low
+
+  * Revert inadvertent upload meant for PPA
+
+ -- Scott Kitterman <scott@kitterman.com>  Tue, 04 Mar 2008 16:52:29 -0500
+
+kde-guidance (0.8.0svn20080103-0ubuntu1) hardy; urgency=low
+
+  * New svn snapshot, includes fixes for .pot file
+  * Add kubuntu_07_powermanager_i18n.patch:
+    - guidance-power-manager.py loads the correct .pot file
+  * Cleaned debian/rules:
+    - Installs the *.py files generated with i18n options in it
+  * Fixed debian/control, for good build-depends on python-trinity:
+    - Build needs a patched kdepyuic
+  * Added patch kubuntu_08_nice_groups_and_privileges.patch:
+    - Fixes LP: #156508
+    - Patch by Manuel Amador <rudd-o@rudd-o.com>
+
+ -- Anthony Mercatante <tonio@kubuntu>  Thu, 03 Jan 2008 22:37:28 +0100
+
+kde-guidance (0.8.0svn20070928-0ubuntu7) gutsy; urgency=low
+
+  * Add workaround to displayconfig-restore.py for 151311
+    kubuntu_06_displayconfig_fix_intel_dpi.diff
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 15 Oct 2007 15:53:45 +0100
+
+kde-guidance (0.8.0svn20070928-0ubuntu6) gutsy; urgency=low
+
+  [ Jonathan Riddell ] * Add kubuntu_05_displayconfig_fix.diff with
+  fix from Sebastian Heinline for bug which resulted in falsely
+  restart X requests.
+
+  [ Luka Renko ]
+  * Disk & Filesystems does not work on non-English/unicode systems.
+    Patch provided by Liam Keene. (LP: #141023)
+    debian/patches/kubuntu_04_disk_unicode.diff
+  * Install Xsession startup script (displayconfig-restore) in 
+    kde-guidance package as it is KDE specific. (LP: #146730)
+
+ -- Luka Renko <lure@ubuntu.com>  Tue, 09 Oct 2007 19:57:37 +0200
+
+kde-guidance (0.8.0svn20070928-0ubuntu5) gutsy; urgency=low
+
+  * Make guidance-backends replace/conflicts old kde-guidance
+    Closes LP: #133810
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 08 Oct 2007 12:44:15 +0100
+
+kde-guidance (0.8.0svn20070928-0ubuntu4) gutsy; urgency=low
+
+  * Remove kubuntu_04_no_ati_dualhead.diff, it conflicts with patch 03
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 05 Oct 2007 12:22:27 +0100
+
+kde-guidance (0.8.0svn20070928-0ubuntu3) gutsy; urgency=low
+
+  * Add kubuntu_04_no_ati_dualhead.diff from Sebastian Heinlein, 
+    the latest free ATI drivers do no longer support the classic xinerama
+    dual head configuration.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 04 Oct 2007 21:47:47 +0100
+
+kde-guidance (0.8.0svn20070928-0ubuntu2) gutsy; urgency=low
+
+  * Add kubuntu_03_displayconfig_updates.diff with updates from SVN by glatzor
+   - Disable dual head support for intel and ati driver
+   - Add the MonitorLayout option for Intel in LAYOUT_DUAL too
+   - work around for a common crashed in isResolutionSettingsChanged()
+   - Add an allowModule and disableModule to the ModuleSection class
+   - The driver in the xorg.conf should always override the driver of
+     the detected gfx card model
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 01 Oct 2007 23:25:16 +0100
+
+kde-guidance (0.8.0svn20070928-0ubuntu1) gutsy; urgency=low
+
+  * New snapshot, includes
+   - Update monitor definitions - fixes LP: #113520 #113514
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 28 Sep 2007 11:47:59 +0100
+
+kde-guidance (0.8.0svn20070727-0ubuntu6) gutsy; urgency=low
+
+  * Fix for crash when loading xorg.conf's using the "Disable" keyword
+
+ -- Bryce Harrington <bryce@ubuntu.com>  Thu,  6 Sep 2007 10:56:03 -0700
+
+kde-guidance (0.8.0svn20070727-0ubuntu5) gutsy; urgency=low
+
+  * Update kde-guidance replaces/conflicts guidance-backends
+    closes https://bugs.launchpad.net/ubuntu/+source/kde-guidance/+bug/133810
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 05 Sep 2007 18:59:44 +0100
+
+kde-guidance (0.8.0svn20070727-0ubuntu4) gutsy; urgency=low
+
+  * Fixed an issue where you cannot not select the primary group for a user
+    in the secondary ListPickerDialog()
+   - Closes https://bugs.launchpad.net/ubuntu/+source/kde-guidance/+bug/47412
+   - Added kubuntu_02_primary_group_change.diff
+
+ -- Stefan Skotte <sfs@enhance-it.dk>  Mon, 03 Sep 2007 22:17:07 +0200
+
+kde-guidance (0.8.0svn20070727-0ubuntu3) gutsy; urgency=low
+
+  * Update from Uwe Koziolek <uwe.koziolek@gmx.net>
+    The attached files includes updates for pcitables. The data are
+    crosschecked against the readme from the NVIDIA-drivers and the
+    C-sourcecode from x.org xserver-xorg-video-nv
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 30 Aug 2007 15:34:26 +0100
+
+kde-guidance (0.8.0svn20070727-0ubuntu2) gutsy; urgency=low
+
+  * Build-dep on python-qt-dev
+  * Add kubuntu_01_infimport.diff to install infiimport.py file, closes
+    https://bugs.launchpad.net/ubuntu/+source/kde-guidance/+bug/131669
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 14 Aug 2007 10:53:06 +0100
+
+kde-guidance (0.8.0svn20070727-0ubuntu1) gutsy; urgency=low
+
+  * New upstream snapshot
+  * Remove all patches, applied upstream
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 27 Jul 2007 18:00:13 +0100
+
+kde-guidance (0.8.0-1ubuntu9) gutsy; urgency=low
+
+  * Add debian/patches/xorgconfig_dexconf_style.patch: Change xorgconfig.py's
+    style of written xorg.conf files to closely match dexconf's: Capitalize
+    keywords, and use tabs instead of two spaces for indentation.
+  * debian/control: Set Ubuntu maintainer.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 19 Jun 2007 19:10:11 +0200
+
+kde-guidance (0.8.0-1ubuntu8) gutsy; urgency=low
+
+  * Fix symlink to displayconfig-restore
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 07 Jun 2007 13:16:25 +0100
+
+kde-guidance (0.8.0-1ubuntu7) gutsy; urgency=low
+
+  * Fix kde-guidance's replaces to allow installation
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 06 Jun 2007 09:42:36 +0000
+
+kde-guidance (0.8.0-1ubuntu6) gutsy; urgency=low
+
+  * Fix path in /usr/bin/guidance-power-manager
+  * Add replaces to old package on kde-guidance
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Jun 2007 21:35:55 +0000
+
+kde-guidance (0.8.0-1ubuntu5) gutsy; urgency=low
+
+  * Remove excessive dependencies from guidance-backends
+  * Split up python-central directories to avoid overlapping files
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 05 Jun 2007 14:47:30 +0000
+
+kde-guidance (0.8.0-1ubuntu4) gutsy; urgency=low
+
+  * Move pyversion to correctly named pyversions, to build with python 2.5
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 04 Jun 2007 16:00:50 +0000
+
+kde-guidance (0.8.0-1ubuntu3) gutsy; urgency=low
+
+  * Fix versioned build depends to python-qt3 not python-trinity
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 04 Jun 2007 13:23:18 +0100
+
+kde-guidance (0.8.0-1ubuntu2) gutsy; urgency=low
+
+  * Build-dep on python-qt3 >= 3.17.2-1ubuntu2 for compile fix
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 31 May 2007 11:59:26 +0100
+
+kde-guidance (0.8.0-1ubuntu1) gutsy; urgency=low
+
+  * Merge with Debian, remaining change:
+   - kubuntu_01_enable_wineconfig.diff
+   - pyversion is 2.5
+  * Add wineconfig to description in control
+  * Split out platform neutral stuff into guidance-backends
+  * Add patches from displayconfig-gtk
+   - MonitorLayout.patch
+   - fix_intel_dualhead.patch
+   - noconifg.patch
+   - enable_native_cloning_for_i810.patch
+   - fix_multiple_screens_laptop.patch
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 30 May 2007 15:54:26 +0100
+
+kde-guidance (0.8.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+  [ 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 ]
+  * Add debian/watch.
+
+ -- Fathi Boudra <fboudra@free.fr>  Fri, 18 May 2007 19:45:51 +0200
+
+kde-guidance (0.8.0-0ubuntu5) feisty; urgency=low
+
+  * Update kubuntu_06_powermanager_fixes.diff with fix from
+    https://launchpad.net/bugs/104794 comment 7
+    fixes shows dischanging if battery full.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 13 Apr 2007 10:50:55 +0100
+
+kde-guidance (0.8.0-0ubuntu4) feisty; urgency=low
+
+  * Add kubuntu_05_nvidia_typo.diff fix crash with nvidia non-free driver
+  * Add kubuntu_06_powermanager_fixes.diff with fixes from trunk
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  9 Apr 2007 23:47:13 +0100
+
+kde-guidance (0.8.0-0ubuntu3) feisty; urgency=low
+
+  * Remove old displayconfig-hwprobe.py init links in kde-guidance.postinst
+    closes https://bugs.launchpad.net/ubuntu/+source/kde-guidance/+bug/99203
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri,  6 Apr 2007 16:29:18 +0100
+
+kde-guidance (0.8.0-0ubuntu2) feisty; urgency=low
+
+  * Add kubuntu_03_no_cpu_freq.diff, fix https://launchpad.net/bugs/99198
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 31 Mar 2007 11:33:39 +0100
+
+kde-guidance (0.8.0-0ubuntu1) feisty; urgency=low
+
+  * Non-snapshot release for feisty
+  * Add kubuntu_02_wineconfig_icon.diff fix icon name in .desktop file
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 30 Mar 2007 12:17:30 +0100
+
+kde-guidance (0.7.1~svn20070205-0ubuntu1) feisty; urgency=low
+
+  * New upstream snapshot
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Mon, 05 Feb 2007 11:52:27 +0100
+
+kde-guidance (0.7.1~svn20070204-1) experimental; urgency=low
+
+  [ Fathi Boudra ]
+  * New release from svn r630094. (Closes: #397508, #405880)
+  * Remove useless patch typos_setup and force_python2.4_script.
+  * control:
+    * Add libxss-dev to build-depends.
+    * Remove python-dbus depends on kde-guidance.
+    * Add Conflicts: python2.4-iconvcodec on kde-guidance.
+    * Add kde-guidance depends on kde-guidance-powermanager.
+    * Remove Conflicts: klaptopdaemon, kpowersave on kde-guidance-powermanager
+  * kde-guidance.install: replace versioned python by wildcard on ixf86misc.so.
+  * kde-guidance-powermanager.install: use wildcard for battery pics.
+  * rules:
+    * Replace hardcoded python version by wildcard.
+    * Enable wineconfig.
+    * Fix powermanager icons.
+
+  [ Mark Purcell ]
+  * Add ./debian/rules get-orig-source for http://buildserver.net
+
+ -- Fathi Boudra <fboudra@free.fr>  Sun,  4 Feb 2007 12:27:42 +0100
+
+kde-guidance (0.7.1~svn20070129-0ubuntu1) feisty; urgency=low
+
+  * New upstream snapshot
+  * Add kubuntu_01_enable_wineconfig.diff to enable wineconfig in
+    system settings (experimental)
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 29 Jan 2007 18:03:53 +0000
+
+kde-guidance (0.7.1~svn20070111-0ubuntu7) feisty; urgency=low
+
+  * Add kubuntu_02_powermanage.diff from trunk, stop it breaking
+    when cpufreq is disabled
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 18 Jan 2007 15:44:26 +0000
+
+kde-guidance (0.7.1~svn20070111-0ubuntu6) feisty; urgency=low
+
+  * Remove debian/patches/12_force_python2.4_script.diff.
+
+ -- Matthias Klose <doko@ubuntu.com>  Tue, 16 Jan 2007 12:44:50 +0100
+
+kde-guidance (0.7.1~svn20070111-0ubuntu5) feisty; urgency=low
+
+  * Use the unversioned interpreter name for the scripts.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Jan 2007 15:47:46 +0000
+
+kde-guidance (0.7.1~svn20070111-0ubuntu4) feisty; urgency=low
+
+  * debian/pyversions: Nice file to hardcode the python version.
+  * debian/rules: Don't hardcode the python version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 15 Jan 2007 09:22:54 +0000
+
+kde-guidance (0.7.1~svn20070111-0ubuntu3) feisty; urgency=low
+
+  * Rebuild for python2.5 as the default python version.
+
+ -- Matthias Klose <doko@ubuntu.com>  Fri, 12 Jan 2007 13:18:02 +0000
+
+kde-guidance (0.7.1~svn20070111-0ubuntu2) feisty; urgency=low
+
+  * Drop some duplicate icons from kde-guidance-powermanager
+    (already in kde-guidance package)
+
+ -- Luka Renko <lure@ubuntu.com>  Tue,  9 Jan 2007 20:15:54 +0100
+
+kde-guidance (0.7.1~svn20070111-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot. Fixes powermanager icons.
+  * Fixed debian/control, kde-guidance doesn't depend on
+    python-dbus and kde-guidance-powermanager depends on
+    kde-guidance.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 09 Jan 2007 17:07:35 +0100
+
+kde-guidance (0.7.1~svn20070110-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot. Fixes critical crash on startup.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 09 Jan 2007 13:45:32 +0100
+
+kde-guidance (0.7.1~svn20070109-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Tue, 09 Jan 2007 01:55:47 +0100
+
+kde-guidance (0.7.1~svn20061215-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot.
+  * Clean powermanager/icon content
+  * Fixed guidance-power-manager.py to use correctly all
+    charging/discharging icons
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri, 15 Dec 2006 03:51:54 +0100
+
+kde-guidance (0.7.1~svn20061124-0ubuntu2) feisty; urgency=low
+
+  * Rebuilt against new pykde.
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Wed, 06 Dec 2006 23:40:32 +0100
+
+kde-guidance (0.7.1~svn20061124-0ubuntu1) feisty; urgency=low
+
+  * New SVN snapshot.
+  * Removed obsolete kubuntu_10_critical_threshold.diff
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  24 Nov 2006 01:00:28 +0200
+
+kde-guidance (0.7.0-1) unstable; urgency=low
+
+  * 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-trinity-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@free.fr>  Mon, 21 Aug 2006 10:34:01 +0200
+
+kde-guidance (0.7.0-0ubuntu4) edgy; urgency=low
+
+  * Edit debian/rules to generate .pot file
+    Closes Malone No 67614
+  * Remove Conflicts: klaptopdaemon, kpowersave from kde-guidance-powermanager
+    allows people to do apt-get install kde
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 22 Oct 2006 20:05:01 +0000
+
+kde-guidance (0.7.0-0ubuntu3) edgy; urgency=low
+
+  * Make kde-guidance conflict on python2.4-iconvcodec
+    Closes Malone No 62223
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 22 Oct 2006 14:34:54 +0100
+
+kde-guidance (0.7.0-0ubuntu2) edgy; urgency=low
+
+  * kubuntu_10_critical_threshold.diff added, reduce safety threshold
+    for percentage charged to 10% in order to prevent automatic critical
+    action to be performed when remaining time is not reported properly.
+    Use threshold also for low battery warning notification to prevent 
+    false alarms.
+    Closes LP #64752, #67081
+
+  * kubuntu_20_lid_hibernate.diff added, to fix double hibernate action
+    when user has selected hibernate as action on lid close.
+    Closes LP #65885
+
+ -- Luka Renko <lure@ubuntu.com>  Sat, 21 Oct 2006 15:10:50 +0200
+
+kde-guidance (0.7.0-0ubuntu1) edgy; urgency=low
+
+  * Bump version number for an Edgy release
+  * Fixes bugs 64053 and 64978
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 12 Oct 2006 20:05:22 +0100
+
+kde-guidance (0.6.7svn20061006-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Fri,  10 Oct 2006 16:04:28 +0200
+
+kde-guidance (0.6.7svn20060919-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+  * Split out power manager applet into new package so it can be removed 
+    or installed standalone
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 19 Sep 2006 14:52:11 +0100
+
+kde-guidance (0.6.7svn20060914-0ubuntu2) edgy; urgency=low
+
+  * Remove stop script symlinks from rc0 and rc6.
+
+ -- Scott James Remnant <scott@ubuntu.com>  Mon, 18 Sep 2006 17:26:27 +0100
+
+kde-guidance (0.6.7svn20060914-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot, includes power-manager improvement
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Thu,  14 Sep 2006 20:54:28 +0200
+
+kde-guidance (0.6.7svn20060906-0ubuntu2) edgy; urgency=low
+
+  * Changed debian/rules to create a script to launch
+    guidance-power-manager instead of a link. Fixes the logout issue
+    in kde and klipper, kbluetoothd not launching since power-manager
+    wasn't in the background.
+  * Temporary changed debian/pyversions, replacing "2.4-" by "2.4",
+    since build fails using python 2.5, problem to import kdedistutils
+
+ -- Anthony Mercatante <tonio@ubuntu.com>  Sun,  10 Sep 2006 13:45:28 +0200
+
+kde-guidance (0.6.7svn20060906-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot, includes displayconfig usability fixes, 
+    powerconfig fixes and new powerconfig icons
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed,  6 Sep 2006 13:22:28 +0100
+
+kde-guidance (0.6.7svn20060829-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 29 Aug 2006 14:35:20 +0100
+
+kde-guidance (0.6.7svn20060810-0ubuntu1) edgy; urgency=low
+
+  * New SVN snapshot
+  * Adds power manager applet for 
+    https://launchpad.net/distros/ubuntu/+spec/kubuntu-power-management
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 10 Aug 2006 08:56:24 -0400
+
+kde-guidance (0.6.7-3ubuntu2) edgy; urgency=low
+
+  * debian/rules: Don't add extra /usr prefix when creating symlinks
+    for {display,mount,service,user}config & displayconfig-restore
+    (Closes Ubuntu: #54742).
+
+ -- Daniel T Chen <crimsun@ubuntu.com>  Mon, 31 Jul 2006 21:55:39 -0400
+
+kde-guidance (0.6.7-3ubuntu1) edgy; urgency=low
+
+  * Sync with Debian
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 26 Jul 2006 18:39:47 +0100
+
+kde-guidance (0.6.7-3) experimental; urgency=low
+
+  * Fixed displayconfig-hwprobe.py in kde-guidance.init (Closes: #376779)
+
+ -- Fathi Boudra <fboudra@free.fr>  Wed,  5 Jul 2006 08:35:08 +0200
+
+kde-guidance (0.6.7-2) experimental; urgency=low
+
+  * Converted package to python-support
+  * Added pycompat and pyversions
+  * Force to use python2.4 (Closes: #375443)
+  * Added to Build-Depends: python-support, python-all-dev
+  * Removed source.lintian-overrides
+  * Cleaned up rules
+  * Added 12_force_python2.4_script.diff to force python2.4 in scripts
+
+ -- Fathi Boudra <fboudra@free.fr>  Fri, 30 Jun 2006 14:44:46 +0200
+
+kde-guidance (0.6.7-1) experimental; urgency=low
+
+  * Initial Debian release (Closes: #340144)
+  * Merged with Ubuntu
+  * Converted to cdbs
+  * Updated debian/copyright according to GFDL documentations
+  * Updated postinst and postrm with debhelper token
+  * Added source lintian override for indirect build dependency
+
+ -- Fathi Boudra <fboudra@free.fr>  Thu,  8 Jun 2006 17:08:06 +0200
+
+kde-guidance (0.6.7-0ubuntu4) dapper; urgency=low
+
+  * Add kubuntu_02_passwordexpire.diff from branch,
+    set local passexpirewarn (not global variable of same name) 
+    prevents UnboundLocalError, closes malone #47090
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 28 May 2006 14:34:10 +0100
+
+kde-guidance (0.6.7-0ubuntu3) dapper; urgency=low
+
+  * Change init number of displayconfig-hwprobe.py to 60, 
+    in line with Ubuntu policy
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 26 May 2006 14:18:42 +0100
+
+kde-guidance (0.6.7-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_01_branch.diff
+    - Adds Dutch Translations to .desktop files
+    - Fixes serviceconfig.py would sometimes fail on non-English systems.
+      (Closes Malone bug #43313).
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 19 May 2006 02:09:48 +0300
+
+kde-guidance (0.6.7-0ubuntu1) dapper; urgency=low
+
+  [ Simon Edwards ]
+  * Dutch translation added (Rinse de Vries)
+  * BUG: Displayconfig would fail if the monitor frequency settings in xorg.conf
+    contained extra spaces. (Malong bug #38692)
+  * BUG: Displayconfig would not add the lowest screen resolution available to
+    the modes list in the xorg.conf's Screen section/Display subsection.
+  * French translation added from Launchpad Rossetta.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 14 May 2006 01:38:55 +0300
+
+kde-guidance (0.6.6-0ubuntu1) dapper; urgency=low
+
+  [ Simon Edwards ]
+  * BUG: Serviceconfig didn't correctly remove links in runlevel directories.
+    (Malone bug #39404)
+  * BUG: In Serviceconfig, toggling the "Start during boot" checkbox using the
+    context menu would fail. (Malone bug #34252)
+  * BUG: displayconfig-restore.py was would fail with "global name 'syslog'
+    undefined". (Malone bug #40683)
+  * BUG: Displayconfig had trouble picking a driver gfxcard model entry instead
+    of the detected default (e.g. VESA). (Malone bug #41127)
+  * BUG: Displayconfig would fail when writing out a xorg.conf that contained
+    non-ascii characters. (Malone bug #41474)
+  * Work around for an annoying bug in PyQt/PyKDE that causes the tools to
+    crash on exit if a dialog window has been used.
+  * BUG: The file paths used in displayconfig for checking for the proprietary
+    nvidia driver were wrong or out of date.
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 28 Apr 2006 14:18:26 +0100
+
+kde-guidance (0.6.5-0ubuntu2) dapper; urgency=low
+
+  * Add kubuntu_01_broken_script.diff comment out invalid python in
+    displayconfig script
+ 
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 26 Apr 2006 00:38:46 +0100
+
+kde-guidance (0.6.5-0ubuntu1) dapper; urgency=low
+
+  [ Simon Edwards ]
+  * BUG: services that have not been installed via apt would cause long loops
+    a lot of dpkg queries. Only query dpkg db once.
+  * BUG: Serviceconfig's Apply button doesn't work. It should actually be Close
+    (Malone #38582)
+  * BUG: Changing an user's password can change another password for a different
+    user (Malone bug #39444)
+  * BUG: Displayconfig would fail at startup on systems with an nVidia 7800 GTX.
+    (Malone bug #32915 for Rob Hughes)
+  * BUG: Serviceconfig would crash if the windows is closed quickly after
+    serviceconfig appears.
+  * BUG: userconfig would fail at startup if an entry in /etc/passwd refered to
+    a group that is not defined in /etc/group. (Malone bug #34311)
+  * BUG: Userconifg. Manually typing in or editing the list of secondary groups
+    for a user had no effect. (Malone bug #37212)
+  * BUG: Displayconfig fails to detect the presence of the proprietary ATI and
+    nVidia drivers. (The location of some of the driver files had been recently
+    changed).
+  * BUG: displayconfig-restore.py would calculated the needed DPI at login using
+    stale screen information which would sometimes result in the wrong DPI.
+  * BUG: Numerious small bugs and compatibility problems in mountconfig.
+  * BUG: When browsing for a SMB share, mountconfig now correctly catches the
+    authentication information entered by the user into the smaller popup from
+    kio.
+  * Displayconfig now assumes that dualhead/clone mode is supported if the
+    laptop-detect script detects a laptop.
+  * Displayconfig now uses the clone mode support in the i810 driver.
+  * Displayconfig now only offers resolutions that both monitors support when
+    using clone mode.
+  * Displayconfig now supports clone mode on any setup that also supports
+    xinerama.
+  * BUG: Mountconfig failed to take into account that the order of the
+    user/users, exec/noexc, suid/nosuid etc options in /etc/fstab is significant.
+    (thanks Christoph Wiesen)
+  * French translations added to the desktop files. (Anthony Mercatante) 
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 20 Apr 2006 18:35:40 +0100
+
+kde-guidance (0.6.4-0ubuntu1) dapper; urgency=low
+
+  [ Simon Edwards ]
+  * BUG: All of the tools no longer write out config files under ~/.kde when
+    running as root. This should stop the annoying creation of config files
+    that can't be overwritten by the normal user.
+  * Userconfig is now by default not quite as tall. This should help stop
+    it from appearing too big in systemsettings.
+  * Displayconfig updated to also recognise late model nVidia chipsets.
+  * BUG: Displayconfig didn't support Clone mode for the proprietary nVidia
+    driver.
+  * BUG: The tools now correctly specify which translation catalogue to use for
+    translations.
+  * The screen images in the dualhead widget make better use of available widget
+    space.
+  * Displayconfig: The 40guidance-displayconfig_restore script which is used by
+    the Xsession script during login via KDM/xdm, has now been fixed to not stop
+    the login in case of failure.
+  * BUG: Displayconfig was getting confused by unknown graphics cards and
+    crashing. (Malone bug #32915)
+  * BUG: Displayconfig still can't handling unicode in xorg.conf. (Malone bug
+    #34437).
+  * BUG: Displayconfig is now more forgiving when xorg.conf contains characters
+    that are illegal with respect to the system character encoding. (Malone bug
+    #36590).
+  * BUG: Displayconfig would have trouble detecting hardware on the PCI bus on
+    big endian architectures. (raphink)
+  * BUG: Displayconfig did not correctly handle situations where the X RandR
+    extension is missing.
+  * BUG: Displayconfig would fail when loading some xorg.conf files containing
+    multiple graphics card specifications. (Malone bug #37275, patch applied)
+  * BUG: Userconfig didn't respect the entered UID when creating a account.
+    (Malone bug #37722).
+  * Displayconfig: Added 1280x960 modes (60 & 75Hz).
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  2 Apr 2006 21:46:15 +0100
+
+kde-guidance (0.6.3-0ubuntu1) dapper; urgency=low
+
+  [ Fathi Boudra ]
+  * Sync with Debian package (not yet in archives)
+
+  [ Simon Edwards ]
+  * BUG: userconfig and unixauthdb didn't respect the ownership of system files
+    when update /etc/passwd and friends. (Malone bug #26175).
+  * BUG: userconfig and unixauthdb would fail if /etc/passwd, /etc/groups or
+    /etc/shadow contained blank lines.
+  * BUG: displayconfig now does a better job of detecting graphics PCI devices
+    and handling non-detected graphics cards. Instead of crashing, "generic
+    VESA" is used when the type of card can't be found. (Malone bug #32915)
+  * The DPI that displayconfig-restore.py uses at login time can now be
+    controlled by adding a line to ~/.kde/share/config/displayconfigrc
+    in the [General] section. Add "dpi=xserver" to use the default DPI
+    from the X server, or "dpi=100" to use 100 DPI for example.
+  * BUG: Widescreen modes were missing in displayconfig.
+  * Displayconfig: Monitors can now be specified as being standard aspect ratio
+    or widescreen.
+  * BUG: Using the xresprobe command in displayconfig would crash some people's
+    machines. The much more safer ddcprobe command is now used.
+    (Malone bug #33943)
+  * BUG: A bug is displayconfig stopped monitor model detection. The xresprobe
+    command didn't actually return the eisa ID of the connected monitor.
+    ddcprobe does though (see above).
+  * BUG: Displayconfig. Changes to the monitor model or image format are
+    shown immediately on the "Size & Orientation" tab, even if the screen is
+    currently being used.
+  * BUG: When userconfig asks about whether the home directory should be created
+    when creating a new account, sometimes the wrong directory name was shown in
+    the dialog.
+  * BUG: Powerbook screen mode "1280x854" add to displayconfig. (Malone bug
+    #34383).
+  * BUG: Displayconfig would throw an exception if the current display didn't
+    support DPMS. (Malone bug #34316).
+  * BUG: Most utilities would fail if they came across UTF-8 or unicode
+    characters. (Malone bug #34194).
+  * BUG: Displayconfig wouldn't correctly detect the presence of installed
+    proprietary drivers. (OculusAquilae)
+  * BUG: Displayconfig had trouble handling BusID rows in xorg.conf. This would
+    cause the xorg.conf to be incorrectly read. (Tonio)
+  * Added some extra methods to ScanPCI.py to aid debugging.
+  * BUG: Displayconfig would not save the user's display settings when running
+    in kcontrol or systemsettings. (Malone bug #35257)
+
+ -- Fathi Boudra <fboudra@free.fr>  Sun, 19 Mar 2006 17:39:48 +0100
+
+kde-guidance (0.6.3-1) unstable; urgency=low
+
+  * Merge with Ubuntu
+  * New upstream version
+  * Added displayconfig
+  * Removed README.Debian
+  * Fixed manpages
+  * Fixed old fsf address in copyright file
+
+ -- Fathi Boudra <fboudra@free.fr>  Sun, 19 Mar 2006 15:46:17 +0100
+
+kde-guidance (0.6.2-0ubuntu1) dapper; urgency=low
+
+  [ Simon Edwards ]
+  * BUG: Small bug in displayconfig that caused it to bug out around the 
+    newCustomMonitor() method.
+  * BUG: userconfig had space character just before the she-bang which really
+    caused some trouble the for the shell.
+  * BUG: Displayconfig: Selecting the "Plug n Play" monitor directly without
+    clicking on "Detect" meant that only a very small set of resolutions would
+    be written to xorg.conf.
+  * BUG: The DPI calculations in displayconfig-restore.py where broken. This
+    resulted in the wrong DPI being used.
+  * BUG: Displayconfig: The clone mode option is now correctly disabled for
+    Matrox cards (mga driver).
+  * BUG: Displayconfig would bug out if the monitor model in the xorg.conf was
+    anything other than Plug n Play.
+  * BUG: Displayconfig would bug out if the DPMS Standby setting was 0 and DPMS
+    enabled.
+  * Displayconfig is now shown in kcontrol under settings/hardware instead of
+    settings/system.
+  * BUG: Small bug in displayconfig that will causes displayconfig to bug out
+    when trying to detect the monitor and no EDID info is available.
+  * BUG: Small cosmetic bug in displayconfig where the some tabs were missing
+    margins when shown in kcontrol/system settings.
+  * BUG: displayconfig would bug out when detecting ATI dualhead cards.
+    (pci_device.text was None).
+
+  [ Jonathan Riddell ]
+  * Remove kubuntu_02_display_category.diff, now in SVN
+  * Remove kubuntu_03_userconfig_shebang.diff, now in SVN
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun,  5 Mar 2006 21:51:47 +0000
+
+kde-guidance (0.6.1-0ubuntu0) dapper; urgency=low
+
+  * New release, sets a fixed DPI for Xft
+  * Add run time dependency on pykdeextensions
+  * Add kubuntu_03_userconfig_shebang.diff fix extra space
+  * Change init script to run at S35, Malone No. 32268
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon, 20 Feb 2006 22:22:25 +0000
+
+kde-guidance (0.6.0-0ubuntu1) dapper; urgency=low
+
+  * New release
+  * Implements Guidance sections of https://wiki.ubuntu.com/DebianSystemTools
+  * Add kubuntu_01_hardware_file_path.diff from SVN to use correct directory
+  * Add kubuntu_02_display_category.diff to put display into hardware category
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 18 Jan 2006 20:44:05 +0100
+
+kde-guidance (0.4.0+svn20060102-0ubuntu1) dapper; urgency=low
+
+  * New snapshot, displayconfig added
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Mon,  2 Jan 2006 22:53:34 +0000
+
+kde-guidance (0.4.0-0ubuntu5) dapper; urgency=low
+
+  * Rebuild for libstdc++ transition
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 13 Dec 2005 00:25:05 +0000
+
+kde-guidance (0.4.0-0ubuntu4) breezy; urgency=low
+
+  * Copy necessary icons to global icon directory
+  * Add GenericNames to .desktop files
+  * Avoid repetition in description
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 21 Sep 2005 02:44:22 +0100
+
+kde-guidance (0.4.0-0ubuntu3) breezy; urgency=low
+
+  * Move files from /usr/lib/python2.4/site-packages/guidance 
+    to just /usr/lib/python2.4/site-packages
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sat, 17 Sep 2005 21:31:21 +0100
+
+kde-guidance (0.4.0-0ubuntu2) breezy; urgency=low
+
+  * Can't remove debian/docs, it's in the .orig
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Sep 2005 02:01:07 +0100
+
+kde-guidance (0.4.0-0ubuntu1) breezy; urgency=low
+
+  * New upstream version
+  * Fix debian/rules for rename to kde-guidance
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 15 Sep 2005 01:07:38 +0100
+
+kde-guidance (0.3.0+svn20050911-0ubuntu1) breezy; urgency=low
+
+  * Initial Ubuntu upload
+  * Install .py files into /usr/lib/python2.4/site-packages/guidance
+  * Change source and package name to kde-guidance to 
+    reduce namespace polution
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Sun, 11 Sep 2005 23:51:52 +0100
+
+guidance (0.3.0-1) unstable; urgency=low
+
+  * Initial release
+  * Removed displayconfig that doesn't work on debian yet
+  * Added manpages
+
+ -- Fathi Boudra <fboudra@free.fr>  Mon,  1 Aug 2005 19:23:46 +0200
+
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/compat b/ubuntu/maverick/applications/kde-guidance/debian/compat
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/control b/ubuntu/maverick/applications/kde-guidance/debian/control
new file mode 100644
index 000000000..454cdfd58
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/control
@@ -0,0 +1,52 @@
+Source: kde-guidance-trinity
+Section: kde
+Priority: optional
+Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+XSBC-Original-Maintainer: Debian KDE Extras Team <pkg-kde-extras@lists.alioth.debian.org>
+Uploaders: Fathi Boudra <fboudra@free.fr>, Mark Purcell <msp@debian.org>
+Build-Depends: cdbs, debhelper (>= 5), chrpath, kdelibs4-trinity-dev,
+ libpythonize0-trinity-dev, libtool, libxml2-utils, libxss-dev, libxxf86vm-dev,
+ pykdeextensions-trinity, pyqt-tools, python-qt3 (>= 3.17.2-1ubuntu2), python-trinity-trinity, python-trinity-trinity-dev, python-sip4-dev,
+ python-support (>= 0.6), python (>= 2.5), python-dev (>= 2.5), x11proto-scrnsaver-dev, python-qt-dev, hwdata
+Standards-Version: 3.8.4
+
+Package: kde-guidance-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions-trinity, python-trinity-trinity, sysv-rc, guidance-backends-trinity, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Conflicts: guidance-power-manager, kde-guidance-powermanager
+Provides: ${python:Provides}
+Description: collection of KDE system administration tools for GNU/Linux [Trinity]
+ Guidance currently consists of four programs designed to help you
+ look after your system:
+  o  userconfig - User and Group administration
+  o  serviceconfig - Service/daemon administration
+  o  mountconfig - Disk and filesystem administration
+  o  displayconfig - Screen and display configuration
+  o  wineconfig - Wine configuration
+ .
+ These tools are available in KDE Control Center, System Settings 
+ or can be run as standalone applications.
+ .
+  Homepage: http://www.simonzone.com/software/guidance
+
+Package: guidance-backends-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, hwdata, python (>= 2.5), python-dev (>= 2.5)
+Conflicts: guidance-power-manager, kde-guidance-powermanager
+Provides: ${python:Provides}
+Description: collection of system administration tools for GNU/Linux [Trinity]
+ This package contains the platform neutral backends used in the
+ Guidance configuration tools.
+ .
+  Homepage: http://www.simonzone.com/software/guidance
+
+Package: kde-guidance-powermanager-trinity
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, kde-guidance-trinity, python-trinity-trinity, python-dbus, hal, python-gobject, python (>= 2.5), python-dev (>= 2.5)
+Conflicts: guidance-power-manager, kde-guidance-powermanager
+Provides: ${python:Provides}
+Description: HAL based power manager applet [Trinity]
+ A power management applet to indicate battery levels and perform hibernate or
+ suspend using HAL.
+ .
+  Homepage: http://www.simonzone.com/software/guidance
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/copyright b/ubuntu/maverick/applications/kde-guidance/debian/copyright
new file mode 100644
index 000000000..38c1d30e8
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/copyright
@@ -0,0 +1,432 @@
+This package was debianized by Fathi Boudra <fboudra@free.fr> on
+Mon,  1 Aug 2005 19:23:46 +0200.
+
+It was downloaded from http://www.simonzone.com/software/guidance
+
+Copyright Holders:
+   Simon Edwards <simon@simonzone.com>
+   Sebastian Kügler <sebas@vizzzion.org>
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The documentations provided with kde-guidance is distributed under
+the GNU Free Documentation License (GFDL). They are considered free with
+regards to the Debian Free Software Guidelines (DFSG) because they don't
+contain any unmodifiable parts (invariant sections). The complete text of
+the GNU Free Documentation License can be found below:
+
+		GNU Free Documentation License
+		  Version 1.2, November 2002
+
+
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense.  It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does.  But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book.  We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License.  Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein.  The "Document", below,
+refers to any such manual or work.  Any member of the public is a
+licensee, and is addressed as "you".  You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License.  If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant.  The Document may contain zero
+Invariant Sections.  If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License.  A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters.  A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text.  A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page.  For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language.  (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document.  These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no other
+conditions whatsoever to those of this License.  You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute.  However, you may accept
+compensation in exchange for copies.  If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover.  Both covers must also clearly and legibly identify
+you as the publisher of these copies.  The front cover must present
+the full title with all words of the title equally prominent and
+visible.  You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to give
+them a chance to provide you with an updated version of the Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it.  In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant.  To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version.  Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity.  If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy.  If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other documents
+released under this License, and replace the individual copies of this
+License in the various documents with a single copy that is included in
+the collection, provided that you follow the rules of this License for
+verbatim copying of each of the documents in all other respects.
+
+You may extract a single document from such a collection, and distribute
+it individually under this License, provided you insert a copy of this
+License into the extracted document, and follow this License in all
+other respects regarding verbatim copying of that document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections.  You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers.  In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document except
+as expressly provided for under this License.  Any other attempt to
+copy, modify, sublicense or distribute the Document is void, and will
+automatically terminate your rights under this License.  However,
+parties who have received copies, or rights, from you under this
+License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions
+of the GNU Free Documentation License from time to time.  Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.  See
+http://www.gnu.org/copyleft/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation.  If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
+
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/dirs b/ubuntu/maverick/applications/kde-guidance/debian/dirs
new file mode 100644
index 000000000..3dd0bc793
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/dirs
@@ -0,0 +1 @@
+var/lib/guidance
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/displayconfig-trinity.1 b/ubuntu/maverick/applications/kde-guidance/debian/displayconfig-trinity.1
new file mode 100644
index 000000000..3670902b8
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/displayconfig-trinity.1
@@ -0,0 +1,69 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.\" Please adjust this date whenever revising the manpage.
+.\" 
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.TH "DISPLAYCONFIG" "1" "aout 2, 2005" "" ""
+.SH "NAME"
+displayconfig \- screen and display configuration tool
+.SH "SYNOPSIS"
+.B displayconfig
+.RI [ options ]
+.br 
+.SH "DESCRIPTION"
+This manual page documents briefly the
+.B displayconfig
+commands. This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP 
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBdisplayconfig\fP is a screen and display configuration tool.
+.SH "OPTIONS"
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`\-').
+A summary of options is included below.
+.TP 
+.B \-\-help
+Show summary of options.
+.TP 
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP 
+.B \-\-help\-kde
+Show KDE specific help (common for all KDE apps).
+.TP 
+.B \-\-help\-all
+Show the complete help.
+.TP 
+.B \-\-author
+Show program author(s).
+.TP 
+.B \-v, \-\-version
+Show version of program.
+.TP 
+.B \-\-license
+Show program license.
+.SH "SEE ALSO"
+.BR displayconfig-restore (1).
+.BR mountconfig (1).
+.BR serviceconfig (1),
+.BR userconfig (1).
+.br 
+.SH "AUTHOR"
+displayconfig was written by <simon@simonzone.com>.
+.PP 
+This manual page was written by Fathi Boudra <fboudra@free.fr>,
+for the Debian project (but may be used by others).
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/docs b/ubuntu/maverick/applications/kde-guidance/debian/docs
new file mode 100644
index 000000000..724e08449
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/docs
@@ -0,0 +1,2 @@
+README
+TODO
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/guidance-backends-trinity.install b/ubuntu/maverick/applications/kde-guidance/debian/guidance-backends-trinity.install
new file mode 100644
index 000000000..de6cbc63e
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/guidance-backends-trinity.install
@@ -0,0 +1,19 @@
+usr/lib/python*/site-packages/ixf86misc.so
+opt/trinity/share/apps/guidance/vesamodes
+opt/trinity/share/apps/guidance/extramodes
+opt/trinity/share/apps/guidance/widescreenmodes
+opt/trinity/share/apps/guidance/Cards+
+opt/trinity/share/apps/guidance/pcitable
+opt/trinity/share/apps/guidance/MonitorsDB
+opt/trinity/share/python-support/guidance-backends-trinity/displayconfig-hwprobe.py
+opt/trinity/share/python-support/guidance-backends-trinity/xf86misc.py
+opt/trinity/share/python-support/guidance-backends-trinity/MicroHAL.py
+opt/trinity/share/python-support/guidance-backends-trinity/ScanPCI.py
+opt/trinity/share/python-support/guidance-backends-trinity/displayconfigabstraction.py
+opt/trinity/share/python-support/guidance-backends-trinity/displayconfig-restore.py
+opt/trinity/share/python-support/guidance-backends-trinity/drivedetect.py
+opt/trinity/share/python-support/guidance-backends-trinity/execwithcapture.py
+opt/trinity/share/python-support/guidance-backends-trinity/wineread.py
+opt/trinity/share/python-support/guidance-backends-trinity/winewrite.py
+opt/trinity/share/python-support/guidance-backends-trinity/xorgconfig.py
+opt/trinity/share/python-support/guidance-backends-trinity/infimport.py
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install b/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install
new file mode 100644
index 000000000..8c707520e
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-powermanager-trinity.install
@@ -0,0 +1,13 @@
+opt/trinity/bin/guidance-power-manager
+opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png
+opt/trinity/share/apps/guidance/pics/ac-adapter.png
+opt/trinity/share/apps/guidance/pics/battery*.png
+opt/trinity/share/apps/guidance/pics/processor.png
+opt/trinity/share/autostart/guidance-power-manager.desktop
+opt/trinity/share/python-support/kde-guidance-powermanager-trinity/guidance-power-manager.py
+opt/trinity/share/python-support/kde-guidance-powermanager-trinity/guidance_power_manager_ui.py
+opt/trinity/share/python-support/kde-guidance-powermanager-trinity/notify.py
+opt/trinity/share/python-support/kde-guidance-powermanager-trinity/powermanage.py
+opt/trinity/share/python-support/kde-guidance-powermanager-trinity/gpmhelper.py
+opt/trinity/share/python-support/kde-guidance-powermanager-trinity/powermanager_ui.py
+opt/trinity/share/python-support/kde-guidance-powermanager-trinity/tooltip.py
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.init b/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.init
new file mode 100644
index 000000000..30a3854d1
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.init
@@ -0,0 +1,33 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          kde-guidance
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      1
+# Short-Description: displayconfig hardware probe
+# Description:       displayconfig hardware probe. This program should be run
+#                    during boot time. It quickly examines the graphics cards
+#                    (read: PCI devices) in the computer and compares they to
+#                    the list in the file guidance-gfxhardware-snapshot. If the
+#                    two lists differ then the Debian package manager is
+#                    automatically called to regenerate /etc/X11/xorg.conf.
+#                    This hopefully should mean that people can swap gfx cards
+#                    in and out and always have a system that will run Xorg.
+#                    (even though the config will be most likely be suboptimal.
+#                    Suboptimal is better than no X server).
+### END INIT INFO
+
+case "$1" in
+  start)
+	/opt/trinity/share/python-support/guidance-backends-trinity/displayconfig-hwprobe.py
+	;;
+  stop)
+	;;
+  restart|force-reload)
+	;;
+  *)
+	;;
+esac
+
+exit 0
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.install b/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.install
new file mode 100644
index 000000000..dd8d06153
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.install
@@ -0,0 +1,125 @@
+opt/trinity/lib/kde3/kcm_serviceconfig.so.0.0.0 opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_serviceconfig.la opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_serviceconfig.a opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_userconfig.so.0.0.0 opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_userconfig.la opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_userconfig.a opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_mountconfig.so.0.0.0 opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_mountconfig.la opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_mountconfig.a opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_displayconfig.so.0.0.0 opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_displayconfig.la opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_displayconfig.a opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_wineconfig.so.0.0.0 opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_wineconfig.la opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_wineconfig.a opt/trinity/lib/
+opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
+opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
+opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
+opt/trinity/share/icons/crystalsvg/32x32/apps/displayconfig.png
+opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
+opt/trinity/share/doc/kde/HTML/en/guidance/index.cache.bz2
+opt/trinity/share/doc/kde/HTML/en/guidance/index.html
+opt/trinity/share/doc/kde/HTML/en/guidance/introduction.html
+opt/trinity/share/doc/kde/HTML/en/guidance/using-testapp.html
+opt/trinity/share/doc/kde/HTML/en/guidance/commands.html
+opt/trinity/share/doc/kde/HTML/en/guidance/developers.html
+opt/trinity/share/doc/kde/HTML/en/guidance/re-1007-unmanagechildren-1.html
+opt/trinity/share/doc/kde/HTML/en/guidance/faq.html
+opt/trinity/share/doc/kde/HTML/en/guidance/credits.html
+opt/trinity/share/doc/kde/HTML/en/guidance/installation.html
+opt/trinity/share/doc/kde/HTML/en/guidance/requirements.html
+opt/trinity/share/doc/kde/HTML/en/guidance/compilation.html
+opt/trinity/share/doc/kde/HTML/en/guidance/configuration.html
+opt/trinity/share/applications/kde/serviceconfig.desktop
+opt/trinity/share/applications/kde/userconfig.desktop
+opt/trinity/share/applications/kde/mountconfig.desktop
+opt/trinity/share/applications/kde/displayconfig.desktop
+opt/trinity/share/applications/kde/wineconfig.desktop
+opt/trinity/share/apps/guidance/pics/laserwarn.png
+opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png
+opt/trinity/share/apps/guidance/pics/hi16-encrypted.png
+opt/trinity/share/apps/guidance/pics/hi32-user.png
+opt/trinity/share/apps/guidance/pics/hi32-group.png
+opt/trinity/share/apps/guidance/pics/hi32-identity.png
+opt/trinity/share/apps/guidance/pics/hi32-password.png
+opt/trinity/share/apps/guidance/pics/kcmpartitions.png
+opt/trinity/share/apps/guidance/pics/kde1.png
+opt/trinity/share/apps/guidance/pics/kde2.png
+opt/trinity/share/apps/guidance/pics/kde3.png
+opt/trinity/share/apps/guidance/pics/kde4.png
+opt/trinity/share/apps/guidance/pics/kde5.png
+opt/trinity/share/apps/guidance/pics/kde6.png
+opt/trinity/share/apps/guidance/pics/hi32-samba.png
+opt/trinity/share/apps/guidance/pics/hi16-hdd.png
+opt/trinity/share/apps/guidance/pics/hi16-cdrom.png
+opt/trinity/share/apps/guidance/pics/hi16-burner.png
+opt/trinity/share/apps/guidance/pics/hi16-floppy.png
+opt/trinity/share/apps/guidance/pics/hi16-blockdevice.png
+opt/trinity/share/apps/guidance/pics/hi16-password.png
+opt/trinity/share/apps/guidance/pics/hi16-memory.png
+opt/trinity/share/apps/guidance/pics/hi16-network.png
+opt/trinity/share/apps/guidance/pics/hi16-lock.png
+opt/trinity/share/apps/guidance/pics/hi16-usbpen.png
+opt/trinity/share/apps/guidance/pics/greenled.png
+opt/trinity/share/apps/guidance/pics/greyled.png
+opt/trinity/share/apps/guidance/pics/exec.png
+opt/trinity/share/apps/guidance/pics/file.png
+opt/trinity/share/apps/guidance/pics/important.png
+opt/trinity/share/apps/guidance/pics/tux.png
+opt/trinity/share/apps/guidance/pics/user.png
+opt/trinity/share/apps/guidance/pics/energystar.png
+opt/trinity/share/apps/guidance/pics/hi32-gfxcard.png
+opt/trinity/share/apps/guidance/pics/hi32-display.png
+opt/trinity/share/apps/guidance/pics/32-wine.png
+opt/trinity/share/apps/guidance/pics/kdewinewizard.png
+opt/trinity/share/apps/guidance/pics/displayconfig
+opt/trinity/share/apps/guidance/pics/displayconfig/dualhead
+opt/trinity/share/apps/guidance/pics/displayconfig/dualhead/monitor_1.png
+opt/trinity/share/apps/guidance/pics/displayconfig/dualhead/monitor_2.png
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background.png
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background_r90.png
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide.png
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/background_wide_r90.png
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor.png
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_r90.png
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide.png
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/monitor_wide_r90.png
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/window_4th.png
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_left_4th.png
+opt/trinity/share/apps/guidance/pics/displayconfig/monitor_resizable/window_bottom_right_4th.png
+opt/trinity/share/apps/guidance/pics/displayconfig/gammapics
+opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam14.png
+opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam16.png
+opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam18.png
+opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam20.png
+opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam22.png
+opt/trinity/share/apps/guidance/pics/displayconfig/gammapics/MGam24.png
+opt/trinity/share/python-support/kde-guidance-trinity/SMBShareSelectDialog.py
+opt/trinity/share/python-support/kde-guidance-trinity/SimpleCommandRunner.py
+opt/trinity/share/python-support/kde-guidance-trinity/displayconfig.py
+opt/trinity/share/python-support/kde-guidance-trinity/displayconfigwidgets.py
+opt/trinity/share/python-support/kde-guidance-trinity/fuser.py
+opt/trinity/share/python-support/kde-guidance-trinity/fuser_ui.py
+#opt/trinity/share/python-support/kde-guidance-trinity/grubconfig.py
+opt/trinity/share/python-support/kde-guidance-trinity/ktimerdialog.py
+opt/trinity/share/python-support/kde-guidance-trinity/mountconfig.py
+opt/trinity/share/python-support/kde-guidance-trinity/servertestdialog.py
+opt/trinity/share/python-support/kde-guidance-trinity/serviceconfig.py
+opt/trinity/share/python-support/kde-guidance-trinity/sizeview.py
+opt/trinity/share/python-support/kde-guidance-trinity/unixauthdb.py
+opt/trinity/share/python-support/kde-guidance-trinity/userconfig.py
+opt/trinity/share/python-support/kde-guidance-trinity/wineconfig.py
+opt/trinity/lib/kde3/kcm_serviceconfig.so.0 opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_serviceconfig.so opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_userconfig.so.0 opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_userconfig.so opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_mountconfig.so.0 opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_mountconfig.so opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_displayconfig.so.0 opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_displayconfig.so opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_wineconfig.so.0 opt/trinity/lib/
+opt/trinity/lib/kde3/kcm_wineconfig.so opt/trinity/lib/
+usr/share/lintian/overrides/kde-guidance-trinity
+etc/X11/Xsession.d/40guidance-displayconfig_restore
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides b/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
new file mode 100644
index 000000000..6131946c2
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.lintian-overrides
@@ -0,0 +1,4 @@
+# false positive warnings from lintian
+kde-guidance-trinity: postinst-has-useless-call-to-ldconfig
+kde-guidance-trinity: postrm-has-useless-call-to-ldconfig
+kde-guidance-trinity: package-has-a-duplicate-relation depends
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.postinst b/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.postinst
new file mode 100644
index 000000000..de2804fc4
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/kde-guidance-trinity.postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Remove shutdown and reboot links; this init script does not need them.
+rm -f /etc/rc0.d/K20kde-guidance /etc/rc6.d/K20kde-guidance
+
+#remove script from older times
+update-rc.d -f displayconfig-hwprobe.py remove
+
+#DEBHELPER#
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/mountconfig-trinity.1 b/ubuntu/maverick/applications/kde-guidance/debian/mountconfig-trinity.1
new file mode 100644
index 000000000..7f1fb728c
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/mountconfig-trinity.1
@@ -0,0 +1,69 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.\" Please adjust this date whenever revising the manpage.
+.\" 
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.TH "MOUNTCONFIG" "1" "aout 2, 2005" "" ""
+.SH "NAME"
+mountconfig \- disk and filesystem administration tool
+.SH "SYNOPSIS"
+.B mountconfig
+.RI [ options ]
+.br 
+.SH "DESCRIPTION"
+This manual page documents briefly the
+.B mountconfig
+commands. This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP 
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBmountconfig\fP is a disk and filesystem administration tool.
+.SH "OPTIONS"
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`\-').
+A summary of options is included below.
+.TP 
+.B \-\-help
+Show summary of options.
+.TP 
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP 
+.B \-\-help\-kde
+Show KDE specific help (common for all KDE apps).
+.TP 
+.B \-\-help\-all
+Show the complete help.
+.TP 
+.B \-\-author
+Show program author(s).
+.TP 
+.B \-v, \-\-version
+Show version of program.
+.TP 
+.B \-\-license
+Show program license.
+.SH "SEE ALSO"
+.BR displayconfig (1),
+.BR displayconfig-restore (1),
+.BR serviceconfig (1),
+.BR userconfig (1).
+.br 
+.SH "AUTHOR"
+mountconfig was written by <simon@simonzone.com>.
+.PP 
+This manual page was written by Fathi Boudra <fboudra@free.fr>,
+for the Debian project (but may be used by others).
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/patches/.gitignore b/ubuntu/maverick/applications/kde-guidance/debian/patches/.gitignore
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/patches/.gitignore
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/pycompat b/ubuntu/maverick/applications/kde-guidance/debian/pycompat
new file mode 100644
index 000000000..0cfbf0888
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/pycompat
@@ -0,0 +1 @@
+2
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/python-distutils-jaunty.mk b/ubuntu/maverick/applications/kde-guidance/debian/python-distutils-jaunty.mk
new file mode 100644
index 000000000..9c5e5211f
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/python-distutils-jaunty.mk
@@ -0,0 +1,295 @@
+# -*- mode: makefile; coding: utf-8 -*-
+# Copyright © 2003 Colin Walters <walters@debian.org>
+# Copyright © 2006 Marc Dequènes (Duck) <Duck@DuckCorp.org>
+#
+# Description: manage Python public modules build
+#   This class is designed to work with Python packages using the
+#   'distutils' build system and comply to the new policy established
+#   during summer 2006.  Use of the debhelper class to make use of the
+#   new dh_python is strongly advised.  (This is still left as optional
+#   in line with CDBS' flexible behavior.)
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2, or (at
+# your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02111-1307 USA.
+#
+
+# This class provides rules for old and new Python policy.  Leaving
+# DEB_PYTHON_SYSTEM unset selects the old behavior.  The pysupport and
+# pycentral methods are available to comply with new policy.  Don't forget
+# to update your 'debian/control'.  (Build-Depends are correctly generated
+# if you are using the auto control generation feature.)
+
+# Once all old-style packages are removed before etch, some of the old
+# can be refactored or removed.
+
+
+_cdbs_scripts_path ?= /usr/lib/cdbs
+_cdbs_rules_path ?= /usr/share/cdbs/1/rules
+_cdbs_class_path ?= /usr/share/cdbs/1/class
+
+ifndef _cdbs_class_python_distutils
+_cdbs_class_python_distutils = 1
+
+include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
+include $(_cdbs_class_path)/langcore.mk$(_cdbs_makefile_suffix)
+
+
+# check python system
+cdbs_use_xs_field := $(shell grep -q "^XS-Python-Version:" debian/control && echo yes)
+cdbs_selected_pycompat := $(shell if [ -e debian/pycompat ]; then cat debian/pycompat; fi)
+cdbs_pycompat = $(cdbs_selected_pycompat)
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+  cdbs_python_support_path = usr/share/python-support/$(DEB_PYTHON_MODULE_PACKAGE)
+  ifeq (, $(cdbs_selected_pycompat))
+    cdbs_pycompat = 2
+  endif # use pycompat
+  # warning pysupport compatibility mode
+  ifneq (, $(cdbs_use_xs_field))
+    $(warning WARNING:  Use of XS-Python-Version and XB-Python-Version fields in debian/control is deprecated with pysupport method; use debian/pyversions if you need to specify specific versions.)
+  endif # use XS field (compat)
+else
+  ifeq (pycentral, $(DEB_PYTHON_SYSTEM))
+    ifeq (, $(cdbs_selected_pycompat))
+      cdbs_pycompat = 2
+    endif # use pycompat
+  else
+    ifneq (, $(DEB_PYTHON_SYSTEM))
+      $(error unsupported Python system: $(DEB_PYTHON_SYSTEM) (select either pysupport or pycentral))
+    else
+      ifneq (, $(cdbs_use_xs_field))
+        $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
+      endif
+      ifneq (, $(cdbs_selected_pycompat))
+        ifeq (yes, $(shell expr $(cdbs_selected_pycompat) \> 1 >/dev/null && echo yes))
+          $(error package uses the new Python policy; DEB_PYTHON_SYSTEM must be set to "pysupport" or "pycentral")
+        endif
+      endif # use pycompat
+    endif # unknown method
+  endif # pycentral
+endif # pysupport
+
+
+ifndef DEB_PYTHON_SYSTEM
+DEB_PYTHON_COMPILE_VERSION = 
+DEB_PYTHON_VERSIONS = 2.1 2.2 2.3 2.4 2.5 2.6
+else
+# default package is the first one declared in 'debian/control'
+# (override if necessary)
+DEB_PYTHON_MODULE_PACKAGE = $(firstword $(filter-out %-doc %-dev %-common, $(DEB_PACKAGES)))
+DEB_PYTHON_PRIVATE_MODULES_DIRS =
+endif
+
+# common variables
+DEB_PYTHON_SETUP_CMD = setup.py
+DEB_PYTHON_CLEAN_ARGS = -a
+DEB_PYTHON_BUILD_ARGS = --build-base="$(CURDIR)/$(DEB_BUILDDIR)/build"
+DEB_PYTHON_INSTALL_ARGS_ALL = --no-compile -O0 --prefix=/usr 
+
+
+ifndef DEB_PYTHON_SYSTEM
+########################### old policy method ###########################
+
+$(warning =======================================================)
+$(warning Your package does not conform to the new Python policy.)
+$(warning Please consider updating.  Here is some documentation:)
+$(warning   http://wiki.debian.org/DebianPython/NewPolicy)
+$(warning   http://wiki.debian.org/DebianPythonFAQ)
+$(warning =======================================================)
+
+# make: *** No rule to make target `voodoo'.  Stop.
+DEB_PYTHON_REAL_LIB_PACKAGES = $(strip $(filter $(patsubst %,python%%,$(DEB_PYTHON_VERSIONS)),$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
+# If no versioned python library packages found, grab all simpler ones
+ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
+DEB_PYTHON_SIMPLE_PACKAGES = $(strip $(filter python-%,$(filter-out $(DEB_PYTHON_PACKAGES_EXCLUDE),$(DEB_ALL_PACKAGES))))
+endif
+
+cdbs_python_ver = $(filter-out -%,$(subst -, -,$(patsubst python%,%,$(cdbs_curpkg))))
+
+common-build-arch common-build-indep:: common-build-impl
+common-build-impl::
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
+
+
+# See if this package doesn't appear to need to be compiled by multiple
+# Python versions.
+ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
+common-install-arch common-install-indep:: common-install-impl
+common-install-impl::
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
+	for ddir in $(DEB_DESTDIR)/usr/lib/python?.?/dist-packages; do \
+	  sdir=$$(dirname $$ddir)/site-packages; \
+	  mkdir -p $$sdir; \
+	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
+	  rm -rf $$ddir; \
+	done
+else
+$(patsubst %,install/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: install/% :
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
+	for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
+	  sdir=$$(dirname $$ddir)/site-packages; \
+	  mkdir -p $$sdir; \
+	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
+	  rm -rf $$ddir; \
+	done
+endif
+
+$(patsubst %,install/%,$(DEB_PYTHON_SIMPLE_PACKAGES)) :: install/% :
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) python $(DEB_PYTHON_SETUP_CMD) install --root=$(CURDIR)/debian/$(cdbs_curpkg) $(DEB_PYTHON_INSTALL_ARGS_ALL) $(DEB_PYTHON_INSTALL_ARGS_$(cdbs_curpkg))
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+	for ddir in $(CURDIR)/debian/$(cdbs_curpkg)/usr/lib/python?.?/dist-packages; do \
+	  sdir=$$(dirname $$ddir)/site-packages; \
+	  mkdir -p $$sdir; \
+	  tar -c -f - -C $$ddir . | tar -x -f - -C $$sdir; \
+	  rm -rf $$ddir; \
+	done
+endif
+
+# This class can optionally utilize debhelper's "dh_python" command.  Just
+# be sure you include debhelper.mk before including this file.
+ifdef _cdbs_rules_debhelper
+
+DEB_DH_PYTHON_ARGS = $(addprefix -V ,$(DEB_PYTHON_COMPILE_VERSION)) $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg))
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+	dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
+endif
+
+
+# Ignore errors from this rule.  In a tarball build, the file may not
+# exist.
+ifeq (,$(DEB_PYTHON_REAL_LIB_PACKAGES))
+clean::
+	-python$(DEB_PYTHON_COMPILE_VERSION) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
+else
+clean:: $(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES))
+
+$(patsubst %,python-cleanbuilddir/%,$(DEB_PYTHON_REAL_LIB_PACKAGES)) :: python-cleanbuilddir/% : 
+	-python$(cdbs_python_ver) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
+endif
+
+else
+########################## new policy methods ###########################
+
+# Calculate cdbs_python_build_versions
+cdbs_python_module_arch := $(strip $(shell perl -e '$$/=""; $$_=(grep {/^Package: $(DEB_PYTHON_MODULE_PACKAGE)$$/m;} (<>))[0]; /^Architecture: (.*)$$/m && print $$1' debian/control))
+cdbs_python_current_version := $(shell pyversions -vd)
+ifeq (all, $(cdbs_python_module_arch))
+  # check if current is in build versions
+  ifneq ($(cdbs_python_current_version), $(filter $(cdbs_python_current_version), $(shell pyversions -vr)))
+    cdbs_python_compile_version := $(firstword $(strip $(sort $(shell pyversions -vr))))
+    cdbs_python_build_versions := $(cdbs_python_compile_version)
+  else
+    cdbs_python_build_versions := $(cdbs_python_current_version)
+  endif
+else
+cdbs_python_build_versions := $(shell pyversions -vr)
+endif # archall
+
+# check if build is possible
+ifeq (, $(cdbs_python_build_versions))
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+$(error invalid setting in debian/pyversions)
+else
+$(error invalid setting for XS-Python-Version)
+endif # system selected
+endif # build versions empty
+
+
+# Declare Build-Deps for packages using this file
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), debhelper (>= 5.0.37.2), cdbs (>= 0.4.43)
+ifeq (all, $(cdbs_python_module_arch))
+  ifneq (, $(cdbs_python_compile_version))
+    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python$(cdbs_python_compile_version)-dev, python (>= 2.3.5-11)
+  else
+    CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-dev (>= 2.3.5-11)
+  endif
+else
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-all-dev (>= 2.3.5-11)
+endif
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-support (>= 0.3.2)
+else
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), python-central (>= 0.6)
+endif
+
+
+cdbs_python_current_binary := $(shell pyversions -d)
+cdbs_python_binary = $(if $(call cdbs_streq,$(cdbs_python_current_binary),$(1)),python,$(1))
+
+# build stage
+common-build-arch common-build-indep:: $(addprefix python-build-stamp-, $(cdbs_python_build_versions))
+python-build-stamp-%:
+ifeq (all, $(cdbs_python_module_arch))
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
+else
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)
+endif # archall detection
+	touch $@
+
+
+# install stage
+ifeq (all, $(cdbs_python_module_arch))
+common-install-arch common-install-indep:: python-install-py
+python-install-py:
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
+else
+common-install-arch common-install-indep:: $(addprefix python-install-, $(cdbs_python_build_versions))
+python-install-%:
+	cd $(DEB_SRCDIR) && PATH=/opt/trinity/bin:$(PATH) $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) install --root=$(DEB_DESTDIR) $(DEB_PYTHON_INSTALL_ARGS_ALL)
+endif # archall detection
+
+
+# This class can optionally use debhelper's commands.  Just
+# be sure you include debhelper.mk before including this file.
+ifdef _cdbs_rules_debhelper
+
+DEB_DH_PYTHON_ARGS = $(DEB_DH_PYTHON_ARGS_ALL) $(DEB_DH_PYTHON_ARGS_$(cdbs_curpkg)) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
+
+$(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/%:
+ifeq (pysupport, $(DEB_PYTHON_SYSTEM))
+	dh_pysupport -p$(cdbs_curpkg) $(DEB_PYTHON_PRIVATE_MODULES_DIRS)
+else
+	dh_pycentral -p$(cdbs_curpkg)
+endif
+	dh_python -p$(cdbs_curpkg) $(DEB_DH_PYTHON_ARGS)
+endif
+
+
+# clean stage
+clean:: $(addprefix python-clean-, $(cdbs_python_build_versions))
+python-clean-%:
+ifeq (all, $(cdbs_python_module_arch))
+	-cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$(cdbs_python_compile_version)) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
+else
+	-cd $(DEB_SRCDIR) && $(call cdbs_python_binary,python$*) $(DEB_PYTHON_SETUP_CMD) clean $(DEB_PYTHON_CLEAN_ARGS)
+endif # archall detection
+
+clean::
+ifeq (, $(cdbs_selected_pycompat))
+	echo "$(cdbs_pycompat)" >debian/pycompat
+endif # use pycompat
+	rm -f python-build-stamp-*
+
+endif
+
+
+########################## all policy methods ###########################
+
+# Calling setup.py clean may create .pyc files, so we need a final cleanup
+# pass here.
+clean::
+	find . -name '*.pyc' -exec rm '{}' ';'
+
+endif
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/pyversions b/ubuntu/maverick/applications/kde-guidance/debian/pyversions
new file mode 100644
index 000000000..b3dc41ebc
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/pyversions
@@ -0,0 +1 @@
+2.5-
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/rules b/ubuntu/maverick/applications/kde-guidance/debian/rules
new file mode 100755
index 000000000..b388d4b12
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/rules
@@ -0,0 +1,220 @@
+#!/usr/bin/make -f
+
+DEB_PYTHON_SYSTEM = pysupport
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+#include /usr/share/cdbs/1/class/python-distutils.mk
+include debian/python-distutils-jaunty.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+DEB_DH_INSTALL_ARGS = --sourcedir=debian/tmp
+DEB_UPDATE_RCD_PARAMS := multiuser
+DEB_INSTALL_MANPAGES_kde-guidance-trinity := debian/displayconfig-trinity.1  debian/mountconfig-trinity.1  debian/serviceconfig-trinity.1  debian/userconfig-trinity.1
+PYSUPPORT_PATH = $(DEB_DESTDIR)/opt/trinity/share/python-support
+DEB_CONFIGURE_EXTRA_FLAGS := --prefix=/opt/trinity --with-extra-libs=/opt/trinity/lib --with-extra-includes=/opt/trinity/include/kde
+LDFLAGS_APPEND := -L/opt/trinity/lib
+
+install/kde-guidance-trinity::
+	# install icons to right place
+	install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-app-daemons.png \
+		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/daemons.png
+	install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kcmpartitions.png \
+		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
+	install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-user.png \
+		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/userconfig.png
+	install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/hi32-display.png \
+		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/displayconfig.png
+	install -D -p -m0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/32-wine.png \
+		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/32x32/apps/wineconfig.png
+	install -D -p -m0644 kde/wineconfig/pics/16x16/wineconfig.png \
+		$(DEB_DESTDIR)/opt/trinity/share/icons/crystalsvg/16x16/apps/wineconfig.png
+
+	# install lintian overrides
+	install -D -p -m0644 debian/kde-guidance-trinity.lintian-overrides \
+		$(DEB_DESTDIR)/usr/share/lintian/overrides/kde-guidance-trinity
+
+	# fix binary-or-shlib-defines-rpath
+	chrpath -d $(DEB_DESTDIR)/opt/trinity/lib/kde3/kcm_*.so.*
+
+	# fix executable-not-elf-or-script
+	chmod 0644 $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/kdewinewizard.png
+
+	# fix the link properly
+	mkdir -p debian/kde-guidance-trinity/opt/trinity/bin
+	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/displayconfig.py displayconfig)
+	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/mountconfig.py mountconfig)
+	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/serviceconfig.py serviceconfig)
+	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/userconfig.py userconfig)
+	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/wineconfig.py wineconfig)
+#	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf /usr/share/python-support/kde-guidance-trinity/grubconfig.py grubconfig)
+
+	# put this here since gnome people probably don't want it by default
+	(cd debian/kde-guidance-trinity/opt/trinity/bin; ln -sf ../share/python-support/guidance-backends-trinity/displayconfig-restore.py displayconfig-restore)
+
+	# move python modules in PYSUPPORT_PATH
+	mkdir -p $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SMBShareSelectDialog.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/SimpleCommandRunner.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfigwidgets.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/fuser_ui.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+#	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/grubconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ktimerdialog.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/mountconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/servertestdialog.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/serviceconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/sizeview.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/unixauthdb.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/userconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineconfig.py $(PYSUPPORT_PATH)/kde-guidance-trinity
+
+        # fix script-not-executable
+	chmod 0755 $(PYSUPPORT_PATH)/kde-guidance-trinity/fuser.py
+#	chmod 0755 $(PYSUPPORT_PATH)/kde-guidance-trinity/grubconfig.py
+
+	: # Replace all '#!' calls to python with /usr/bin/python
+	: # and make them executable
+	for i in `find debian/kde-guidance-trinity -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/guidance-backends-trinity::
+	# install displayconfig-hwprobe.py script
+	install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
+		$(PYSUPPORT_PATH)/guidance-backends-trinity/displayconfig-hwprobe.py
+
+	cp $(DEB_DESTDIR)/usr/lib/python2.6/site-packages/xf86misc.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/ScanPCI.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/infimport.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfigabstraction.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/displayconfig-restore.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/drivedetect.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/execwithcapture.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/wineread.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/winewrite.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/xorgconfig.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+
+	rm -f $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MonitorsDB
+	ln -s /usr/share/hwdata/MonitorsDB $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MonitorsDB
+
+install/kde-guidance-powermanager-trinity::
+	# install icon to right place
+	install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
+		$(DEB_DESTDIR)/opt/trinity/share/icons/hicolor/22x22/apps/power-manager.png
+	install -D -p -m0644 kde/powermanager/pics/*.png \
+		$(DEB_DESTDIR)/opt/trinity/share/apps/guidance/pics/
+
+	# install desktop file
+	install -D -p -m0644 powermanager/guidance-power-manager.desktop \
+		$(DEB_DESTDIR)/opt/trinity/share/autostart/guidance-power-manager.desktop
+
+	# copy python modules in PYSUPPORT_PATH
+	mkdir -p $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/MicroHAL.py $(PYSUPPORT_PATH)/guidance-backends-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/guidance-power-manager.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanage.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/gpmhelper.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
+	cp $(DEB_DESTDIR)/opt/trinity/share/apps/guidance/powermanager_ui.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
+	cp powermanager/guidance_power_manager_ui.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
+	cp powermanager/notify.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
+	cp powermanager/tooltip.py $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity
+
+	# generate guidance-power-manager script
+	echo "#!/bin/sh" > $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+	echo "/usr/share/python-support/kde-guidance-powermanager-trinity/guidance-power-manager.py &" >> $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+	chmod +x $(DEB_DESTDIR)/opt/trinity/bin/guidance-power-manager
+
+	# fix script-not-executable
+	chmod 0755 $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity/powermanage.py
+	chmod 0755 $(PYSUPPORT_PATH)/kde-guidance-powermanager-trinity/gpmhelper.py
+
+	: # Replace all '#!' calls to python with /usr/bin/python
+	: # and make them executable
+	for i in `find debian/kde-guidance-powermanager-trinity -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 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::
+	# generate form implementation using pykde user interface compiler
+	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n guidance_power_manager_ui.ui)
+	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n tooltip.ui)
+	(cd powermanager; /opt/trinity/bin/kdepyuic --usekdei18n notify.ui)
+
+	mkdir -p po
+	touch list
+	find -name "*.py" >> list
+	xgettext -ki18n -LPython -flist -o po/guidance.pot
+	rm list
+
+	for file in po/*pot; do \
+		sed "s/charset=CHARSET/charset=UTF-8/" -i $$file; \
+	done
+
+	# 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
+
+	rm -f kde-guidance-trinity/usr/share/python-support/kde-guidance-trinity/.version
+	rm -f kde-guidance-trinity/usr/share/python-support/kde-guidance-powermanager-trinity/.version
+
+get-orig-source:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]
+	@@dpatch-get-origtargz ../tarballs
+
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/serviceconfig-trinity.1 b/ubuntu/maverick/applications/kde-guidance/debian/serviceconfig-trinity.1
new file mode 100644
index 000000000..776a01998
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/serviceconfig-trinity.1
@@ -0,0 +1,69 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.\" Please adjust this date whenever revising the manpage.
+.\" 
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.TH "SERVICECONFIG" "1" "aout 2, 2005" "" ""
+.SH "NAME"
+serviceconfig \- Service/daemon administration tool
+.SH "SYNOPSIS"
+.B serviceconfig
+.RI [ options ]
+.br 
+.SH "DESCRIPTION"
+This manual page documents briefly the
+.B serviceconfig
+commands. This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP 
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBserviceconfig\fP is a service/daemon administration tool.
+.SH "OPTIONS"
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`\-').
+A summary of options is included below.
+.TP 
+.B \-\-help
+Show summary of options.
+.TP 
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP 
+.B \-\-help\-kde
+Show KDE specific help (common for all KDE apps).
+.TP 
+.B \-\-help\-all
+Show the complete help.
+.TP 
+.B \-\-author
+Show program author(s).
+.TP 
+.B \-v, \-\-version
+Show version of program.
+.TP 
+.B \-\-license
+Show program license.
+.SH "SEE ALSO"
+.BR displayconfig (1),
+.BR displayconfig-restore (1),
+.BR mountconfig (1),
+.BR userconfig (1).
+.br 
+.SH "AUTHOR"
+serviceconfig was written by <simon@simonzone.com>.
+.PP 
+This manual page was written by Fathi Boudra <fboudra@free.fr>,
+for the Debian project (but may be used by others).
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/userconfig-trinity.1 b/ubuntu/maverick/applications/kde-guidance/debian/userconfig-trinity.1
new file mode 100644
index 000000000..3b950add1
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/userconfig-trinity.1
@@ -0,0 +1,69 @@
+.\" Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.\" Please adjust this date whenever revising the manpage.
+.\" 
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.TH "USERCONFIG" "1" "aout 2, 2005" "" ""
+.SH "NAME"
+userconfig \- user and group administration tool
+.SH "SYNOPSIS"
+.B userconfig
+.RI [ options ]
+.br 
+.SH "DESCRIPTION"
+This manual page documents briefly the
+.B userconfig
+commands. This manual page was written for the Debian distribution
+because the original program does not have a manual page.
+.PP 
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" respectively.
+\fBuserconfig\fP is an user and group administration tool.
+.SH "OPTIONS"
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`\-').
+A summary of options is included below.
+.TP 
+.B \-\-help
+Show summary of options.
+.TP 
+.B \-\-help\-qt
+Show QT specific help (common for all QT apps).
+.TP 
+.B \-\-help\-kde
+Show KDE specific help (common for all KDE apps).
+.TP 
+.B \-\-help\-all
+Show the complete help.
+.TP 
+.B \-\-author
+Show program author(s).
+.TP 
+.B \-v, \-\-version
+Show version of program.
+.TP 
+.B \-\-license
+Show program license.
+.SH "SEE ALSO"
+.BR displayconfig (1),
+.BR displayconfig-restore (1),
+.BR mountconfig (1),
+.BR serviceconfig (1).
+.br 
+.SH "AUTHOR"
+userconfig was written by <simon@simonzone.com>.
+.PP 
+This manual page was written by Fathi Boudra <fboudra@free.fr>,
+for the Debian project (but may be used by others).
diff --git a/ubuntu/maverick/applications/kde-guidance/debian/watch b/ubuntu/maverick/applications/kde-guidance/debian/watch
new file mode 100644
index 000000000..19912c171
--- /dev/null
+++ b/ubuntu/maverick/applications/kde-guidance/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://www.simonzone.com/software/guidance/guidance-(.*)\.tar\.bz2 debian svn-upgrade