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

[Mark Purcell]

Author: msp
Date: 2007-05-17 17:30:28 +0000 (Thu, 17 May 2007)
New Revision: 6261

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
Log:
* Conflicts: libexiv2-0.12 - breaks kipi-plugins

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2007-05-17 16:59:37 UTC (rev 6260)
+++ kde-extras/digikam/trunk/debian/changelog	2007-05-17 17:30:28 UTC (rev 6261)
@@ -1,7 +1,5 @@
-digikam (2:0.9.2~beta1-2) UNRELEASED; urgency=low
+digikam (2:0.9.2~beta1-2) unstable; urgency=low
 
-  * NOT RELEASED YET
-
   [ Achim Bohnet ]
   * new upstream release:
     + Closes: #424506: digikam - FTBFS:  error: request for member 'c_str' in
@@ -10,8 +8,11 @@
     Closes: #424619: digikam_2:0.9.2~beta1-1(hppa/experimental): FTBFS: libkdcraw
     missing
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 16 May 2007 10:45:44 +0200
+  [ Mark Purcell ]
+  * Conflicts: libexiv2-0.12 - breaks kipi-plugins
 
+ -- Mark Purcell <msp at debian.org>  Thu, 17 May 2007 18:10:25 +0100
+
 digikam (2:0.9.2~beta1-1) experimental; urgency=low
 
   * New Upstream Release

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2007-05-17 16:59:37 UTC (rev 6260)
+++ kde-extras/digikam/trunk/debian/control	2007-05-17 17:30:28 UTC (rev 6261)
@@ -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), libkexiv2-0
+Conflicts: digikamimageplugins, kipi-plugins (<= 0.1.3~rc0), libkexiv2-0, libexiv2-0.12
 Replaces: digikamimageplugins
 Description: digital photo management application for KDE
  Digikam is an easy to use and powerful digital photo management