rev 18915 - in kde-extras/digikam/trunk/debian: . patches

[Mark Purcell]

Author: msp
Date: 2011-07-30 08:28:46 +0000 (Sat, 30 Jul 2011)
New Revision: 18915

Added:
   kde-extras/digikam/trunk/debian/patches/
   kde-extras/digikam/trunk/debian/patches/highgui_c.h
   kde-extras/digikam/trunk/debian/patches/series
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
Log:
* Add Build-Depends: libboost-graph-dev, libcv-dev (>= 2.2) - experimental
* Add patches/highgui_c.h to account for different layout
* Unsatisfactory Conflicts: libkexiv2-dev kipi-plugins-common libkdcraw-dev
libkipi-dev kdegraphics-libs-data

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2011-07-30 01:30:59 UTC (rev 18914)
+++ kde-extras/digikam/trunk/debian/changelog	2011-07-30 08:28:46 UTC (rev 18915)
@@ -1,12 +1,13 @@
-digikam (2:2.0.0~rc-1) UNRELEASED; urgency=low
+digikam (2:2.0.0-1) UNRELEASED; urgency=low
 
   * New upstream release
-    - Upload beta/rc to experimental
-  * Add Build-Depends: libboost-graph-dev, libcv-dev
+  * Add Build-Depends: libboost-graph-dev, libcv-dev (>= 2.2) - experimental
+  * Add patches/highgui_c.h to account for different layout
 
-  * TODO: Resolve conficts with existing packages: libkexiv2 kipi-plugins
+  * Unsatisfactory Conflicts: libkexiv2-dev kipi-plugins-common libkdcraw-dev
+  libkipi-dev kdegraphics-libs-data
 
- -- Mark Purcell <msp at debian.org>  Sat, 02 Jul 2011 22:55:18 +1000
+ -- Mark Purcell <msp at debian.org>  Sat, 30 Jul 2011 17:38:53 +1000
 
 digikam (2:1.9.0-3) unstable; urgency=low
 

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2011-07-30 01:30:59 UTC (rev 18914)
+++ kde-extras/digikam/trunk/debian/control	2011-07-30 08:28:46 UTC (rev 18915)
@@ -9,7 +9,8 @@
  shared-desktop-ontologies,
  mysql-server-5.1 | mysql-server,
  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),
+# 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 (>= 2.2), libcvaux-dev (>= 2.2), libopencv-contrib-dev (>= 2.2), libopencv-gpu-dev (>= 2.2),
  libjasper-dev,
@@ -27,6 +28,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql-sqlite, digikam-data (= ${source:Version})
 Recommends: www-browser, kipi-plugins, mplayerthumbs
+Conflicts: libkexiv2-dev, kipi-plugins-common, libkdcraw-dev, libkipi-dev, kdegraphics-libs-data
 Suggests: digikam-doc
 Description: digital photo management application for KDE
  Digital photo management program designed to import, organize, enhance, search

Added: kde-extras/digikam/trunk/debian/patches/highgui_c.h
===================================================================
--- kde-extras/digikam/trunk/debian/patches/highgui_c.h	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/highgui_c.h	2011-07-30 08:28:46 UTC (rev 18915)
@@ -0,0 +1,94 @@
+Description: Upstream changes introduced in version 2:2.0.0-1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ digikam (2:2.0.0-1) UNRELEASED; urgency=low
+ .
+   * New upstream release
+   * Add Build-Depends: libboost-graph-dev, libcv-dev
+ .
+   * TODO: Resolve conficts with existing packages: libkexiv2 kipi-plugins
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Mark Purcell <msp at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- digikam-2.0.0.orig/extra/kipi-plugins/removeredeyes/detection/locators/haarclassifier/haarclassifierlocator.h
++++ digikam-2.0.0/extra/kipi-plugins/removeredeyes/detection/locators/haarclassifier/haarclassifierlocator.h
+@@ -34,7 +34,7 @@
+ #include <highgui.h>
+ #else
+ #include <opencv/cv.h>
+-#include <opencv/highgui.h>
++#include <opencv2/highgui/highgui_c.h>
+ #endif
+ 
+ // Local includes
+--- digikam-2.0.0.orig/extra/libkface/libkface/image.cpp
++++ digikam-2.0.0/extra/libkface/libkface/image.cpp
+@@ -37,7 +37,7 @@
+ 
+ #include <opencv/cv.h>
+ #include <opencv/cxcore.h>
+-#include <opencv/highgui.h>
++#include <opencv2/highgui/highgui_c.h>
+ 
+ // Libface includes
+ 
+--- digikam-2.0.0.orig/extra/libkface/libkface/kfaceutils.cpp
++++ digikam-2.0.0/extra/libkface/libkface/kfaceutils.cpp
+@@ -45,7 +45,7 @@
+ // OpenCV includes.
+ 
+ #include <opencv/cxcore.h>
+-#include <opencv/highgui.h>
++#include <opencv2/highgui/highgui_c.h>
+ 
+ namespace KFaceIface
+ {
+--- digikam-2.0.0.orig/extra/libkface/libface/Haarcascades.cpp
++++ digikam-2.0.0/extra/libkface/libface/Haarcascades.cpp
+@@ -43,7 +43,7 @@
+ #include <highgui.h>
+ #else
+ #include <opencv/cv.h>
+-#include <opencv/highgui.h>
++#include <opencv2/highgui/highgui_c.h>
+ #endif
+ 
+ #include "Haarcascades.h"
+--- digikam-2.0.0.orig/extra/libkface/libface/LibFaceUtils.h
++++ digikam-2.0.0/extra/libkface/libface/LibFaceUtils.h
+@@ -38,7 +38,7 @@
+ #include <cxcore.h>
+ #include <cv.h>
+ #else
+-#include <opencv/highgui.h>
++#include <opencv2/highgui/highgui_c.h>
+ #include <opencv/cxcore.h>
+ #include <opencv/cv.h>
+ #endif
+--- digikam-2.0.0.orig/extra/libkface/libface/FaceDetect.cpp
++++ digikam-2.0.0/extra/libkface/libface/FaceDetect.cpp
+@@ -40,7 +40,7 @@
+ #include <highgui.h>
+ #else
+ #include <opencv/cv.h>
+-#include <opencv/highgui.h>
++#include <opencv2/highgui/highgui_c.h>
+ #endif
+ 
+ #include "LibFaceUtils.h"

Added: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/series	2011-07-30 08:28:46 UTC (rev 18915)
@@ -0,0 +1 @@
+highgui_c.h