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

[Mark Purcell]

Author: msp
Date: 2010-06-06 22:08:14 +0000 (Sun, 06 Jun 2010)
New Revision: 18286

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
Log:
Added epoc: Fix "Incorrect Conflicts/Replaces versions" (Closes: #584792)

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2010-06-06 20:56:41 UTC (rev 18285)
+++ kde-extras/digikam/trunk/debian/changelog	2010-06-06 22:08:14 UTC (rev 18286)
@@ -1,3 +1,9 @@
+digikam (2:1.2.0-5) unstable; urgency=low
+
+  * Added epoc: Fix "Incorrect Conflicts/Replaces versions" (Closes: #584792)
+
+ -- Mark Purcell <msp at debian.org>  Mon, 07 Jun 2010 08:04:43 +1000
+
 digikam (2:1.2.0-4) unstable; urgency=low
 
   * Upload to unstable

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2010-06-06 20:56:41 UTC (rev 18285)
+++ kde-extras/digikam/trunk/debian/control	2010-06-06 22:08:14 UTC (rev 18286)
@@ -77,8 +77,8 @@
 Package: digikam-data
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: digikam (<= 1.2.0-3)
-Replaces: digikam (<= 1.2.0-3)
+Conflicts: digikam (<= 2:1.2.0-4)
+Replaces: digikam (<= 2:1.2.0-4)
 Description: digikam architecture-independant data
  Contains the significant amount of architecture-independent data that is
  shipped with digikam.