rev 3316 - kde-extras/guidance/trunk/debian

Fathi Boudra fboudra-guest at costa.debian.org
Sun Mar 19 16:29:32 UTC 2006 

Author: fboudra-guest
Date: 2006-03-19 16:29:31 +0000 (Sun, 19 Mar 2006)
New Revision: 3316

Added:
   kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides
   kde-extras/guidance/trunk/debian/postinst
   kde-extras/guidance/trunk/debian/postrm
Modified:
   kde-extras/guidance/trunk/debian/changelog
   kde-extras/guidance/trunk/debian/control
   kde-extras/guidance/trunk/debian/copyright
   kde-extras/guidance/trunk/debian/dirs
   kde-extras/guidance/trunk/debian/manpages
   kde-extras/guidance/trunk/debian/rules
Log:
New upstream version, merge with ubuntu

Modified: kde-extras/guidance/trunk/debian/changelog
===================================================================
--- kde-extras/guidance/trunk/debian/changelog	2006-03-18 23:13:56 UTC (rev 3315)
+++ kde-extras/guidance/trunk/debian/changelog	2006-03-19 16:29:31 UTC (rev 3316)
@@ -1,19 +1,78 @@
-kde-guidance (0.5.0-1) unstable; urgency=low
+kde-guidance (0.6.3-1) unstable; urgency=low
 
+  * Initial Debian release Closes: #340144
+  * Merge with Ubuntu
   * New upstream version
   * Added displayconfig
   * Removed README.Debian
+  * Fixed manpages
   * Fixed old fsf address in copyright file
 
- -- Fathi Boudra <fboudra at free.fr>  Fri, 2 Dec 2005 08:09:38 +0100
+ -- Fathi Boudra <fboudra at free.fr>  Fri, 19 Mar 2006 15:46:17 +0100
 
-kde-guidance (0.4.0-1) unstable; urgency=low
+kde-guidance (0.6.2-0ubuntu1) dapper; urgency=low
 
-  * Initial Debian release Closes: #340144
-  * Sync with Ubuntu
+  [ 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).
 
- -- Fathi Boudra <fboudra at free.fr>  Thu, 24 Nov 2005 09:20:11 +0100
+  [ Jonathan Riddell ]
+  * Remove kubuntu_02_display_category.diff, now in SVN
+  * Remove kubuntu_03_userconfig_shebang.diff, now in SVN
 
+ -- Jonathan Riddell <jriddell at 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 at 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/KubuntuSystemTools
+  * 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 at 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 at 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 at 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

Modified: kde-extras/guidance/trunk/debian/control
===================================================================
--- kde-extras/guidance/trunk/debian/control	2006-03-18 23:13:56 UTC (rev 3315)
+++ kde-extras/guidance/trunk/debian/control	2006-03-19 16:29:31 UTC (rev 3316)
@@ -2,12 +2,12 @@
 Section: kde
 Priority: optional
 Maintainer: Fathi Boudra <fboudra at free.fr>
-Build-Depends: debhelper (>= 5.0.7), kdelibs4-dev (>= 3.4.2), libpythonize0-dev (>= 0.4.0), libtool (>= 1.5.20), libxml2-utils (>= 2.6.22), libxxf86vm-dev (>= 6.8.2), pykdeextensions (>= 0.4.0), pyqt-tools (>= 3.15), python-kde3 (>= 3.11.3), python-sip4-dev (>= 4.3.1)
+Build-Depends: debhelper (>= 5.0.0), chrpath, kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev, pykdeextensions, pyqt-tools, python-kde3, python-sip4-dev
 Standards-Version: 3.6.2
 
 Package: kde-guidance
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-kde3
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions, python-kde3
 Description: collection of KDE system administration tools for GNU/Linux
  Guidance currently consists of four programs designed to help you
  look after your system:
@@ -16,5 +16,5 @@
   o  mountconfig - Disk and filesystem administration
   o  displayconfig - Screen and display configuration
  .
