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

[Mark Purcell]

Author: msp
Date: 2012-12-30 05:17:32 +0000 (Sun, 30 Dec 2012)
New Revision: 19375

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/digikam.install
   kde-extras/digikam/trunk/debian/rules
Log:
* Add Build-Depends: libqtgstreamer-dev, imagemagick, libmagickcore-dev
* override auto build tests requiring user interaction
* libhupnp-dev plugin requires work

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2012-12-29 23:09:10 UTC (rev 19374)
+++ kde-extras/digikam/trunk/debian/changelog	2012-12-30 05:17:32 UTC (rev 19375)
@@ -3,7 +3,9 @@
   * New upstream release
 
   * Fix "fails upgrade from 'sid'" Added necessary Conflicts (Closes: #689396)
-  * Add Build-Depends: libqtgstreamer-dev, libmagickcore-dev, libhupnp-dev
+  * Add Build-Depends: libqtgstreamer-dev, imagemagick, libmagickcore-dev
+  * override auto build tests requiring user interaction
+  * libhupnp-dev plugin requires work
 
  -- Mark Purcell <msp at debian.org>  Sun, 30 Dec 2012 10:00:02 +1100
 

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2012-12-29 23:09:10 UTC (rev 19374)
+++ kde-extras/digikam/trunk/debian/control	2012-12-30 05:17:32 UTC (rev 19375)
@@ -7,10 +7,13 @@
  doxygen,
  kdelibs5-dev (>= 4:4.7), kdepimlibs5-dev (>= 4:4.7),
  libmarble-dev (>= 4:4.7),
+# features from kdegraphics >=4.10 (not yet in Debian) hence private libs utilised, not Debian way :-(
 # libkipi-dev (>= 4:4.7), libkexiv2-dev (>= 4:4.7), libkdcraw-dev (>= 4:4.7), libksane-dev (>= 4:4.7),
  libqt4-dev, libqt4-opengl-dev, libgl1-mesa-dev, libglu1-mesa-dev,
  libqtwebkit-dev, libqtgstreamer-dev,
- libgphoto2-2-dev, libmagickcore-dev,
+ libgphoto2-2-dev,
+ libmagickcore-dev, imagemagick,
+# plugins not yet discovered by digikam
 # libhupnp-dev,
  libgtk2.0-dev,
  libxslt1-dev | libxslt-dev, libxml2-dev,

Modified: kde-extras/digikam/trunk/debian/digikam.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam.install	2012-12-29 23:09:10 UTC (rev 19374)
+++ kde-extras/digikam/trunk/debian/digikam.install	2012-12-30 05:17:32 UTC (rev 19375)
@@ -22,6 +22,7 @@
 usr/share/kde4/apps/kconf_update/
 usr/lib/libksane*
 usr/lib/libkexiv2*
-usr/lib/libHUpnp*
 usr/lib/libkdc*
-usr/lib/libQt*
+# plugins not yet building
+#usr/lib/libHUpnp*
+#usr/lib/libQt*

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2012-12-29 23:09:10 UTC (rev 19374)
+++ kde-extras/digikam/trunk/debian/rules	2012-12-30 05:17:32 UTC (rev 19375)
@@ -19,3 +19,7 @@
 
 #override_dh_strip:
 #	dh_strip -a --dbg-package=digikam-dbg
+
+# auto tests require user interaction - override
+override_dh_auto_test:
+