rev 6126 - kde-extras/digikam-doc/trunk/debian

[Mark Purcell]

Author: msp
Date: 2007-05-10 20:21:09 +0000 (Thu, 10 May 2007)
New Revision: 6126

Modified:
   kde-extras/digikam-doc/trunk/debian/changelog
   kde-extras/digikam-doc/trunk/debian/control
Log:
* New Upstream Release
* Conflict:/ Replaces: digikamimageplugins-doc, upstream merged

Modified: kde-extras/digikam-doc/trunk/debian/changelog
===================================================================
--- kde-extras/digikam-doc/trunk/debian/changelog	2007-05-10 20:20:34 UTC (rev 6125)
+++ kde-extras/digikam-doc/trunk/debian/changelog	2007-05-10 20:21:09 UTC (rev 6126)
@@ -1,9 +1,12 @@
-digikam-doc (0.9.1-2) UNRELEASED; urgency=low
+digikam-doc (0.9.2~beta1-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 01 Apr 2007 22:27:48 +0100
+  * New Upstream Release
+  * Conflict:/ Replaces: digikamimageplugins-doc, upstream merged
 
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 10 May 2007 08:42:17 +0100
+
 digikam-doc (0.9.1-1) unstable; urgency=low
 
   * New upstream release

Modified: kde-extras/digikam-doc/trunk/debian/control
===================================================================
--- kde-extras/digikam-doc/trunk/debian/control	2007-05-10 20:20:34 UTC (rev 6125)
+++ kde-extras/digikam-doc/trunk/debian/control	2007-05-10 20:21:09 UTC (rev 6126)
@@ -10,7 +10,8 @@
 Architecture: all
 Depends: khelpcenter
 Recommends: digikam
-Replaces: digikam (<< 0.7.4)
+Conflicts: digikamimageplugins-doc
+Replaces: digikamimageplugins-doc
 Description: handbook for digikam and showfoto in several languages
  Digikam is an easy to use and powerful digital photo management
  application.