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

[Steven Michael Robbins]

Author: smr
Date: 2015-12-20 17:15:24 +0000 (Sun, 20 Dec 2015)
New Revision: 20186

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/digikam-data.install
   kde-extras/digikam/trunk/debian/kipi-plugins-common.install
   kde-extras/digikam/trunk/debian/kipi-plugins.install
   kde-extras/digikam/trunk/debian/rules
Log:
Tweak configuration for new upstream 4.14.0.

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2015-12-20 16:17:39 UTC (rev 20185)
+++ kde-extras/digikam/trunk/debian/changelog	2015-12-20 17:15:24 UTC (rev 20186)
@@ -1,3 +1,12 @@
+digikam (4:4.14.0-1) unstable; urgency=medium
+
+  * New upstream release 4.14.0.  (Closes: #777110, #795956)
+    - missing support for features split out of previous digikam;
+      e.g. libkface, libkgeomap, and some others.
+    - fixes build/install failures (Closes: #807564, #802966, #799546, #800362)
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 19 Dec 2015 23:10:26 -0600
+
 digikam (4:4.12.0-1~) UNRELEASED; urgency=medium
 
   [ Mark Purcell ]

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2015-12-20 16:17:39 UTC (rev 20185)
+++ kde-extras/digikam/trunk/debian/control	2015-12-20 17:15:24 UTC (rev 20186)
@@ -2,8 +2,8 @@
 Section: graphics
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>, Pino Toscano <pino at debian.org>
-Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.9), pkg-config, cmake (>= 2.6.2),
+Uploaders: Mark Purcell <msp at debian.org>, Fathi Boudra <fabo at debian.org>, Pino Toscano <pino at debian.org>, Steve M. Robbins <smr at debian.org>
+Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.9), pkg-config, cmake (>= 2.8.0),
  doxygen,
  kdelibs5-dev, kdepimlibs5-dev,
  libmarble-dev,
@@ -32,10 +32,11 @@
  flex, bison, libeigen3-dev (>= 3.1.2),
  libboost-graph-dev,
  libx11-dev, libxrandr-dev, libexpat1-dev | libexpat-dev
-# for libksane:
-# libsane-dev,
-# for libkexiv2:
-# libexiv2-dev,
+#
+# Missing optional build-deps:
+#   libkface -- only in experimental (2015-12-19)
+#   libkgeomap -- not packaged (2015-12-19)
+#
 Build-Conflicts: libgraphicsmagick1-dev
 Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-kde/kde-extras/digikam/trunk

Modified: kde-extras/digikam/trunk/debian/digikam-data.install
===================================================================
--- kde-extras/digikam/trunk/debian/digikam-data.install	2015-12-20 16:17:39 UTC (rev 20185)
+++ kde-extras/digikam/trunk/debian/digikam-data.install	2015-12-20 17:15:24 UTC (rev 20186)
@@ -4,4 +4,4 @@
 usr/share/kde4/services/digikam*
 usr/share/kde4/servicetypes/digikamimageplugin.desktop
 usr/share/locale/*/LC_MESSAGES/digikam.mo
-usr/share/locale/*/LC_MESSAGES/libkgeomap.mo
+

Modified: kde-extras/digikam/trunk/debian/kipi-plugins-common.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins-common.install	2015-12-20 16:17:39 UTC (rev 20185)
+++ kde-extras/digikam/trunk/debian/kipi-plugins-common.install	2015-12-20 17:15:24 UTC (rev 20186)
@@ -3,7 +3,7 @@
 usr/share/icons/hicolor/*/apps/kipi*
 #usr/share/icons/hicolor/*/apps/dng*
 usr/share/icons/hicolor/*/apps/photo*
-usr/share/kde4/apps/gpssync/
+#usr/share/kde4/apps/gpssync/
 usr/share/kde4/apps/kipi/kipiplugin*.rc
 usr/share/kde4/apps/kipi/tips
 usr/share/kde4/apps/kipiplugin_*

Modified: kde-extras/digikam/trunk/debian/kipi-plugins.install
===================================================================
--- kde-extras/digikam/trunk/debian/kipi-plugins.install	2015-12-20 16:17:39 UTC (rev 20185)
+++ kde-extras/digikam/trunk/debian/kipi-plugins.install	2015-12-20 17:15:24 UTC (rev 20186)
@@ -1,5 +1,4 @@
 usr/bin/dngconverter
-usr/bin/dnginfo
 usr/bin/expoblending
 usr/bin/panoramagui
 usr/bin/photolayoutseditor

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2015-12-20 16:17:39 UTC (rev 20185)
+++ kde-extras/digikam/trunk/debian/rules	2015-12-20 17:15:24 UTC (rev 20186)
@@ -22,22 +22,24 @@
 	  -DDIGIKAMSC_COMPILE_PO=on \
 	  -DENABLE_LCMS2=ON \
 	  -DKDE4_BUILD_TESTS=OFF \
+	  -DENABLE_MYSQLSUPPORT=ON \
+	  -DENABLE_INTERNALMYSQL=ON \
 	  $(EXTRA_CMAKE_ARGS)
 
 override_dh_auto_install:
 	dh_auto_install
 	# remove development stuff: headers, cmake config files, pkg-config files, .so symlinks, static libs
-	rm -r --verbose debian/tmp/usr/include
-	rm -r --verbose debian/tmp/usr/share/kde4/apps/cmake
-	rm -r --verbose debian/tmp/usr/lib/cmake
-	rm -r --verbose debian/tmp/usr/lib/pkgconfig
+	rm -rf --verbose debian/tmp/usr/include
+	rm -rf --verbose debian/tmp/usr/share/kde4/apps/cmake
+	rm -rf --verbose debian/tmp/usr/lib/cmake
+	rm -rf --verbose debian/tmp/usr/lib/pkgconfig
 	find debian/tmp/usr/lib -type l -name '*.so' -exec rm --verbose {} \;
 	# remove potentially conflicting oxygen icons in global icon theme
-	rm -r --verbose debian/tmp/usr/share/icons/oxygen
+	rm -rf --verbose debian/tmp/usr/share/icons/oxygen
 	# remove libkipi translations, provided by kde-l10n-*
-	rm -r --verbose debian/tmp/usr/share/locale/*/LC_MESSAGES/libkipi.mo
+	rm -rf --verbose debian/tmp/usr/share/locale/*/LC_MESSAGES/libkipi.mo
 	# remove haar cascades, the versions in opencv-data will be used instead
-	rm -r --verbose debian/tmp/usr/share/kde4/apps/libkface/haarcascades
+	rm -rf --verbose debian/tmp/usr/share/kde4/apps/libkface/haarcascades
 
 override_dh_installchangelogs:
 	dh_installchangelogs -pdigikam core/ChangeLog