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

[Mark Purcell]

Author: msp
Date: 2011-07-02 12:55:39 +0000 (Sat, 02 Jul 2011)
New Revision: 18910

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/digikam-data.install
Log:
TODO: Resolve conficts with existing packages: libkexiv2 kipi-plugins

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2011-07-02 09:48:43 UTC (rev 18909)
+++ kde-extras/digikam/trunk/debian/changelog	2011-07-02 12:55:39 UTC (rev 18910)
@@ -4,8 +4,10 @@
     - Upload beta/rc to experimental
   * Add Build-Depends: libboost-graph-dev, libcv-dev
 
- -- Mark Purcell <msp at debian.org>  Sat, 02 Jul 2011 19:42:36 +1000
+  * TODO: Resolve conficts with existing packages: libkexiv2 kipi-plugins
 
+ -- Mark Purcell <msp at debian.org>  Sat, 02 Jul 2011 22:55:18 +1000
+
 digikam (2:1.9.0-3) unstable; urgency=low
 
   * Upload to unstable

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2011-07-02 09:48:43 UTC (rev 18909)
+++ kde-extras/digikam/trunk/debian/control	2011-07-02 12:55:39 UTC (rev 18910)
@@ -11,7 +11,7 @@
  libglib2.0-dev, libgphoto2-2-dev (>= 2.4),
  libkipi-dev, libkexiv2-dev (>= 4:4.5), libkdcraw-dev (>= 4:4.5), libmarble-dev (>= 4:4.5),
  liblcms1-dev, libtiff4-dev, libpng12-dev, liblqr-1-0-dev,
- libcv-dev,
+ libcv-dev (>= 2.2), libcvaux-dev (>= 2.2), libopencv-contrib-dev (>= 2.2), libopencv-gpu-dev (>= 2.2),
  libjasper-dev,
  liblensfun-dev,
  libsqlite3-dev,

Modified: kde-extras/digikam/trunk/debian/digikam-data.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-data.install	2011-07-02 09:48:43 UTC (rev 18909)
+++ kde-extras/digikam/trunk/debian/digikam-data.install	2011-07-02 12:55:39 UTC (rev 18910)
@@ -2,4 +2,3 @@
 usr/share/kde4/apps/solid
 usr/share/kde4/services
 usr/share/kde4/servicetypes
-usr/share/locale