rev 20571 - in kde-extras/digikam/branches/4.x/debian: . patches

[Steven Michael Robbins]

Author: smr
Date: 2016-06-28 04:01:02 +0000 (Tue, 28 Jun 2016)
New Revision: 20571

Added:
   kde-extras/digikam/branches/4.x/debian/patches/cmake-remove-jasper.patch
Modified:
   kde-extras/digikam/branches/4.x/debian/changelog
   kde-extras/digikam/branches/4.x/debian/control
   kde-extras/digikam/branches/4.x/debian/patches/series
Log:
Remove Jasper support.

Modified: kde-extras/digikam/branches/4.x/debian/changelog
===================================================================
--- kde-extras/digikam/branches/4.x/debian/changelog	2016-06-28 03:48:22 UTC (rev 20570)
+++ kde-extras/digikam/branches/4.x/debian/changelog	2016-06-28 04:01:02 UTC (rev 20571)
@@ -1,3 +1,11 @@
+digikam (4:4.14.0-5) unstable; urgency=medium
+
+  * Remove jasper support and build-dep.  Closes: #818219.
+    - patches/cmake-remove-jasper.patch: New.  Disable cmake probe for
+      jasper, in case jasper dev is accidentally present.
+
+ -- Steve M. Robbins <smr at debian.org>  Mon, 27 Jun 2016 22:54:51 -0500
+
 digikam (4:4.14.0-4) unstable; urgency=medium
 
   * Switch build-dep from libusb-dev to libusb-1.0-0-dev.

Modified: kde-extras/digikam/branches/4.x/debian/control
===================================================================
--- kde-extras/digikam/branches/4.x/debian/control	2016-06-28 03:48:22 UTC (rev 20570)
+++ kde-extras/digikam/branches/4.x/debian/control	2016-06-28 04:01:02 UTC (rev 20571)
@@ -24,7 +24,6 @@
  libusb-1.0-0-dev [!kfreebsd-any], libusb2-dev [kfreebsd-any],
  liblcms2-dev, liblqr-1-0-dev,
  libopencv-dev (>= 2.4.9),
- libjasper-dev,
  liblensfun-dev (>= 0.2.7),
  libsqlite3-dev,
  libsqlite0-dev,

Added: kde-extras/digikam/branches/4.x/debian/patches/cmake-remove-jasper.patch
===================================================================
--- kde-extras/digikam/branches/4.x/debian/patches/cmake-remove-jasper.patch	                        (rev 0)
+++ kde-extras/digikam/branches/4.x/debian/patches/cmake-remove-jasper.patch	2016-06-28 04:01:02 UTC (rev 20571)
@@ -0,0 +1,11 @@
+--- digikam-4.14.0.orig/core/CMakeLists.txt
++++ digikam-4.14.0/core/CMakeLists.txt
+@@ -117,7 +117,7 @@
+ find_package(Kface)
+ find_package(KGeoMap)
+ find_package(PkgConfig)
+-find_package(Jasper)
++#find_package(Jasper) -- disabled by Debian
+ find_package(Eigen3)
+ find_package(Boost)
+ 

Modified: kde-extras/digikam/branches/4.x/debian/patches/series
===================================================================
--- kde-extras/digikam/branches/4.x/debian/patches/series	2016-06-28 03:48:22 UTC (rev 20570)
+++ kde-extras/digikam/branches/4.x/debian/patches/series	2016-06-28 04:01:02 UTC (rev 20571)
@@ -1,4 +1,5 @@
 #upstream_fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch
+cmake-remove-jasper.patch
 doc-linkage.patch
 mysql-global-conf.patch
 sendimages-icedove.diff