rev 3936 - trunk/packages/kdelibs/debian

[Christopher Martin]

Author: chrsmrtn
Date: 2006-06-10 15:26:06 +0000 (Sat, 10 Jun 2006)
New Revision: 3936

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
Log:
kaffeine Replaces (thanks!)


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2006-06-10 14:32:07 UTC (rev 3935)
+++ trunk/packages/kdelibs/debian/changelog	2006-06-10 15:26:06 UTC (rev 3936)
@@ -2,9 +2,11 @@
 
   * Next upload.
 
-  * !!! Must include branch pull, and include kaffeine/kmplayer Replaces for
-    x-mplayer2.desktop. Also will include return value checks, which isn't
-    critical but would be nice to have.
+  * !!! Must include branch pull. Also will include return value checks,
+    which isn't critical but would be nice to have.
+  
+  * Add replaces for kaffeine (<< 0.8.1-3), since x-mplayer2.desktop is now in
+    kdelibs-data.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon,  5 Jun 2006 13:54:49 -0400
 

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2006-06-10 14:32:07 UTC (rev 3935)
+++ trunk/packages/kdelibs/debian/control	2006-06-10 15:26:06 UTC (rev 3936)
@@ -26,7 +26,7 @@
 Architecture: all
 Depends: hicolor-icon-theme
 Conflicts: kdelibs4
-Replaces: kdeartwork-style (<< 4:3.4.0), konq-plugins (<< 4:3.4.0), ksvg (<< 4:3.4.0), kpackage (<< 4:3.4.2), kicker (<< 4:3.5-rc1), kttsd (<< 4:3.5-rc1), kdevelop3-data (<< 4:3.3.0), libdjvulibre1, libdjvulibre15 (<< 3.5.16-2), krita (= 1:1.4.90.1-1), digikam (<< 0.8.1-3)
+Replaces: kdeartwork-style (<< 4:3.4.0), konq-plugins (<< 4:3.4.0), ksvg (<< 4:3.4.0), kpackage (<< 4:3.4.2), kicker (<< 4:3.5-rc1), kttsd (<< 4:3.5-rc1), kdevelop3-data (<< 4:3.3.0), libdjvulibre1, libdjvulibre15 (<< 3.5.16-2), krita (= 1:1.4.90.1-1), digikam (<< 0.8.1-3), kaffeine (<< 0.8.1-3)
 Description: core shared data for all KDE applications
  This package contains all the architecture independent data files
  commonly used by KDE applications. You need these data files to run