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

[Mark Purcell]

Author: msp
Date: 2006-11-23 22:22:42 +0100 (Thu, 23 Nov 2006)
New Revision: 4980

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/watch
Log:
* Conflicts: digikamimageplugins (<< 0.9.0~rc1)

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2006-11-23 10:43:40 UTC (rev 4979)
+++ kde-extras/digikam/trunk/debian/changelog	2006-11-23 21:22:42 UTC (rev 4980)
@@ -1,6 +1,5 @@
-digikam (1:0.9.0~rc1-1) UNRELEASED; urgency=low
+digikam (1:0.9.0~rc1-1) unstable; urgency=low
 
-  * NOT RELEASED YET
   * New upstream release
 
   [ Achim Bohnet ]
@@ -25,8 +24,11 @@
   * control: add XS-X-Vcs-Svn: header field pointing to pkg repository
     location
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 21 Nov 2006 17:44:48 +0100
+  [ Mark Purcell ]
+  * Conflicts: digikamimageplugins (<< 0.9.0~rc1)
 
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 23 Nov 2006 21:17:01 +0000
+
 digikam (1:0.9.0~beta3-3) unstable; urgency=low
 
   [ Mark Purcell ]

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2006-11-23 10:43:40 UTC (rev 4979)
+++ kde-extras/digikam/trunk/debian/control	2006-11-23 21:22:42 UTC (rev 4980)
@@ -12,7 +12,7 @@
 Depends: ${shlibs:Depends}, libgphoto2-2-dev
 Recommends: digikamimageplugins (>> 0.9), kipi-plugins, kdeprint, konqueror
 Suggests: digikam-doc
-Conflicts: digikamimageplugins (<< 0.8.0), kipi-plugins (<< 0.1+beta2-20), libdigikam0 (<< 0.8), libdigikam-dev (<< 0.8)
+Conflicts: digikamimageplugins (<< 0.9.0~rc1), kipi-plugins (<< 0.1+beta2-20), libdigikam0 (<< 0.8), libdigikam-dev (<< 0.8)
 Replaces: libdigikam0 (<< 0.8), libdigikam-dev (<< 0.8)
 Description: digital photo management application for KDE
  Digikam is an easy to use and powerful digital photo management

Modified: kde-extras/digikam/trunk/debian/watch
===================================================================
--- kde-extras/digikam/trunk/debian/watch	2006-11-23 10:43:40 UTC (rev 4979)
+++ kde-extras/digikam/trunk/debian/watch	2006-11-23 21:22:42 UTC (rev 4980)
@@ -4,5 +4,5 @@
 version=3
 
 opts=dversionmangle=s/~/-/ \
- http://sf.net/digikam/digikam-([\d].*)\.tar\.bz2 debian svn-upgrade
+ http://sf.net/digikam/digikam-([\d].[\d].[\d]-(rc|beta).*)\.tar\.bz2 debian svn-upgrade