rev 6125 - in kde-extras/digikam/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2007-05-10 20:20:34 +0000 (Thu, 10 May 2007)
New Revision: 6125

Removed:
   kde-extras/digikam/trunk/debian/patches/10-gcc43-fix.diff
   kde-extras/digikam/trunk/debian/patches/11-add-service-menu-translations.diff
   kde-extras/digikam/trunk/debian/patches/12-kdesvn-r649833-fix-tile-cache.diff
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
Log:
* New Upstream Release
* Patches deleted as encorporated upstream:
  - debian/patches/10-gcc43-fix.diff
  - debian/patches/11-add-service-menu-translations.diff
  - debian/patches/12-kdesvn-r649833-fix-tile-cache.diff
* Conflicts:/Replaces: digikamimageplugins - upstream has merged
* TODO:  digikam needs to conflict with kipi-plugins built with
  incompatable version of libkexiv2

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2007-05-10 17:39:45 UTC (rev 6124)
+++ kde-extras/digikam/trunk/debian/changelog	2007-05-10 20:20:34 UTC (rev 6125)
@@ -1,9 +1,22 @@
-digikam (2:0.9.1-5) UNRELEASED; urgency=low
+digikam (2:0.9.2~beta1-1) experimental; urgency=low
 
   * NOT RELEASED YET
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Wed, 09 May 2007 21:44:03 +0100
+  [ Debian KDE Extras Team ]
+  * New Upstream Release
 
+  [ Mark Purcell ]
+  * Patches deleted as encorporated upstream:
+    - debian/patches/10-gcc43-fix.diff
+    - debian/patches/11-add-service-menu-translations.diff
+    - debian/patches/12-kdesvn-r649833-fix-tile-cache.diff
+  * Conflicts:/Replaces: digikamimageplugins - upstream has merged
+
+  * TODO:  digikam needs to conflict with kipi-plugins built with
+    incompatable version of libkexiv2
+
+ -- Mark Purcell <msp at debian.org>  Thu, 10 May 2007 08:38:14 +0100
+
 digikam (2:0.9.1-4) unstable; urgency=low
 
   [ Mark Purcell ]

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2007-05-10 17:39:45 UTC (rev 6124)
+++ kde-extras/digikam/trunk/debian/control	2007-05-10 20:20:34 UTC (rev 6125)
@@ -11,9 +11,10 @@
 Package: digikam
 Architecture: any
 Depends: ${shlibs:Depends}, kdebase-kio-plugins, libgphoto2-2-dev
-Recommends: digikamimageplugins (>= 2:0.9.1~rc2), kipi-plugins, kdeprint, konqueror
+Recommends: kipi-plugins, kdeprint, konqueror
 Suggests: digikam-doc
-Conflicts: digikamimageplugins (<< 2:0.9.0~rc2), kipi-plugins (<= 0.1.3~rc0)
+Conflicts: digikamimageplugins, kipi-plugins (<= 0.1.3~rc0)
+Replaces: digikamimageplugins
 Description: digital photo management application for KDE
  Digikam is an easy to use and powerful digital photo management
  application, which makes importing, organizing and manipulating,

Deleted: kde-extras/digikam/trunk/debian/patches/10-gcc43-fix.diff

Deleted: kde-extras/digikam/trunk/debian/patches/11-add-service-menu-translations.diff

Deleted: kde-extras/digikam/trunk/debian/patches/12-kdesvn-r649833-fix-tile-cache.diff