rev 7891 - trunk/packages/kdebase/debian

[Armin Berres]

Author: trigger-guest
Date: 2007-11-14 22:00:42 +0000 (Wed, 14 Nov 2007)
New Revision: 7891

Added:
   trunk/packages/kdebase/debian/kdebase-bin-kde3.install
Modified:
   trunk/packages/kdebase/debian/changelog
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/kdebase-bin.install
Log:
* Split off kdebase-bin-kde3 which contains executables which can be provided by KDE3 or KDE4.


Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2007-11-14 21:58:57 UTC (rev 7890)
+++ trunk/packages/kdebase/debian/changelog	2007-11-14 22:00:42 UTC (rev 7891)
@@ -2,12 +2,17 @@
 
   +++ Changes by Fathi Boudra:
 
-  * Remove /usr/bin/X11 to the KDM's default session path. (Closes: 441392)
+  * Remove /usr/bin/X11 from KDM's default session path. (Closes: 441392)
   * Add support for ConsoleKit. Thanks to Michael Biebl, William Jon McCann and
     Kevin Kofler. (Closes: #450603)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 10 Nov 2007 11:53:23 +0100
+  +++ Changes by Armin Berres:
 
+  * Split off kdebase-bin-kde3 which contains executables which can be provided by
+    KDE3 or KDE4.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 14 Nov 2007 22:59:58 +0100
+
 kdebase (4:3.5.8.dfsg.1-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2007-11-14 21:58:57 UTC (rev 7890)
+++ trunk/packages/kdebase/debian/control	2007-11-14 22:00:42 UTC (rev 7891)
@@ -93,7 +93,7 @@
 Package: kdebase-bin
 Section: kde
 Architecture: any
-Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14)
+Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14), kdebase-bin-kde3 | kdebase-runtime-bin-kde4
 Suggests: khelpcenter, gdb
 Conflicts: kdebase-libs (<< 4:3.0.0), kdm (<< 4:3.4.1-2)
 Replaces: kcontrol (<< 4:3.3.0), kdebase (<< 4:3.0.0), kdebase-doc (<< 4:3.0.0), kdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), kdm (= 4:3.3.2-1b)
@@ -104,6 +104,20 @@
  This package is part of KDE, and a component of the KDE base module.
  See the 'kde' and 'kdebase' packages for more information.
 
+Package: kdebase-bin-kde3
+Section: kde
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: kdebase-bin (<< 4:3.5.8.dfsg.1-2)
+Conflicts: kdebase-runtime-bin-kde4
+Description: core binaries for the KDE base module
+ This package contains miscellaneous programs needed by other
+ KDE applications, particularly those in the KDE base module. They can
+ be provided by KDE3 or KDE4. This package provides the KDE3 versions.
+ .
+ This package is part of KDE, and a component of the KDE base module.
+ See the 'kde' and 'kdebase' packages for more information.
+
 Package: kdebase-data
 Section: kde
 Architecture: all

Added: trunk/packages/kdebase/debian/kdebase-bin-kde3.install
===================================================================
--- trunk/packages/kdebase/debian/kdebase-bin-kde3.install	                        (rev 0)
+++ trunk/packages/kdebase/debian/kdebase-bin-kde3.install	2007-11-14 22:00:42 UTC (rev 7891)
@@ -0,0 +1,4 @@
+debian/tmp/usr/bin/kdebugdialog
+debian/tmp/usr/bin/kreadconfig
+debian/tmp/usr/bin/kwriteconfig
+debian/tmp/usr/bin/kstart

Modified: trunk/packages/kdebase/debian/kdebase-bin.install
===================================================================
--- trunk/packages/kdebase/debian/kdebase-bin.install	2007-11-14 21:58:57 UTC (rev 7890)
+++ trunk/packages/kdebase/debian/kdebase-bin.install	2007-11-14 22:00:42 UTC (rev 7891)
@@ -6,7 +6,6 @@
 debian/tmp/usr/bin/kcminit
 debian/tmp/usr/bin/kcminit_startup
 debian/tmp/usr/bin/kdcop
-debian/tmp/usr/bin/kdebugdialog
 debian/tmp/usr/bin/kdesu
 debian/tmp/usr/bin/kdesud
 debian/tmp/usr/bin/kdialog
@@ -14,10 +13,7 @@
 debian/tmp/usr/bin/kio_system_documenthelper
 debian/tmp/usr/bin/knetattach
 debian/tmp/usr/bin/krandom.kss
-debian/tmp/usr/bin/kreadconfig
-debian/tmp/usr/bin/kstart
 debian/tmp/usr/bin/ksystraycmd
-debian/tmp/usr/bin/kwriteconfig
 debian/tmp/usr/bin/kxkb
 debian/tmp/usr/lib/kconf_update_bin/khotkeys_update
 debian/tmp/usr/lib/kde3/kcminit.la