rev 11642 - trunk/packages/kdeutils/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2008-07-18 15:50:56 +0000 (Fri, 18 Jul 2008)
New Revision: 11642

Modified:
   trunk/packages/kdeutils/debian/control
   trunk/packages/kdeutils/debian/control.in
Log:
sync control* and update uploaders.


Modified: trunk/packages/kdeutils/debian/control
===================================================================
--- trunk/packages/kdeutils/debian/control	2008-07-18 15:48:00 UTC (rev 11641)
+++ trunk/packages/kdeutils/debian/control	2008-07-18 15:50:56 UTC (rev 11642)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fabo at debian.org>, Josh Metzler <joshdeb at metzlers.org>, Modestas Vainius <modestas at vainius.eu>, Sune Vuorela <debian at pusling.com>
+Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modestas at vainius.eu>, Pino Toscano <pino at kde.org>, Sune Vuorela <debian at pusling.com>
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), kdebase-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils-dev, pbbuttonsd-dev [powerpc], sharutils
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
 Standards-Version: 3.7.3

Modified: trunk/packages/kdeutils/debian/control.in
===================================================================
--- trunk/packages/kdeutils/debian/control.in	2008-07-18 15:48:00 UTC (rev 11641)
+++ trunk/packages/kdeutils/debian/control.in	2008-07-18 15:50:56 UTC (rev 11642)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: @@@MAINTAINER@@@
 Uploaders: @@@UPLOADERS@@@
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), kdebase-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 6), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.8), kdebase-dev (>= 4:3.5.8), libkonq4-dev (>= 4:3.5.8), libgmp3-dev, libsnmp-dev, libxpm-dev, python-dev, libxtst-dev, xutils-dev, pbbuttonsd-dev [powerpc], sharutils
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
 Standards-Version: 3.7.3
 Homepage: http://www.kde.org
@@ -13,7 +13,8 @@
 Package: kdeutils
 Section: kde
 Architecture: all
-Depends: ark (>= ${source:Version}), kcalc (>= ${source:Version}), kcharselect (>= ${source:Version}), kdelirc (>= ${source:Version}), kdessh (>= ${source:Version}), kdf (>= ${source:Version}), kedit (>= ${source:Version}), kfloppy (>= ${source:Version}), kgpg (>= ${source:Version}), khexedit (>= ${source:Version}), kjots (>= ${source:Version}), klaptopdaemon (>= ${source:Version}) | kpowersave, kmilo (>= ${source:Version}), kregexpeditor (>= ${source:Version}), ksim (>= ${source:Version}), ktimer (>= ${source:Version}), kwalletmanager (>= ${source:Version}), superkaramba (>= ${source:Version})
+Depends: ark (>= ${source:Version}), kcalc (>= ${source:Version}), kcharselect (>= ${source:Version}), kdelirc (>= ${source:Version}), kdessh (>= ${source:Version}), kdf (>= ${source:Version}), kedit (>= ${source:Version}), kfloppy (>= ${source:Version}), kgpg (>= ${source:Version}), khexedit (>= ${source:Version}), kjots (>= ${source:Version}), kmilo (>= ${source:Version}), kregexpeditor (>= ${source:Version}), ksim (>= ${source:Version}), ktimer (>= ${source:Version}), kwalletmanager (>= ${source:Version}), superkaramba (>= ${source:Version})
+Recommends: kpowersave
 Suggests: kdeutils-doc-html (>= ${source:Version})
 Description: general purpose utilities from the official KDE release
  KDE (the K Desktop Environment) is a powerful Open Source graphical
@@ -55,7 +56,7 @@
 Package: kdeutils-dev
 Section: utils
 Architecture: any
-Depends: ark (= ${binary:Version}), kcalc (= ${binary:Version}), kdelirc (= ${binary:Version}), kedit (= ${binary:Version}), khexedit (= ${binary:Version}), klaptopdaemon (= ${binary:Version}), kmilo (= ${binary:Version}), kregexpeditor (= ${binary:Version}), ksim (= ${binary:Version}), kdelibs4-dev (>= ${source:Upstream-Version})
+Depends: ark (= ${binary:Version}), kcalc (= ${binary:Version}), kdelirc (= ${binary:Version}), kedit (= ${binary:Version}), khexedit (= ${binary:Version}), kmilo (= ${binary:Version}), kregexpeditor (= ${binary:Version}), ksim (= ${binary:Version}), kdelibs4-dev (>= ${source:Upstream-Version})
 Description: development files for the KDE utilities module
  This package contains development files needed to compile kdeutils
  applications.
@@ -226,17 +227,23 @@
  See the 'kde' and 'kdeutils' packages for more information.
 
 Package: klaptopdaemon
-Section: kde
-Architecture: any
-Depends: ${shlibs:Depends}
-Recommends: kdebase-bin
-Suggests: khelpcenter
-Description: battery monitoring and management for laptops using KDE
- This package contains utilities to monitor batteries and configure
- power management, for laptops, from within KDE.
+Architecture: all
+Depends: kpowersave
+Description: battery monitoring for laptops using KDE - transitional package
+ kpowersave is a replacement for klaptopdaemon that works with kernels 2.6.25 or newer.
  .
- This package is part of KDE, as a component of the KDE utilities module.
- See the 'kde' and 'kdeutils' packages for more information.
+ This package can be purged at anytime once the kpowersave package has been installed.
+#Package: klaptopdaemon
+#Section: kde
+#Architecture: any
+#Depends: ${shlibs:Depends}
+#Suggests: khelpcenter
+#Description: battery monitoring and management for laptops using KDE
+# This package contains utilities to monitor batteries and configure
+# power management, for laptops, from within KDE.
+# .
+# This package is part of KDE, as a component of the KDE utilities module.
+# See the 'kde' and 'kdeutils' packages for more information.
 
 Package: kmilo
 Section: utils
@@ -309,7 +316,6 @@
 Depends: ${shlibs:Depends}
 Suggests: khelpcenter
 Conflicts: karamba
-Replaces: karamba
 Description: a program based on karamba improving the eyecandy of KDE
  SuperKaramba is a tool based on karamba that allows anyone to easily create
  and run little interactive widgets on a KDE desktop. Widgets are defined in a