rev 4075 - in kde-extras: guidance/tags guidance/tags/0.6.7-2/debian
guidance/tags/0.6.7-2/debian/patches guidance/trunk/debian
guidance/trunk/debian/patches kwlan/tags/0.4.7-1/debian
kwlan/trunk/debian
Fathi Boudra
fboudra-guest at costa.debian.org
Tue Jul 4 12:19:12 UTC 2006
Author: fboudra-guest
Date: 2006-07-04 12:19:11 +0000 (Tue, 04 Jul 2006)
New Revision: 4075
Added:
kde-extras/guidance/tags/0.6.7-2/
kde-extras/guidance/tags/0.6.7-2/debian/patches/12_force_python2.4_script.diff
kde-extras/guidance/tags/0.6.7-2/debian/pycompat
kde-extras/guidance/tags/0.6.7-2/debian/pyversions
kde-extras/guidance/trunk/debian/patches/12_force_python2.4_script.diff
kde-extras/guidance/trunk/debian/pycompat
kde-extras/guidance/trunk/debian/pyversions
Removed:
kde-extras/guidance/tags/0.6.7-2/debian/source.lintian-overrides
kde-extras/guidance/trunk/debian/source.lintian-overrides
Modified:
kde-extras/guidance/tags/0.6.7-2/debian/changelog
kde-extras/guidance/tags/0.6.7-2/debian/control
kde-extras/guidance/tags/0.6.7-2/debian/kde-guidance.lintian-overrides
kde-extras/guidance/tags/0.6.7-2/debian/rules
kde-extras/guidance/trunk/debian/changelog
kde-extras/guidance/trunk/debian/control
kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides
kde-extras/guidance/trunk/debian/rules
kde-extras/kwlan/tags/0.4.7-1/debian/changelog
kde-extras/kwlan/trunk/debian/changelog
Log:
converted guidance to python-support, tagged/uploaded 0.6.7-2
Copied: kde-extras/guidance/tags/0.6.7-2 (from rev 4071, kde-extras/guidance/trunk)
Modified: kde-extras/guidance/tags/0.6.7-2/debian/changelog
===================================================================
--- kde-extras/guidance/trunk/debian/changelog 2006-07-03 11:27:00 UTC (rev 4071)
+++ kde-extras/guidance/tags/0.6.7-2/debian/changelog 2006-07-04 12:19:11 UTC (rev 4075)
@@ -1,3 +1,15 @@
+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 at free.fr> Fri, 30 Jun 2006 14:44:46 +0200
+
kde-guidance (0.6.7-1) experimental; urgency=low
* Initial Debian release (Closes: #340144)
Modified: kde-extras/guidance/tags/0.6.7-2/debian/control
===================================================================
--- kde-extras/guidance/trunk/debian/control 2006-07-03 11:27:00 UTC (rev 4071)
+++ kde-extras/guidance/tags/0.6.7-2/debian/control 2006-07-04 12:19:11 UTC (rev 4075)
@@ -2,12 +2,16 @@
Section: kde
Priority: optional
Maintainer: Fathi Boudra <fboudra at free.fr>
-Build-Depends: cdbs, debhelper (>= 5.0.0), chrpath, kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev, pykdeextensions, pyqt-tools, python-kde3, python-sip4-dev
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), chrpath,
+ kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev,
+ pykdeextensions, pyqt-tools, python-kde3, python-sip4-dev,
+ python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
Standards-Version: 3.7.2
Package: kde-guidance
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions, python-kde3
+Provides: ${python:Provides}
Description: collection of KDE system administration tools for GNU/Linux
Guidance currently consists of four programs designed to help you
look after your system:
Modified: kde-extras/guidance/tags/0.6.7-2/debian/kde-guidance.lintian-overrides
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides 2006-07-03 11:27:00 UTC (rev 4071)
+++ kde-extras/guidance/tags/0.6.7-2/debian/kde-guidance.lintian-overrides 2006-07-04 12:19:11 UTC (rev 4075)
@@ -1,3 +1,4 @@
-# false positive warnings from linitian
+# false positive warnings from lintian
kde-guidance: postinst-has-useless-call-to-ldconfig
kde-guidance: postrm-has-useless-call-to-ldconfig
+kde-guidance: package-has-a-duplicate-relation depends: python2.4 (>= 2.3.90), python2.4
Added: kde-extras/guidance/tags/0.6.7-2/debian/patches/12_force_python2.4_script.diff
===================================================================
--- kde-extras/guidance/trunk/debian/patches/12_force_python2.4_script.diff 2006-07-03 11:27:00 UTC (rev 4071)
+++ kde-extras/guidance/tags/0.6.7-2/debian/patches/12_force_python2.4_script.diff 2006-07-04 12:19:11 UTC (rev 4075)
@@ -0,0 +1,144 @@
+diff -Nur kde-guidance-0.6.7/displayconfig/displayconfig.py kde-guidance-0.6.7.new/displayconfig/displayconfig.py
+--- kde-guidance-0.6.7/displayconfig/displayconfig.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/displayconfig.py 2006-07-03 14:01:46.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ # -*- coding: UTF-8 -*-
+ ###########################################################################
+ # displayconfig.py - description #
+diff -Nur kde-guidance-0.6.7/displayconfig/displayconfig-restore.py kde-guidance-0.6.7.new/displayconfig/displayconfig-restore.py
+--- kde-guidance-0.6.7/displayconfig/displayconfig-restore.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/displayconfig-restore.py 2006-07-03 14:01:54.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # displayconfig-restore.py - description #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/displayconfig/servertestdialog.py kde-guidance-0.6.7.new/displayconfig/servertestdialog.py
+--- kde-guidance-0.6.7/displayconfig/servertestdialog.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/servertestdialog.py 2006-07-03 14:02:18.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # servertestdialog.py - #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/displayconfig/xorgconfig.py kde-guidance-0.6.7.new/displayconfig/xorgconfig.py
+--- kde-guidance-0.6.7/displayconfig/xorgconfig.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/xorgconfig.py 2006-07-03 14:02:29.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # xorgconfig.py - description #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/mountconfig/MicroHAL.py kde-guidance-0.6.7.new/mountconfig/MicroHAL.py
+--- kde-guidance-0.6.7/mountconfig/MicroHAL.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/mountconfig/MicroHAL.py 2006-07-03 14:01:19.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # MicroHAL.py - #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/mountconfig/mountconfig.py kde-guidance-0.6.7.new/mountconfig/mountconfig.py
+--- kde-guidance-0.6.7/mountconfig/mountconfig.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/mountconfig/mountconfig.py 2006-07-03 14:01:09.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ # -*- coding: UTF-8 -*-
+ ###########################################################################
+ # mountconfig.py - description #
+diff -Nur kde-guidance-0.6.7/serviceconfig/serviceconfig.py kde-guidance-0.6.7.new/serviceconfig/serviceconfig.py
+--- kde-guidance-0.6.7/serviceconfig/serviceconfig.py 2006-07-03 13:59:11.000000000 +0200
++++ kde-guidance-0.6.7.new/serviceconfig/serviceconfig.py 2006-07-03 14:00:02.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ # -*- coding: UTF-8 -*-
+ ###########################################################################
+ # serviceconfig.py - description #
+diff -Nur kde-guidance-0.6.7/userconfig/unixauthdb.py kde-guidance-0.6.7.new/userconfig/unixauthdb.py
+--- kde-guidance-0.6.7/userconfig/unixauthdb.py 2006-07-03 13:59:11.000000000 +0200
++++ kde-guidance-0.6.7.new/userconfig/unixauthdb.py 2006-07-03 14:00:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # Copyright (C) 2004-2006 by Simon Edwards
+ # <simon at simonzone.com>
+diff -Nur kde-guidance-0.6.7/userconfig/userconfig.py kde-guidance-0.6.7.new/userconfig/userconfig.py
+--- kde-guidance-0.6.7/userconfig/userconfig.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/userconfig/userconfig.py 2006-07-03 14:00:26.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ # -*- coding: UTF-8 -*-
+ ###########################################################################
+ # userconfig.py - description #
+diff -Nur kde-guidance-0.6.7/displayconfig/displayconfigabstraction.py kde-guidance-0.6.7.new/displayconfig/displayconfigabstraction.py
+--- kde-guidance-0.6.7/displayconfig/displayconfigabstraction.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/displayconfigabstraction.py 2006-07-03 15:18:38.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.4
+
+ import os
+ import sys
+diff -Nur kde-guidance-0.6.7/displayconfig/execwithcapture.py kde-guidance-0.6.7.new/displayconfig/execwithcapture.py
+--- kde-guidance-0.6.7/displayconfig/execwithcapture.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/execwithcapture.py 2006-07-03 15:18:51.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.4
+
+ import os
+ import select
+diff -Nur kde-guidance-0.6.7/displayconfig/ktimerdialog.py kde-guidance-0.6.7.new/displayconfig/ktimerdialog.py
+--- kde-guidance-0.6.7/displayconfig/ktimerdialog.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/ktimerdialog.py 2006-07-03 15:19:06.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # ktimerdialog.py - description #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/mountconfig/fuser.py kde-guidance-0.6.7.new/mountconfig/fuser.py
+--- kde-guidance-0.6.7/mountconfig/fuser.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/mountconfig/fuser.py 2006-07-03 15:18:02.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # fuser.py - description #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/mountconfig/sizeview.py kde-guidance-0.6.7.new/mountconfig/sizeview.py
+--- kde-guidance-0.6.7/mountconfig/sizeview.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/mountconfig/sizeview.py 2006-07-03 15:18:14.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.4
+
+ from qt import *
+ from kdecore import *
+diff -Nur kde-guidance-0.6.7/modules/xf86misc.py kde-guidance-0.6.7.new/modules/xf86misc.py
+--- kde-guidance-0.6.7/modules/xf86misc.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/modules/xf86misc.py 2006-07-03 16:47:58.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.4
+ ###########################################################################
+ # xf86misc.py - #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/displayconfig/displayconfig-hwprobe.py kde-guidance-0.6.7.new/displayconfig/displayconfig-hwprobe.py
+--- kde-guidance-0.6.7/displayconfig/displayconfig-hwprobe.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/displayconfig-hwprobe.py 2006-07-03 17:41:21.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # displayconfig-hwprobe.py - description #
+ # ------------------------------ #
Added: kde-extras/guidance/tags/0.6.7-2/debian/pycompat
===================================================================
--- kde-extras/guidance/trunk/debian/pycompat 2006-07-03 11:27:00 UTC (rev 4071)
+++ kde-extras/guidance/tags/0.6.7-2/debian/pycompat 2006-07-04 12:19:11 UTC (rev 4075)
@@ -0,0 +1 @@
+2
Added: kde-extras/guidance/tags/0.6.7-2/debian/pyversions
===================================================================
--- kde-extras/guidance/trunk/debian/pyversions 2006-07-03 11:27:00 UTC (rev 4071)
+++ kde-extras/guidance/tags/0.6.7-2/debian/pyversions 2006-07-04 12:19:11 UTC (rev 4075)
@@ -0,0 +1 @@
+2.4-
Modified: kde-extras/guidance/tags/0.6.7-2/debian/rules
===================================================================
--- kde-extras/guidance/trunk/debian/rules 2006-07-03 11:27:00 UTC (rev 4071)
+++ kde-extras/guidance/tags/0.6.7-2/debian/rules 2006-07-04 12:19:11 UTC (rev 4075)
@@ -1,59 +1,55 @@
#!/usr/bin/make -f
+DEB_PYTHON_SYSTEM = pysupport
+
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_INSTALL_MANPAGES_kde-guidance := debian/displayconfig.1 debian/mountconfig.1 debian/serviceconfig.1 debian/userconfig.1
+PYSUPPORT_PATH = $(DEB_DESTDIR)/usr/share/python-support/kde-guidance
-PYTHONVERS = 2.3
-
install/kde-guidance::
- # put python modules in /usr/lib, debian policy compliance
- mv debian/kde-guidance/usr/share/apps/guidance/*py debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages
- mv debian/kde-guidance/usr/share/apps/guidance/*pyc debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages
+ # install icons to right place
+ install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/hi32-app-daemons.png \
+ $(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/daemons.png
+ install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/kcmpartitions.png \
+ $(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
+ install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/hi32-user.png \
+ $(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
+ install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/hi32-display.png \
+ $(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
- # redo the link properly
- (cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/displayconfig.py displayconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/displayconfig-restore.py displayconfig-restore)
- (cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/mountconfig.py mountconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/serviceconfig.py serviceconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/userconfig.py userconfig)
+ # install lintian overrides
+ install -D -p -m0644 debian/kde-guidance.lintian-overrides \
+ $(DEB_DESTDIR)/usr/share/lintian/overrides/kde-guidance
- # remove script-not-executable
- chmod +x debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/*.py
- chmod +x debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/*.py
+ # install displayconfig-hwprobe.py script
+ install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
+ $(PYSUPPORT_PATH)/displayconfig-hwprobe.py
- # 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
+ # move python modules in PYSUPPORT_PATH
+ mv $(DEB_DESTDIR)/usr/lib/python2.4/site-packages/*.py $(PYSUPPORT_PATH)
+ mv $(DEB_DESTDIR)/usr/share/apps/guidance/*.py $(PYSUPPORT_PATH)
- chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/ScanPCI.py
- chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/SimpleCommandRunner.py
- chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/SMBShareSelectDialog.py
- chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/displayconfigwidgets.py
- chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/fuser_ui.py
+ # fix script-not-executable
+ chmod 0755 $(PYSUPPORT_PATH)/xf86misc.py
+ chmod 0755 $(PYSUPPORT_PATH)/displayconfigabstraction.py
+ chmod 0755 $(PYSUPPORT_PATH)/execwithcapture.py
+ chmod 0755 $(PYSUPPORT_PATH)/fuser.py
+ chmod 0755 $(PYSUPPORT_PATH)/ktimerdialog.py
+ chmod 0755 $(PYSUPPORT_PATH)/sizeview.py
- # copy icons to right place
- install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/hi32-app-daemons.png \
- debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/daemons.png
- install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/kcmpartitions.png \
- debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
- install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/hi32-user.png \
- debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
- install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/hi32-display.png \
- debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
+ # fix binary-or-shlib-defines-rpath
+ chrpath -d $(DEB_DESTDIR)/usr/lib/kde3/kcm_*.so.*
- # install displayconfig-hwprobe.py script
- install -D -p -m0755 displayconfig/displayconfig-hwprobe.py debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/displayconfig-hwprobe.py
+ # fix the link properly
+ (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/displayconfig.py displayconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/displayconfig-restore.py displayconfig-restore)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/mountconfig.py mountconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/serviceconfig.py serviceconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/userconfig.py userconfig)
- # install lintian overrides
- install -D -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.*
-
clean::
rm -rf build
Deleted: kde-extras/guidance/tags/0.6.7-2/debian/source.lintian-overrides
Modified: kde-extras/guidance/trunk/debian/changelog
===================================================================
--- kde-extras/guidance/trunk/debian/changelog 2006-07-03 19:10:14 UTC (rev 4074)
+++ kde-extras/guidance/trunk/debian/changelog 2006-07-04 12:19:11 UTC (rev 4075)
@@ -1,3 +1,15 @@
+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 at free.fr> Fri, 30 Jun 2006 14:44:46 +0200
+
kde-guidance (0.6.7-1) experimental; urgency=low
* Initial Debian release (Closes: #340144)
Modified: kde-extras/guidance/trunk/debian/control
===================================================================
--- kde-extras/guidance/trunk/debian/control 2006-07-03 19:10:14 UTC (rev 4074)
+++ kde-extras/guidance/trunk/debian/control 2006-07-04 12:19:11 UTC (rev 4075)
@@ -2,12 +2,16 @@
Section: kde
Priority: optional
Maintainer: Fathi Boudra <fboudra at free.fr>
-Build-Depends: cdbs, debhelper (>= 5.0.0), chrpath, kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev, pykdeextensions, pyqt-tools, python-kde3, python-sip4-dev
+Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), chrpath,
+ kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev,
+ pykdeextensions, pyqt-tools, python-kde3, python-sip4-dev,
+ python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
Standards-Version: 3.7.2
Package: kde-guidance
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, pykdeextensions, python-kde3
+Provides: ${python:Provides}
Description: collection of KDE system administration tools for GNU/Linux
Guidance currently consists of four programs designed to help you
look after your system:
Modified: kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides 2006-07-03 19:10:14 UTC (rev 4074)
+++ kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides 2006-07-04 12:19:11 UTC (rev 4075)
@@ -1,3 +1,4 @@
-# false positive warnings from linitian
+# false positive warnings from lintian
kde-guidance: postinst-has-useless-call-to-ldconfig
kde-guidance: postrm-has-useless-call-to-ldconfig
+kde-guidance: package-has-a-duplicate-relation depends: python2.4 (>= 2.3.90), python2.4
Added: kde-extras/guidance/trunk/debian/patches/12_force_python2.4_script.diff
===================================================================
--- kde-extras/guidance/trunk/debian/patches/12_force_python2.4_script.diff 2006-07-03 19:10:14 UTC (rev 4074)
+++ kde-extras/guidance/trunk/debian/patches/12_force_python2.4_script.diff 2006-07-04 12:19:11 UTC (rev 4075)
@@ -0,0 +1,144 @@
+diff -Nur kde-guidance-0.6.7/displayconfig/displayconfig.py kde-guidance-0.6.7.new/displayconfig/displayconfig.py
+--- kde-guidance-0.6.7/displayconfig/displayconfig.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/displayconfig.py 2006-07-03 14:01:46.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ # -*- coding: UTF-8 -*-
+ ###########################################################################
+ # displayconfig.py - description #
+diff -Nur kde-guidance-0.6.7/displayconfig/displayconfig-restore.py kde-guidance-0.6.7.new/displayconfig/displayconfig-restore.py
+--- kde-guidance-0.6.7/displayconfig/displayconfig-restore.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/displayconfig-restore.py 2006-07-03 14:01:54.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # displayconfig-restore.py - description #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/displayconfig/servertestdialog.py kde-guidance-0.6.7.new/displayconfig/servertestdialog.py
+--- kde-guidance-0.6.7/displayconfig/servertestdialog.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/servertestdialog.py 2006-07-03 14:02:18.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # servertestdialog.py - #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/displayconfig/xorgconfig.py kde-guidance-0.6.7.new/displayconfig/xorgconfig.py
+--- kde-guidance-0.6.7/displayconfig/xorgconfig.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/xorgconfig.py 2006-07-03 14:02:29.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # xorgconfig.py - description #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/mountconfig/MicroHAL.py kde-guidance-0.6.7.new/mountconfig/MicroHAL.py
+--- kde-guidance-0.6.7/mountconfig/MicroHAL.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/mountconfig/MicroHAL.py 2006-07-03 14:01:19.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # MicroHAL.py - #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/mountconfig/mountconfig.py kde-guidance-0.6.7.new/mountconfig/mountconfig.py
+--- kde-guidance-0.6.7/mountconfig/mountconfig.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/mountconfig/mountconfig.py 2006-07-03 14:01:09.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ # -*- coding: UTF-8 -*-
+ ###########################################################################
+ # mountconfig.py - description #
+diff -Nur kde-guidance-0.6.7/serviceconfig/serviceconfig.py kde-guidance-0.6.7.new/serviceconfig/serviceconfig.py
+--- kde-guidance-0.6.7/serviceconfig/serviceconfig.py 2006-07-03 13:59:11.000000000 +0200
++++ kde-guidance-0.6.7.new/serviceconfig/serviceconfig.py 2006-07-03 14:00:02.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ # -*- coding: UTF-8 -*-
+ ###########################################################################
+ # serviceconfig.py - description #
+diff -Nur kde-guidance-0.6.7/userconfig/unixauthdb.py kde-guidance-0.6.7.new/userconfig/unixauthdb.py
+--- kde-guidance-0.6.7/userconfig/unixauthdb.py 2006-07-03 13:59:11.000000000 +0200
++++ kde-guidance-0.6.7.new/userconfig/unixauthdb.py 2006-07-03 14:00:35.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # Copyright (C) 2004-2006 by Simon Edwards
+ # <simon at simonzone.com>
+diff -Nur kde-guidance-0.6.7/userconfig/userconfig.py kde-guidance-0.6.7.new/userconfig/userconfig.py
+--- kde-guidance-0.6.7/userconfig/userconfig.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/userconfig/userconfig.py 2006-07-03 14:00:26.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ # -*- coding: UTF-8 -*-
+ ###########################################################################
+ # userconfig.py - description #
+diff -Nur kde-guidance-0.6.7/displayconfig/displayconfigabstraction.py kde-guidance-0.6.7.new/displayconfig/displayconfigabstraction.py
+--- kde-guidance-0.6.7/displayconfig/displayconfigabstraction.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/displayconfigabstraction.py 2006-07-03 15:18:38.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.4
+
+ import os
+ import sys
+diff -Nur kde-guidance-0.6.7/displayconfig/execwithcapture.py kde-guidance-0.6.7.new/displayconfig/execwithcapture.py
+--- kde-guidance-0.6.7/displayconfig/execwithcapture.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/execwithcapture.py 2006-07-03 15:18:51.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.4
+
+ import os
+ import select
+diff -Nur kde-guidance-0.6.7/displayconfig/ktimerdialog.py kde-guidance-0.6.7.new/displayconfig/ktimerdialog.py
+--- kde-guidance-0.6.7/displayconfig/ktimerdialog.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/ktimerdialog.py 2006-07-03 15:19:06.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # ktimerdialog.py - description #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/mountconfig/fuser.py kde-guidance-0.6.7.new/mountconfig/fuser.py
+--- kde-guidance-0.6.7/mountconfig/fuser.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/mountconfig/fuser.py 2006-07-03 15:18:02.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # fuser.py - description #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/mountconfig/sizeview.py kde-guidance-0.6.7.new/mountconfig/sizeview.py
+--- kde-guidance-0.6.7/mountconfig/sizeview.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/mountconfig/sizeview.py 2006-07-03 15:18:14.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.4
+
+ from qt import *
+ from kdecore import *
+diff -Nur kde-guidance-0.6.7/modules/xf86misc.py kde-guidance-0.6.7.new/modules/xf86misc.py
+--- kde-guidance-0.6.7/modules/xf86misc.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/modules/xf86misc.py 2006-07-03 16:47:58.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.4
+ ###########################################################################
+ # xf86misc.py - #
+ # ------------------------------ #
+diff -Nur kde-guidance-0.6.7/displayconfig/displayconfig-hwprobe.py kde-guidance-0.6.7.new/displayconfig/displayconfig-hwprobe.py
+--- kde-guidance-0.6.7/displayconfig/displayconfig-hwprobe.py 2006-06-30 14:38:38.000000000 +0200
++++ kde-guidance-0.6.7.new/displayconfig/displayconfig-hwprobe.py 2006-07-03 17:41:21.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python2.4
+ ###########################################################################
+ # displayconfig-hwprobe.py - description #
+ # ------------------------------ #
Added: kde-extras/guidance/trunk/debian/pycompat
===================================================================
--- kde-extras/guidance/trunk/debian/pycompat 2006-07-03 19:10:14 UTC (rev 4074)
+++ kde-extras/guidance/trunk/debian/pycompat 2006-07-04 12:19:11 UTC (rev 4075)
@@ -0,0 +1 @@
+2
Added: kde-extras/guidance/trunk/debian/pyversions
===================================================================
--- kde-extras/guidance/trunk/debian/pyversions 2006-07-03 19:10:14 UTC (rev 4074)
+++ kde-extras/guidance/trunk/debian/pyversions 2006-07-04 12:19:11 UTC (rev 4075)
@@ -0,0 +1 @@
+2.4-
Modified: kde-extras/guidance/trunk/debian/rules
===================================================================
--- kde-extras/guidance/trunk/debian/rules 2006-07-03 19:10:14 UTC (rev 4074)
+++ kde-extras/guidance/trunk/debian/rules 2006-07-04 12:19:11 UTC (rev 4075)
@@ -1,59 +1,55 @@
#!/usr/bin/make -f
+DEB_PYTHON_SYSTEM = pysupport
+
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_INSTALL_MANPAGES_kde-guidance := debian/displayconfig.1 debian/mountconfig.1 debian/serviceconfig.1 debian/userconfig.1
+PYSUPPORT_PATH = $(DEB_DESTDIR)/usr/share/python-support/kde-guidance
-PYTHONVERS = 2.3
-
install/kde-guidance::
- # put python modules in /usr/lib, debian policy compliance
- mv debian/kde-guidance/usr/share/apps/guidance/*py debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages
- mv debian/kde-guidance/usr/share/apps/guidance/*pyc debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages
+ # install icons to right place
+ install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/hi32-app-daemons.png \
+ $(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/daemons.png
+ install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/kcmpartitions.png \
+ $(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
+ install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/hi32-user.png \
+ $(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
+ install -D -p -m0644 $(DEB_DESTDIR)/usr/share/apps/guidance/pics/hi32-display.png \
+ $(DEB_DESTDIR)/usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
- # redo the link properly
- (cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/displayconfig.py displayconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/displayconfig-restore.py displayconfig-restore)
- (cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/mountconfig.py mountconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/serviceconfig.py serviceconfig)
- (cd debian/kde-guidance/usr/bin; ln -sf ../lib/python$(PYTHONVERS)/site-packages/userconfig.py userconfig)
+ # install lintian overrides
+ install -D -p -m0644 debian/kde-guidance.lintian-overrides \
+ $(DEB_DESTDIR)/usr/share/lintian/overrides/kde-guidance
- # remove script-not-executable
- chmod +x debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/*.py
- chmod +x debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/*.py
+ # install displayconfig-hwprobe.py script
+ install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
+ $(PYSUPPORT_PATH)/displayconfig-hwprobe.py
- # 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
+ # move python modules in PYSUPPORT_PATH
+ mv $(DEB_DESTDIR)/usr/lib/python2.4/site-packages/*.py $(PYSUPPORT_PATH)
+ mv $(DEB_DESTDIR)/usr/share/apps/guidance/*.py $(PYSUPPORT_PATH)
- chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/ScanPCI.py
- chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/SimpleCommandRunner.py
- chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/SMBShareSelectDialog.py
- chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/displayconfigwidgets.py
- chmod 0644 debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/fuser_ui.py
+ # fix script-not-executable
+ chmod 0755 $(PYSUPPORT_PATH)/xf86misc.py
+ chmod 0755 $(PYSUPPORT_PATH)/displayconfigabstraction.py
+ chmod 0755 $(PYSUPPORT_PATH)/execwithcapture.py
+ chmod 0755 $(PYSUPPORT_PATH)/fuser.py
+ chmod 0755 $(PYSUPPORT_PATH)/ktimerdialog.py
+ chmod 0755 $(PYSUPPORT_PATH)/sizeview.py
- # copy icons to right place
- install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/hi32-app-daemons.png \
- debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/daemons.png
- install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/kcmpartitions.png \
- debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/disksfilesystems.png
- install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/hi32-user.png \
- debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/userconfig.png
- install -D -p -m0644 debian/kde-guidance/usr/share/apps/guidance/pics/hi32-display.png \
- debian/kde-guidance/usr/share/icons/crystalsvg/32x32/apps/displayconfig.png
+ # fix binary-or-shlib-defines-rpath
+ chrpath -d $(DEB_DESTDIR)/usr/lib/kde3/kcm_*.so.*
- # install displayconfig-hwprobe.py script
- install -D -p -m0755 displayconfig/displayconfig-hwprobe.py debian/kde-guidance/usr/lib/python$(PYTHONVERS)/site-packages/displayconfig-hwprobe.py
+ # fix the link properly
+ (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/displayconfig.py displayconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/displayconfig-restore.py displayconfig-restore)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/mountconfig.py mountconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/serviceconfig.py serviceconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../usr/share/python-support/kde-guidance/userconfig.py userconfig)
- # install lintian overrides
- install -D -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.*
-
clean::
rm -rf build
Deleted: kde-extras/guidance/trunk/debian/source.lintian-overrides
Modified: kde-extras/kwlan/tags/0.4.7-1/debian/changelog
===================================================================
--- kde-extras/kwlan/tags/0.4.7-1/debian/changelog 2006-07-03 19:10:14 UTC (rev 4074)
+++ kde-extras/kwlan/tags/0.4.7-1/debian/changelog 2006-07-04 12:19:11 UTC (rev 4075)
@@ -1,6 +1,6 @@
kwlan (0.4.7-1) unstable; urgency=low
- * Initial release
+ * Initial release (Closes: #376521)
-- Fathi Boudra <fboudra at free.fr> Mon, 3 Jul 2006 08:08:32 +0200
Modified: kde-extras/kwlan/trunk/debian/changelog
===================================================================
--- kde-extras/kwlan/trunk/debian/changelog 2006-07-03 19:10:14 UTC (rev 4074)
+++ kde-extras/kwlan/trunk/debian/changelog 2006-07-04 12:19:11 UTC (rev 4075)
@@ -1,6 +1,6 @@
kwlan (0.4.7-1) unstable; urgency=low
- * Initial release
+ * Initial release (Closes: #376521)
-- Fathi Boudra <fboudra at free.fr> Mon, 3 Jul 2006 08:08:32 +0200
More information about the pkg-kde-commits
mailing list