rev 13189 - branches/kde4.2/packages/kdelibs/debian

[Modestas Vainius]

Author: modax-guest
Date: 2009-01-07 07:43:08 +0000 (Wed, 07 Jan 2009)
New Revision: 13189

Modified:
   branches/kde4.2/packages/kdelibs/debian/changelog
   branches/kde4.2/packages/kdelibs/debian/control
Log:
Add conflicts/replace for libplasma-dev

Modified: branches/kde4.2/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-06 23:14:38 UTC (rev 13188)
+++ branches/kde4.2/packages/kdelibs/debian/changelog	2009-01-07 07:43:08 UTC (rev 13189)
@@ -32,8 +32,9 @@
     packages from kdebase-workspace.
     - libplasma3 - contains Plasma library and plugins. Make kdelibs5-dbg
       recommend it;
-    - add Plasma headers to kdelibs5-dev, make it provide libplasma-dev and
-      recommend libqt4-opengl-dev needed to build GLapplet stuff;
+    - add Plasma headers to kdelibs5-dev, make it provide libplasma-dev,
+      conflict and replace earlier libplasma-dev and recommend
+      libqt4-opengl-dev needed to build GLapplet stuff;
     - Bump plasma ABI to plasma-abi-4.2-6;
     - kdelibs5-data replaces kdebase-workspace-data and libplasma2 from KDE 4.1
   * Update install and installgen files.

Modified: branches/kde4.2/packages/kdelibs/debian/control
===================================================================
--- branches/kde4.2/packages/kdelibs/debian/control	2009-01-06 23:14:38 UTC (rev 13188)
+++ branches/kde4.2/packages/kdelibs/debian/control	2009-01-07 07:43:08 UTC (rev 13189)
@@ -51,7 +51,8 @@
 #Suggests: kdelibs5-doc (= ${source:Version})
 Recommends: ${sameVersionDep:libqt4-opengl-dev:libplasma3-Depends}
 Replaces: kdebase-runtime-data (<< 4:4.0.60), kdelibs5-data (<< 4:4.0.80-1)
-Conflicts: kdelibs4-dev, libkjsembed-dev, kdepimlibs5-dev (<< 4:4.1.81+svn891439)
+Conflicts: kdelibs4-dev, libkjsembed-dev, kdepimlibs5-dev (<< 4:4.1.81+svn891439), libplasma-dev (<< 4:4.1.96)
+Replaces: libplasma-dev (<< 4:4.1.96)
 Provides: libplasma-dev
 Description: development files for the KDE 4 core libraries
  This package contains development files for building KDE 4 applications and