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

[Mark Purcell]

Author: msp
Date: 2012-10-27 01:09:03 +0000 (Sat, 27 Oct 2012)
New Revision: 19322

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
Log:
* New upstream release
* Fix "fails upgrade from 'sid'" Added necessary Conflicts (Closes: #689396)

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2012-10-15 19:18:37 UTC (rev 19321)
+++ kde-extras/digikam/trunk/debian/changelog	2012-10-27 01:09:03 UTC (rev 19322)
@@ -1,3 +1,10 @@
+digikam (4:3.0.0~beta2-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Fix "fails upgrade from 'sid'" Added necessary Conflicts (Closes: #689396)
+
+ -- Mark Purcell <msp at debian.org>  Tue, 16 Oct 2012 06:19:06 +1100
+
 digikam (4:3.0.0~beta1a-1) experimental; urgency=low
 
   * New upstream release

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2012-10-15 19:18:37 UTC (rev 19321)
+++ kde-extras/digikam/trunk/debian/control	2012-10-27 01:09:03 UTC (rev 19322)
@@ -118,6 +118,7 @@
 Package: digikam-data
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libkipi8, libkipi-data, libkipi-dev, libkexiv2-10, libkexiv2-data, libkdcraw20, libkdcraw-data, libksane0, libksane-dev
 Description: digiKam architecture-independant data
  Contains the significant amount of architecture-independent data that is
  shipped with digiKam.
@@ -201,6 +202,7 @@
 Depends: ${misc:Depends}
 Breaks: digikam (<< 4:2.3.0-2~)
 Replaces: digikam (<< 4:2.3.0-2~)
+Conflicts: libkipi8, libkipi-data, libkipi-dev, libkexiv2-10, libkexiv2-data, libkdcraw20, libkdcraw-data, libksane0, libksane-dev
 Description: kipi-plugins architecture-independent data
  KIPI plugins (KDE Image Plugin Interface) is an effort to develop a
  common plugin structure for digiKam, KPhotoAlbum (formerly known as