rev 14233 - trunk/packages/kdelibs/debian

[Sune Vuorela]

Author: pusling-guest
Date: 2009-04-05 20:13:37 +0000 (Sun, 05 Apr 2009)
New Revision: 14233

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/control
Log:
Add conflicts&replaces on kjscmd (Closes: 520453)

Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2009-04-05 11:26:31 UTC (rev 14232)
+++ trunk/packages/kdelibs/debian/changelog	2009-04-05 20:13:37 UTC (rev 14233)
@@ -1,4 +1,4 @@
-kde4libs (4:4.2.2-0r5) unstable; urgency=low
+kde4libs (4:4.2.2-1) unstable; urgency=low
 
   * New upstream release.
 
@@ -10,6 +10,7 @@
   * Bump requirements of pkg-kde-tools to require the .kde edition.
   * Temporarily add a versioned dependency on pkg-kde-tools on kdelibs5-dev to
     be absolutely sure not having any accidents.
+  * Add conflicts&replaces on kjscmd (Closes: 520453)
 
   +++ Changes by Ana Beatriz Guerrero Lopez:
 

Modified: trunk/packages/kdelibs/debian/control
===================================================================
--- trunk/packages/kdelibs/debian/control	2009-04-05 11:26:31 UTC (rev 14232)
+++ trunk/packages/kdelibs/debian/control	2009-04-05 20:13:37 UTC (rev 14233)
@@ -37,7 +37,8 @@
 Package: kdelibs5-data
 Architecture: all
 Depends: hicolor-icon-theme
-Replaces: kdebase-workspace-data (<< 4:4.1.66), libplasma2
+Replaces: kdebase-workspace-data (<< 4:4.1.66), libplasma2, kjscmd (<< 4:3.5.10-1)
+Conflicts: kjscmd (<< 4:3.5.10-1)
 Description: core shared data for all KDE 4 applications
  This package contains architecture-independent data files needed to run KDE 4
  applications.