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

[Steven Michael Robbins]

Author: smr
Date: 2016-01-02 19:31:21 +0000 (Sat, 02 Jan 2016)
New Revision: 20200

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/rules
Log:
Restore libkface support.

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2016-01-02 17:27:47 UTC (rev 20199)
+++ kde-extras/digikam/trunk/debian/changelog	2016-01-02 19:31:21 UTC (rev 20200)
@@ -1,3 +1,11 @@
+digikam (4:4.14.0-2) UNRELEASED; urgency=medium
+
+  * Restore kface support:
+    - Add libkface 15.08.3 sources as digikam_4.14.0.orig-libkface15083.tar.xz
+    - Create symlink extra/libkface and buid using DIGIKAMSC_COMPILE_LIBKFACE=ON
+
+ -- Steve M. Robbins <smr at debian.org>  Sat, 02 Jan 2016 13:22:55 -0600
+
 digikam (4:4.14.0-1) unstable; urgency=medium
 
   * New upstream release 4.14.0.  (Closes: #777110, #795956)

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2016-01-02 17:27:47 UTC (rev 20199)
+++ kde-extras/digikam/trunk/debian/control	2016-01-02 19:31:21 UTC (rev 20200)
@@ -34,8 +34,9 @@
  libx11-dev, libxrandr-dev, libexpat1-dev | libexpat-dev
 #
 # Missing optional build-deps:
-#   libkface -- only in experimental (2015-12-19)
 #   libkgeomap -- not packaged (2015-12-19)
+#   libmediawiki
+#   libkvkontatke
 #
 Build-Conflicts: libgraphicsmagick1-dev
 Standards-Version: 3.9.6

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2016-01-02 17:27:47 UTC (rev 20199)
+++ kde-extras/digikam/trunk/debian/rules	2016-01-02 19:31:21 UTC (rev 20200)
@@ -11,6 +11,7 @@
 	dh $@ --with kde --parallel 
 
 override_dh_auto_configure:
+	ln -s -n -f ../libkface15083 extra/libkface
 	dh_auto_configure --buildsystem=kde -- \
 	  -DCMAKE_INSTALL_RPATH="$(PRIVATE_LIBDIR)" \
 	  -DDIGIKAMSC_COMPILE_DOC=on \
@@ -18,7 +19,8 @@
 	  -DENABLE_LCMS2=ON \
 	  -DKDE4_BUILD_TESTS=OFF \
 	  -DENABLE_MYSQLSUPPORT=ON \
-	  -DENABLE_INTERNALMYSQL=ON
+	  -DENABLE_INTERNALMYSQL=ON \
+	  -DDIGIKAMSC_COMPILE_LIBKFACE=ON 
 
 override_dh_auto_install:
 	dh_auto_install