rev 7898 - trunk/packages/kdebase/debian

[Ana Beatriz Guerrero López]

Author: ana
Date: 2007-11-15 01:28:48 +0000 (Thu, 15 Nov 2007)
New Revision: 7898

Modified:
   trunk/packages/kdebase/debian/control
   trunk/packages/kdebase/debian/control.in
Log:
sync control/.in


Modified: trunk/packages/kdebase/debian/control
===================================================================
--- trunk/packages/kdebase/debian/control	2007-11-15 01:14:00 UTC (rev 7897)
+++ trunk/packages/kdebase/debian/control	2007-11-15 01:28:48 UTC (rev 7898)
@@ -366,7 +366,7 @@
 Package: konqueror-nsplugins
 Section: utils
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, konqueror (= ${Source-Version})
 Replaces: konqueror (<< 4:3.0.0)
 Description: Netscape plugin support for Konqueror
  This package includes support for Netscape plugins in Konqueror.

Modified: trunk/packages/kdebase/debian/control.in
===================================================================
--- trunk/packages/kdebase/debian/control.in	2007-11-15 01:14:00 UTC (rev 7897)
+++ trunk/packages/kdebase/debian/control.in	2007-11-15 01:28:48 UTC (rev 7898)
@@ -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