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

[Mark Purcell]

Author: msp
Date: 2007-05-11 06:02:58 +0000 (Fri, 11 May 2007)
New Revision: 6137

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
Log:
* Ensure kipi-plugins et al are correct versions/ correct libraries
  - Conflicts: libkexiv2-0 
  - Build-Depends: libkexiv2-dev (>= 0.1.5)

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2007-05-11 06:00:52 UTC (rev 6136)
+++ kde-extras/digikam/trunk/debian/changelog	2007-05-11 06:02:58 UTC (rev 6137)
@@ -1,7 +1,5 @@
 digikam (2:0.9.2~beta1-1) experimental; urgency=low
 
-  * NOT RELEASED YET
-
   * New Upstream Release
 
   [ Mark Purcell ]
@@ -10,7 +8,9 @@
     - debian/patches/11-add-service-menu-translations.diff
     - debian/patches/12-kdesvn-r649833-fix-tile-cache.diff
   * Conflicts:/Replaces: digikamimageplugins - upstream has merged
-  * Conflicts: libkexiv2-0 - needed to ensure kipi-plugins et al are correct
+  * Ensure kipi-plugins et al are correct versions/ correct libraries
+    - Conflicts: libkexiv2-0 
+    - Build-Depends: libkexiv2-dev (>= 0.1.5)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 11 May 2007 07:00:21 +0100
 

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2007-05-11 06:00:52 UTC (rev 6136)
+++ kde-extras/digikam/trunk/debian/control	2007-05-11 06:02:58 UTC (rev 6137)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Achim Bohnet <ach at mpe.mpg.de>, Mark Purcell <msp at debian.org>, Paul Telford <pxt at debian.org>
-Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-dev (>= 4:3.5.1-3), libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libkipi0-dev, automake1.9, libsqlite3-dev, libexiv2-dev (>= 0.12), liblcms1-dev, libltdl3-dev, libkexiv2-dev, libjasper-dev, libpng12-dev | libpng-dev
+Build-Depends: debhelper (>> 4.1), cdbs, kdelibs4-dev (>= 4:3.5.1-3), libexif-dev (>> 0.6.9), libtiff4-dev, libgphoto2-2-dev, libkipi0-dev, automake1.9, libsqlite3-dev, liblcms1-dev, libltdl3-dev, libkexiv2-dev (>= 0.1.5), libjasper-dev, libpng12-dev | libpng-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/digikam/trunk/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/digikam/trunk/