rev 5542 - in kde-extras/guidance: tags
tags/0.7.1~svn20070204-1/debian trunk/debian
Fathi Boudra
fboudra-guest at alioth.debian.org
Sun Feb 4 16:36:37 CET 2007
Author: fboudra-guest
Date: 2007-02-04 16:36:36 +0100 (Sun, 04 Feb 2007)
New Revision: 5542
Added:
kde-extras/guidance/tags/0.7.1~svn20070204-1/
Removed:
kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/patches/
kde-extras/guidance/trunk/debian/patches/
Modified:
kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/changelog
kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/control
kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/kde-guidance-powermanager.install
kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/kde-guidance.install
kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/kde-guidance.lintian-overrides
kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/rules
kde-extras/guidance/trunk/debian/changelog
kde-extras/guidance/trunk/debian/control
kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install
kde-extras/guidance/trunk/debian/kde-guidance.install
kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides
kde-extras/guidance/trunk/debian/rules
Log:
tags guidance 0.7.1~svn20070204-1
Copied: kde-extras/guidance/tags/0.7.1~svn20070204-1 (from rev 5523, kde-extras/guidance/trunk)
Modified: kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/changelog
===================================================================
--- kde-extras/guidance/trunk/debian/changelog 2007-02-03 13:59:58 UTC (rev 5523)
+++ kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/changelog 2007-02-04 15:36:36 UTC (rev 5542)
@@ -1,9 +1,25 @@
-kde-guidance (0.7.0-2) UNRELEASED; urgency=low
+kde-guidance (0.7.1~svn20070204-1) experimental; urgency=low
- * NOT RELEASED YET
+ [ 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
- -- Mark Purcell <msp at debian.org> Fri, 10 Nov 2006 20:33:24 +0000
+ -- Fathi Boudra <fboudra at free.fr> Sun, 4 Feb 2007 12:27:42 +0100
kde-guidance (0.7.0-1) unstable; urgency=low
Modified: kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/control
===================================================================
--- kde-extras/guidance/trunk/debian/control 2007-02-03 13:59:58 UTC (rev 5523)
+++ kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/control 2007-02-04 15:36:36 UTC (rev 5542)
@@ -4,16 +4,17 @@
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), chrpath,
- kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev,
- pykdeextensions, pyqt-tools, python-kde3, python-kde3-dev, python-sip4-dev,
- python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
+ kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxss-dev,
+ libxxf86vm-dev, pykdeextensions, pyqt-tools, python-kde3, python-kde3-dev,
+ python-sip4-dev, python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
Standards-Version: 3.7.2
Package: kde-guidance
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- pykdeextensions, python-kde3, python-dbus, sysv-rc
+ pykdeextensions, python-kde3, sysv-rc
Provides: ${python:Provides}
+Conflicts: python2.4-iconvcodec
Description: collection of KDE system administration tools for GNU/Linux
Guidance currently consists of four programs designed to help you
look after your system:
@@ -30,9 +31,8 @@
Package: kde-guidance-powermanager
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-kde3, python-dbus, hal
+ kde-guidance, python-kde3, python-dbus, hal
Provides: ${python:Provides}
-Conflicts: klaptopdaemon, kpowersave
Description: HAL based power manager applet
A power management applet to indicate battery levels and perform hibernate or
suspend using HAL.
Modified: kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/kde-guidance-powermanager.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install 2007-02-03 13:59:58 UTC (rev 5523)
+++ kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/kde-guidance-powermanager.install 2007-02-04 15:36:36 UTC (rev 5542)
@@ -1,25 +1,7 @@
debian/tmp/usr/bin/guidance-power-manager
debian/tmp/usr/share/icons/hicolor/22x22/apps/power-manager.png
debian/tmp/usr/share/apps/guidance/pics/ac-adapter.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charged.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-000.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-020.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-040.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-060.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-080.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-100.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-000.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-020.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-040.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-060.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-080.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-100.png
-debian/tmp/usr/share/apps/guidance/pics/energy.png
-debian/tmp/usr/share/apps/guidance/pics/keyboard-power-low.png
-debian/tmp/usr/share/apps/guidance/pics/mouse-power-low.png
-debian/tmp/usr/share/apps/guidance/pics/power-information.png
-debian/tmp/usr/share/apps/guidance/pics/power-manager-128.png
-debian/tmp/usr/share/apps/guidance/pics/power-manager-64.png
+debian/tmp/usr/share/apps/guidance/pics/battery-*.png
debian/tmp/usr/share/apps/guidance/pics/processor.png
debian/tmp/usr/share/autostart/guidance-power-manager.desktop
debian/tmp/usr/share/python-support/kde-guidance/guidance-power-manager.py
Modified: kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/kde-guidance.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.install 2007-02-03 13:59:58 UTC (rev 5523)
+++ kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/kde-guidance.install 2007-02-04 15:36:36 UTC (rev 5542)
@@ -13,7 +13,7 @@
debian/tmp/usr/lib/kde3/kcm_wineconfig.so.0.0.0
debian/tmp/usr/lib/kde3/kcm_wineconfig.la
debian/tmp/usr/lib/kde3/kcm_wineconfig.a
-debian/tmp/usr/lib/python2.4/site-packages/ixf86misc.so
+debian/tmp/usr/lib/python*/site-packages/ixf86misc.so
debian/tmp/usr/share/icons/crystalsvg/16x16/apps/daemons.png
debian/tmp/usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
debian/tmp/usr/share/icons/crystalsvg/16x16/apps/userconfig.png
Modified: kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/kde-guidance.lintian-overrides
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides 2007-02-03 13:59:58 UTC (rev 5523)
+++ kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/kde-guidance.lintian-overrides 2007-02-04 15:36:36 UTC (rev 5542)
@@ -1,4 +1,4 @@
# 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
+kde-guidance: package-has-a-duplicate-relation depends
Modified: kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/rules
===================================================================
--- kde-extras/guidance/trunk/debian/rules 2007-02-03 13:59:58 UTC (rev 5523)
+++ kde-extras/guidance/tags/0.7.1~svn20070204-1/debian/rules 2007-02-04 15:36:36 UTC (rev 5542)
@@ -5,8 +5,9 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
-#DEB_UPDATE_RCD_PARAMS := multiuser
+DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_kde-guidance := debian/displayconfig.1 debian/mountconfig.1 debian/serviceconfig.1 debian/userconfig.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/usr/share/python-support/kde-guidance
@@ -30,7 +31,7 @@
$(PYSUPPORT_PATH)/displayconfig-hwprobe.py
# move python modules in PYSUPPORT_PATH
- mv $(DEB_DESTDIR)/usr/lib/python2.4/site-packages/*.py $(PYSUPPORT_PATH)
+ mv $(DEB_DESTDIR)/usr/lib/python*/site-packages/*.py $(PYSUPPORT_PATH)
mv $(DEB_DESTDIR)/usr/share/apps/guidance/*.py $(PYSUPPORT_PATH)
# fix script-not-executable
@@ -57,12 +58,14 @@
(cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/mountconfig.py mountconfig)
(cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/serviceconfig.py serviceconfig)
(cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/userconfig.py userconfig)
- #(cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/wineconfig.py wineconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/wineconfig.py wineconfig)
install/kde-guidance-powermanager::
# install icon to right place
- install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
+ install -D -p -m0644 powermanager/icons/battery-charging-100.png \
$(DEB_DESTDIR)/usr/share/icons/hicolor/22x22/apps/power-manager.png
+ install -D -p -m0644 powermanager/icons/*.png \
+ $(DEB_DESTDIR)/usr/share/apps/guidance/pics/
# install desktop file
install -D -p -m0644 powermanager/guidance-power-manager.desktop \
@@ -82,7 +85,6 @@
chmod +x $(DEB_DESTDIR)/usr/bin/guidance-power-manager
# fix script-not-executable
- chmod 0755 $(PYSUPPORT_PATH)/guidance-power-manager.py
chmod 0755 $(PYSUPPORT_PATH)/powermanage.py
clean::
Modified: kde-extras/guidance/trunk/debian/changelog
===================================================================
--- kde-extras/guidance/trunk/debian/changelog 2007-02-04 12:29:23 UTC (rev 5541)
+++ kde-extras/guidance/trunk/debian/changelog 2007-02-04 15:36:36 UTC (rev 5542)
@@ -1,9 +1,25 @@
-kde-guidance (0.7.0-2) UNRELEASED; urgency=low
+kde-guidance (0.7.1~svn20070204-1) experimental; urgency=low
- * NOT RELEASED YET
+ [ 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
- -- Mark Purcell <msp at debian.org> Fri, 10 Nov 2006 20:33:24 +0000
+ -- Fathi Boudra <fboudra at free.fr> Sun, 4 Feb 2007 12:27:42 +0100
kde-guidance (0.7.0-1) unstable; urgency=low
Modified: kde-extras/guidance/trunk/debian/control
===================================================================
--- kde-extras/guidance/trunk/debian/control 2007-02-04 12:29:23 UTC (rev 5541)
+++ kde-extras/guidance/trunk/debian/control 2007-02-04 15:36:36 UTC (rev 5542)
@@ -4,16 +4,17 @@
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Fathi Boudra <fboudra at free.fr>, Mark Purcell <msp at debian.org>
Build-Depends: cdbs (>= 0.4.43), debhelper (>= 5.0.37.2), chrpath,
- kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxxf86vm-dev,
- pykdeextensions, pyqt-tools, python-kde3, python-kde3-dev, python-sip4-dev,
- python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
+ kdelibs4-dev, libpythonize0-dev, libtool, libxml2-utils, libxss-dev,
+ libxxf86vm-dev, pykdeextensions, pyqt-tools, python-kde3, python-kde3-dev,
+ python-sip4-dev, python-support (>= 0.3), python-all-dev (>= 2.3.5-11)
Standards-Version: 3.7.2
Package: kde-guidance
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- pykdeextensions, python-kde3, python-dbus, sysv-rc
+ pykdeextensions, python-kde3, sysv-rc
Provides: ${python:Provides}
+Conflicts: python2.4-iconvcodec
Description: collection of KDE system administration tools for GNU/Linux
Guidance currently consists of four programs designed to help you
look after your system:
@@ -30,9 +31,8 @@
Package: kde-guidance-powermanager
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-kde3, python-dbus, hal
+ kde-guidance, python-kde3, python-dbus, hal
Provides: ${python:Provides}
-Conflicts: klaptopdaemon, kpowersave
Description: HAL based power manager applet
A power management applet to indicate battery levels and perform hibernate or
suspend using HAL.
Modified: kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install 2007-02-04 12:29:23 UTC (rev 5541)
+++ kde-extras/guidance/trunk/debian/kde-guidance-powermanager.install 2007-02-04 15:36:36 UTC (rev 5542)
@@ -1,25 +1,7 @@
debian/tmp/usr/bin/guidance-power-manager
debian/tmp/usr/share/icons/hicolor/22x22/apps/power-manager.png
debian/tmp/usr/share/apps/guidance/pics/ac-adapter.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charged.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-000.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-020.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-040.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-060.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-080.png
-debian/tmp/usr/share/apps/guidance/pics/battery-charging-100.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-000.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-020.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-040.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-060.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-080.png
-debian/tmp/usr/share/apps/guidance/pics/battery-discharging-100.png
-debian/tmp/usr/share/apps/guidance/pics/energy.png
-debian/tmp/usr/share/apps/guidance/pics/keyboard-power-low.png
-debian/tmp/usr/share/apps/guidance/pics/mouse-power-low.png
-debian/tmp/usr/share/apps/guidance/pics/power-information.png
-debian/tmp/usr/share/apps/guidance/pics/power-manager-128.png
-debian/tmp/usr/share/apps/guidance/pics/power-manager-64.png
+debian/tmp/usr/share/apps/guidance/pics/battery-*.png
debian/tmp/usr/share/apps/guidance/pics/processor.png
debian/tmp/usr/share/autostart/guidance-power-manager.desktop
debian/tmp/usr/share/python-support/kde-guidance/guidance-power-manager.py
Modified: kde-extras/guidance/trunk/debian/kde-guidance.install
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.install 2007-02-04 12:29:23 UTC (rev 5541)
+++ kde-extras/guidance/trunk/debian/kde-guidance.install 2007-02-04 15:36:36 UTC (rev 5542)
@@ -13,7 +13,7 @@
debian/tmp/usr/lib/kde3/kcm_wineconfig.so.0.0.0
debian/tmp/usr/lib/kde3/kcm_wineconfig.la
debian/tmp/usr/lib/kde3/kcm_wineconfig.a
-debian/tmp/usr/lib/python2.4/site-packages/ixf86misc.so
+debian/tmp/usr/lib/python*/site-packages/ixf86misc.so
debian/tmp/usr/share/icons/crystalsvg/16x16/apps/daemons.png
debian/tmp/usr/share/icons/crystalsvg/16x16/apps/disksfilesystems.png
debian/tmp/usr/share/icons/crystalsvg/16x16/apps/userconfig.png
Modified: kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides
===================================================================
--- kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides 2007-02-04 12:29:23 UTC (rev 5541)
+++ kde-extras/guidance/trunk/debian/kde-guidance.lintian-overrides 2007-02-04 15:36:36 UTC (rev 5542)
@@ -1,4 +1,4 @@
# 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
+kde-guidance: package-has-a-duplicate-relation depends
Modified: kde-extras/guidance/trunk/debian/rules
===================================================================
--- kde-extras/guidance/trunk/debian/rules 2007-02-04 12:29:23 UTC (rev 5541)
+++ kde-extras/guidance/trunk/debian/rules 2007-02-04 15:36:36 UTC (rev 5542)
@@ -5,8 +5,9 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/utils.mk
-#DEB_UPDATE_RCD_PARAMS := multiuser
+DEB_UPDATE_RCD_PARAMS := multiuser
DEB_INSTALL_MANPAGES_kde-guidance := debian/displayconfig.1 debian/mountconfig.1 debian/serviceconfig.1 debian/userconfig.1
PYSUPPORT_PATH = $(DEB_DESTDIR)/usr/share/python-support/kde-guidance
@@ -30,7 +31,7 @@
$(PYSUPPORT_PATH)/displayconfig-hwprobe.py
# move python modules in PYSUPPORT_PATH
- mv $(DEB_DESTDIR)/usr/lib/python2.4/site-packages/*.py $(PYSUPPORT_PATH)
+ mv $(DEB_DESTDIR)/usr/lib/python*/site-packages/*.py $(PYSUPPORT_PATH)
mv $(DEB_DESTDIR)/usr/share/apps/guidance/*.py $(PYSUPPORT_PATH)
# fix script-not-executable
@@ -57,12 +58,14 @@
(cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/mountconfig.py mountconfig)
(cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/serviceconfig.py serviceconfig)
(cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/userconfig.py userconfig)
- #(cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/wineconfig.py wineconfig)
+ (cd debian/kde-guidance/usr/bin; ln -sf ../share/python-support/kde-guidance/wineconfig.py wineconfig)
install/kde-guidance-powermanager::
# install icon to right place
- install -D -p -m0644 kde/powermanager/pics/battery-charging-100.png \
+ install -D -p -m0644 powermanager/icons/battery-charging-100.png \
$(DEB_DESTDIR)/usr/share/icons/hicolor/22x22/apps/power-manager.png
+ install -D -p -m0644 powermanager/icons/*.png \
+ $(DEB_DESTDIR)/usr/share/apps/guidance/pics/
# install desktop file
install -D -p -m0644 powermanager/guidance-power-manager.desktop \
@@ -82,7 +85,6 @@
chmod +x $(DEB_DESTDIR)/usr/bin/guidance-power-manager
# fix script-not-executable
- chmod 0755 $(PYSUPPORT_PATH)/guidance-power-manager.py
chmod 0755 $(PYSUPPORT_PATH)/powermanage.py
clean::
More information about the pkg-kde-commits
mailing list