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

[Steven Michael Robbins]

Author: smr
Date: 2017-10-02 02:24:20 +0000 (Mon, 02 Oct 2017)
New Revision: 20877

Added:
   kde-extras/digikam/trunk/debian/patches/cmake-add-quotes
Removed:
   kde-extras/digikam/trunk/debian/patches/cmake-v9-fix.patch
Modified:
   kde-extras/digikam/trunk/debian/changelog
   kde-extras/digikam/trunk/debian/control
   kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch
   kde-extras/digikam/trunk/debian/patches/series
Log:
Prepare 5.7.0 for experimental.

Modified: kde-extras/digikam/trunk/debian/changelog
===================================================================
--- kde-extras/digikam/trunk/debian/changelog	2017-10-01 18:50:31 UTC (rev 20876)
+++ kde-extras/digikam/trunk/debian/changelog	2017-10-02 02:24:20 UTC (rev 20877)
@@ -1,3 +1,10 @@
+digikam (4:5.7.0-1) experimental; urgency=medium
+
+  * New upstream.  Closes: #865543.
+  * patches/cmake-v9-fix.patch: Remove.  Applied upstream.
+
+ -- Steve M. Robbins <smr at debian.org>  Sun, 01 Oct 2017 19:35:21 -0500
+
 digikam (4:5.6.0-1) unstable; urgency=medium
 
   * kipi-plugins: Change konqueror from Recommends to Suggested.  Closes:

Modified: kde-extras/digikam/trunk/debian/control
===================================================================
--- kde-extras/digikam/trunk/debian/control	2017-10-01 18:50:31 UTC (rev 20876)
+++ kde-extras/digikam/trunk/debian/control	2017-10-02 02:24:20 UTC (rev 20877)
@@ -14,7 +14,7 @@
                help2man,
                libboost-graph-dev,
                libeigen3-dev (>= 3.1.2),
-               libexiv2-dev,
+               libexiv2-dev (>= 0.26),
                libexpat1-dev | libexpat-dev,
                libgphoto2-dev,
                libjpeg-dev,
@@ -30,7 +30,7 @@
                liblensfun-dev,
                liblqr-1-0-dev,
                libmarble-dev,
-               libopencv-dev (>= 2.4.9),
+               libopencv-dev (>= 3.1.0),
                libpng-dev,
                libqt5opengl5-dev,
                libqt5svg5-dev,

Added: kde-extras/digikam/trunk/debian/patches/cmake-add-quotes
===================================================================
--- kde-extras/digikam/trunk/debian/patches/cmake-add-quotes	                        (rev 0)
+++ kde-extras/digikam/trunk/debian/patches/cmake-add-quotes	2017-10-02 02:24:20 UTC (rev 20877)
@@ -0,0 +1,11 @@
+--- digikam-5.7.0.orig/core/CMakeLists.txt
++++ digikam-5.7.0/core/CMakeLists.txt
+@@ -225,7 +225,7 @@
+ 
+ if(ENABLE_MEDIAPLAYER)
+ 
+-    if(NOT ${QTAV_FOUND} OR ${QTAV_VERSION_STRING} VERSION_LESS ${QTAV_MIN_VERSION})
++    if(NOT ${QTAV_FOUND} OR "${QTAV_VERSION_STRING}" VERSION_LESS ${QTAV_MIN_VERSION})
+ 
+         set(ENABLE_MEDIAPLAYER OFF)
+         set(QTAV_FOUND OFF)

Modified: kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch
===================================================================
--- kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch	2017-10-01 18:50:31 UTC (rev 20876)
+++ kde-extras/digikam/trunk/debian/patches/cmake-disable-jasper.patch	2017-10-02 02:24:20 UTC (rev 20877)
@@ -8,9 +8,9 @@
 
 
 
---- digikam-5.0.0~git20160625.orig/core/CMakeLists.txt
-+++ digikam-5.0.0~git20160625/core/CMakeLists.txt
-@@ -267,7 +267,7 @@
+--- digikam-5.7.0.orig/core/CMakeLists.txt
++++ digikam-5.7.0/core/CMakeLists.txt
+@@ -285,7 +285,7 @@
  find_package(Marble)
  
  find_package(PkgConfig)

Modified: kde-extras/digikam/trunk/debian/patches/series
===================================================================
--- kde-extras/digikam/trunk/debian/patches/series	2017-10-01 18:50:31 UTC (rev 20876)
+++ kde-extras/digikam/trunk/debian/patches/series	2017-10-02 02:24:20 UTC (rev 20877)
@@ -1,2 +1,2 @@
 cmake-disable-jasper.patch
-cmake-v9-fix.patch
+cmake-add-quotes