- These tools are available in KDE Control center or can be
- run as standalone applications.
+ These tools are available in KDE Control Center, System Settings 
+ or can be run as standalone applications.

Modified: kde-extras/guidance/trunk/debian/copyright
===================================================================
--- kde-extras/guidance/trunk/debian/copyright	2006-03-18 23:13:56 UTC (rev 3315)
+++ kde-extras/guidance/trunk/debian/copyright	2006-03-19 16:29:31 UTC (rev 3316)
@@ -1,9 +1,11 @@
 This package was debianized by Fathi Boudra <fboudra at free.fr> on
 Mon,  1 Aug 2005 19:23:46 +0200.
 
-It was downloaded from <http://www.simonzone.com/software/guidance>
+It was downloaded from http://www.simonzone.com/software/guidance
 
-Copyright Holder: Simon Edwards <simon at simonzone.com>
+Copyright Holders:
+   Simon Edwards <simon at simonzone.com>
+   Sebastian Kügler <sebas at vizzzion.org>
 
 License:
 

Modified: kde-extras/guidance/trunk/debian/dirs
===================================================================
--- kde-extras/guidance/trunk/debian/dirs	2006-03-18 23:13:56 UTC (rev 3315)
+++ kde-extras/guidance/trunk/debian/dirs	2006-03-19 16:29:31 UTC (rev 3316)
@@ -1,3 +1,4 @@
+etc/init.d
 usr/bin
 usr/lib
 usr/lib/python2.3/site-packages
@@ -4,3 +5,5 @@
 usr/share/apps/guidance
 usr/share/doc/kde/HTML/en/guidance
 usr/share/icons/crystalsvg/32x32/apps
+usr/share/lintian/overrides
+var/lib/guidance

Added: kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides	2006-03-18 23:13:56 UTC (rev 3315)
+++ kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides	2006-03-19 16:29:31 UTC (rev 3316)
@@ -0,0 +1,7 @@
+# in my TODO list
+kde-guidance: binary-without-manpage displayconfig-restore
+# upstream distributes it like that
+kde-guidance: init.d-script-does-not-implement-required-option /etc/init.d/displayconfig-hwprobe.py start
+kde-guidance: init.d-script-does-not-implement-required-option /etc/init.d/displayconfig-hwprobe.py stop
+kde-guidance: init.d-script-does-not-implement-required-option /etc/init.d/displayconfig-hwprobe.py restart
+kde-guidance: init.d-script-does-not-implement-required-option /etc/init.d/displayconfig-hwprobe.py force-reload

Modified: kde-extras/guidance/trunk/debian/manpages
===================================================================
--- kde-extras/guidance/trunk/debian/manpages	2006-03-18 23:13:56 UTC (rev 3315)
+++ kde-extras/guidance/trunk/debian/manpages	2006-03-19 16:29:31 UTC (rev 3316)
@@ -2,4 +2,3 @@
 debian/serviceconfig.1
 debian/userconfig.1
 debian/displayconfig.1
-debian/displayconfig-restore.1

Added: kde-extras/guidance/trunk/debian/postinst
===================================================================
--- kde-extras/guidance/trunk/debian/postinst	2006-03-18 23:13:56 UTC (rev 3315)
+++ kde-extras/guidance/trunk/debian/postinst	2006-03-19 16:29:31 UTC (rev 3316)
@@ -0,0 +1,6 @@
+#! /bin/sh
+
+umask 022
+set -e
+
+update-rc.d displayconfig-hwprobe.py start 37 S .

Added: kde-extras/guidance/trunk/debian/postrm
===================================================================
--- kde-extras/guidance/trunk/debian/postrm	2006-03-18 23:13:56 UTC (rev 3315)
+++ kde-extras/guidance/trunk/debian/postrm	2006-03-19 16:29:31 UTC (rev 3316)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+case "$1" in
+        remove)
+                ;;
+        purge)
+                update-rc.d displayconfig-hwprobe.py remove
+                ;;
+        *)
+                ;;
+esac

