rev 6136 - kde-extras/digikam/trunk/debian

[Mark Purcell]

Author: msp
Date: 2007-05-11 06:00:52 +0000 (Fri, 11 May 2007)
New Revision: 6136

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
Log:
* Conflicts: libkexiv2-0 - needed to ensure kipi-plugins et al are correct

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2007-05-11 05:36:34 UTC (rev 6135)
+++ kde-extras/digikam/trunk/debian/changelog	2007-05-11 06:00:52 UTC (rev 6136)
@@ -2,7 +2,6 @@
 
   * NOT RELEASED YET
 
-  [ Debian KDE Extras Team ]
   * New Upstream Release
 
   [ Mark Purcell ]
@@ -11,12 +10,10 @@
     - debian/patches/11-add-service-menu-translations.diff
     - debian/patches/12-kdesvn-r649833-fix-tile-cache.diff
   * Conflicts:/Replaces: digikamimageplugins - upstream has merged
+  * Conflicts: libkexiv2-0 - needed to ensure kipi-plugins et al are correct
 
-  * TODO:  digikam needs to conflict with kipi-plugins built with
-    incompatable version of libkexiv2
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 11 May 2007 07:00:21 +0100
 
- -- Mark Purcell <msp at debian.org>  Thu, 10 May 2007 08:38:14 +0100
-
 digikam (2:0.9.1-4) unstable; urgency=low
 
   [ Mark Purcell ]

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2007-05-11 05:36:34 UTC (rev 6135)
+++ kde-extras/digikam/trunk/debian/control	2007-05-11 06:00:52 UTC (rev 6136)
@@ -13,7 +13,7 @@
 Depends: ${shlibs:Depends}, kdebase-kio-plugins, libgphoto2-2-dev
 Recommends: kipi-plugins, kdeprint, konqueror
 Suggests: digikam-doc
-Conflicts: digikamimageplugins, kipi-plugins (<= 0.1.3~rc0)
+Conflicts: digikamimageplugins, kipi-plugins (<= 0.1.3~rc0), libkexiv2-0
 Replaces: digikamimageplugins
 Description: digital photo management application for KDE
  Digikam is an easy to use and powerful digital photo management