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

[Pino Toscano]

Author: pino
Date: 2014-01-17 23:23:22 +0000 (Fri, 17 Jan 2014)
New Revision: 19827

Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/rules
Log:
use the haar cascades XML files provided by OpenCV

- remove the versions provided by libkface
- make digikam-data depend on opencv-data


Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2014-01-17 22:45:37 UTC (rev 19826)
+++ kde-extras/digikam/trunk/debian/changelog	2014-01-17 23:23:22 UTC (rev 19827)
@@ -21,6 +21,9 @@
     icons.
   * Drop patch changeset_rc53994f0dbeea49a04aeec9298753a954cff427f.diff,
     backported from upstream.
+  * Use the haar cascades XML files provided by OpenCV:
+    - remove the versions provided by libkface
+    - make digikam-data depend on opencv-data
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 15 Dec 2013 14:41:10 +0100
 

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2014-01-17 22:45:37 UTC (rev 19826)
+++ kde-extras/digikam/trunk/debian/control	2014-01-17 23:23:22 UTC (rev 19827)
@@ -139,7 +139,7 @@
 
 Package: digikam-data
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, opencv-data
 Breaks: kipi-plugins-common (<< 4:3.1.0-2~)
 Replaces: kipi-plugins-common (<< 4:3.1.0-2~)
 Conflicts: ${digikam:Conflicts}

Modified: kde-extras/digikam/trunk/debian/rules
===================================================================
--- kde-extras/digikam/trunk/debian/rules	2014-01-17 22:45:37 UTC (rev 19826)
+++ kde-extras/digikam/trunk/debian/rules	2014-01-17 23:23:22 UTC (rev 19827)
@@ -36,6 +36,8 @@
 	rm -r --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
+	# remove haar cascades, the versions in opencv-data will be used instead
+	rm -r --verbose debian/tmp/usr/share/kde4/apps/libkface/haarcascades
 
 override_dh_installchangelogs:
 	dh_installchangelogs -pdigikam core/ChangeLog