Modified: kde-extras/guidance/trunk/debian/rules
===================================================================
--- kde-extras/guidance/trunk/debian/rules	2006-03-18 23:13:56 UTC (rev 3315)
+++ kde-extras/guidance/trunk/debian/rules	2006-03-19 16:29:31 UTC (rev 3316)
@@ -33,7 +33,6 @@
 
 	rm -rf build
 
-	# jriddell
 	rm -rf doc/en/*html doc/en/*bz2
 	rm -f serviceconfig/kcm_serviceconfig.cpp 
 	rm -f mountconfig/kcm_mountconfig.cpp 
@@ -49,24 +48,24 @@
 	dh_clean -k 
 	dh_installdirs
 
-	/usr/bin/$(PYTHONVERS) setup.py install --prefix=/usr --root=$(CURDIR)/debian/kde-guidance
+	/usr/bin/python setup.py install --prefix=/usr --root=$(CURDIR)/debian/kde-guidance
 
-	# jriddell : put python modules in /usr/lib, debian policy compliance
+	# put python modules in /usr/lib, debian policy compliance
 	mv debian/kde-guidance/usr/share/apps/guidance/*py debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages
 	mv debian/kde-guidance/usr/share/apps/guidance/*pyc debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages
 
-	# fboudra : redo the link properly
+	# redo the link properly
 	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/$(PYTHONVERS)/site-packages/displayconfig.py displayconfig)
 	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/$(PYTHONVERS)/site-packages/displayconfig-restore.py displayconfig-restore)
 	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/$(PYTHONVERS)/site-packages/mountconfig.py mountconfig)
 	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/$(PYTHONVERS)/site-packages/serviceconfig.py serviceconfig)
 	(cd debian/kde-guidance/usr/bin; ln -sf ../lib/$(PYTHONVERS)/site-packages/userconfig.py userconfig)
 
-	# fboudra : remove script-not-executable
+	# remove script-not-executable
 	chmod +x debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages/*.py
 	chmod +x debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages/*.py
 
-	# fboudra : remove executable-not-elf-or-script. some remains need to be fixed in upstream
+	# remove executable-not-elf-or-script. some remains need to be fixed in upstream
 	chmod 0644 debian/kde-guidance/usr/share/apps/guidance/pics/*.png
 	chmod 0644 debian/kde-guidance/usr/share/applications/kde/*.desktop
 	chmod 0644 debian/kde-guidance/usr/share/icons/crystalsvg/16x16/apps/*.png
@@ -77,11 +76,21 @@
 	chmod 0644 debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages/displayconfigwidgets.py
 	chmod 0644 debian/kde-guidance/usr/lib/$(PYTHONVERS)/site-packages/fuser_ui.py
 
-	# jriddell : copy icons to right place
+	# copy icons to right place
 	cp debian/kde-guidance/usr/share/apps/guidance/pics/hi32-app-daemons.png debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/daemons.png
 	cp debian/kde-guidance/usr/share/apps/guidance/pics/kcmpartitions.png debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
 	cp debian/kde-guidance/usr/share/apps/guidance/pics/hi32-user.png debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
+	cp debian/kde-guidance/usr/share/apps/guidance/pics/hi32-display.png debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
 
+	# install displayconfig-hwprobe.py script
+	install -p -m0755 displayconfig/displayconfig-hwprobe.py debian/kde-guidance/etc/init.d/
+
+	# install lintian overrides
+	install -p -m0644 debian/kde-guidance.lintian-overrides debian/kde-guidance/usr/share/lintian/overrides/kde-guidance
+
+	# remove binary-or-shlib-defines-rpath
+	chrpath -d debian/kde-guidance/usr/lib/kde3/kcm_*.so.*
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.

More information about the pkg-kde-commits mailing list