rev 10962 - branches/kde4/packages/kdeplasmoids/debian

[Modestas Vainius]

Author: modax-guest
Date: 2008-06-10 23:09:38 +0000 (Tue, 10 Jun 2008)
New Revision: 10962

Modified:
   branches/kde4/packages/kdeplasmoids/debian/changelog
   branches/kde4/packages/kdeplasmoids/debian/control
Log:
Conflicts/Replaces with extragear-plasma

Modified: branches/kde4/packages/kdeplasmoids/debian/changelog
===================================================================
--- branches/kde4/packages/kdeplasmoids/debian/changelog	2008-06-10 23:07:18 UTC (rev 10961)
+++ branches/kde4/packages/kdeplasmoids/debian/changelog	2008-06-10 23:09:38 UTC (rev 10962)
@@ -13,8 +13,9 @@
   * Update install files.
   * Add myself to Uploaders.
   * Bump build depends to 4.0.82.
+  * Add Conflicts/Replaces with extragear-plasma-(data).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 Jun 2008 01:40:13 +0300
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 Jun 2008 02:08:29 +0300
 
 extragear-plasma (4:4.0.80-1) experimental; urgency=low
 

Modified: branches/kde4/packages/kdeplasmoids/debian/control
===================================================================
--- branches/kde4/packages/kdeplasmoids/debian/control	2008-06-10 23:07:18 UTC (rev 10961)
+++ branches/kde4/packages/kdeplasmoids/debian/control	2008-06-10 23:09:38 UTC (rev 10962)
@@ -16,7 +16,8 @@
 Architecture: any
 Section: kde
 Depends: ${shlibs:Depends}, kdeplasmoids-data (= ${source:Version})
-Replaces: kdebase-workspace-bin (<< 4:4.0.0)
+Replaces: kdebase-workspace-bin (<< 4:4.0.0), extragear-plasma
+Conflicts: extragear-plasma
 Description: extras for the KDE 4 Plasma desktop and panel
  This package provides additional Plasma data engines and widgets found in the
  KDE Plasmoids collection.
@@ -24,6 +25,8 @@
 Package: kdeplasmoids-data
 Architecture: all
 Section: kde
+Replaces: extragear-plasma-data
+Conflicts: extragear-plasma-data
 Description: extras for the KDE 4 Plasma desktop and panel - data
  This package provides additional Plasma data engines and widgets found in the
  KDE Plasmoids collection.