[Pkg-kde-commits] rev 1556 - branches/kde-3.4.0/packages/kdelibs/debian

[Adeodato Simó]

Author: adeodato
Date: 2005-08-24 13:23:50 +0000 (Wed, 24 Aug 2005)
New Revision: 1556

Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/changelog
   branches/kde-3.4.0/packages/kdelibs/debian/control
Log:
Use KDE-Version for the kdelibs-data dependency in kdelibs4c2.


Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-08-24 13:21:42 UTC (rev 1555)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-08-24 13:23:50 UTC (rev 1556)
@@ -4,7 +4,7 @@
 
   * Improve the fix for #311958 to make kdelibs binNMUable again. Instead of
     having kdelibs4c2 depend on kdelibs-data (= ${Source-Version}), split that
-    in (>> 3.X.Y) plus (<< 3.X+1). XXX TODO
+    in (>> 3.X.Y) plus (<< 3.X+1).
 
     Since this fix can't be introduced in Sarge's kdelibs4, introduce (sigh) a
     conflicts in kdelibs-data against kdelibs4, which fortunately needs not be

Modified: branches/kde-3.4.0/packages/kdelibs/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/control	2005-08-24 13:21:42 UTC (rev 1555)
+++ branches/kde-3.4.0/packages/kdelibs/debian/control	2005-08-24 13:23:50 UTC (rev 1556)
@@ -54,7 +54,7 @@
 Package: kdelibs4c2
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, kdelibs-bin (= ${Source-Version}), kdelibs-data (>= ${Source-Version}), kdelibs-data (<< 4:3.4.90), xbase-clients
+Depends: ${shlibs:Depends}, kdelibs-bin (= ${Source-Version}), kdelibs-data (>> ${KDE-Version3}), kdelibs-data (<< ${KDE-Version2}.90), xbase-clients
 Conflicts: kdelibs4
 Replaces: kdelibs4, kdeartwork-style (<< 4:3.4.0)
 Description: core libraries for all KDE applications