[magics] 03/05: openjpeg2 support

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to tag debian/2.28.0-3
in repository magics.

commit 5843716cd6cda70c8f8a19975b2e56cb02098876
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jun 9 15:07:11 2016 +0100

    openjpeg2 support
---
 debian/changelog               |  6 ++++++
 debian/control                 |  3 ++-
 debian/patches/openjpeg2.patch | 23 +++++++++++++++++++++++
 debian/patches/series          |  4 +++-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4d37044..3aa3aa9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+magics++ (2.28.0-3) UNRELEASED; urgency=medium
+
+  * Transition to openjpeg2. Closes: #826820
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Thu, 09 Jun 2016 15:05:00 +0100
+
 magics++ (2.28.0-2) unstable; urgency=medium
 
   * Standards-Version: 3.9.8
diff --git a/debian/control b/debian/control
index 55ff0ad..dca0e1f 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends: debhelper  (>= 9) , dh-buildinfo, gfortran, cmake, chrpath,
  libterralib-dev, 
  libcairo2-dev, libpango1.0-dev,
  ttf-dejavu-core, libxml-parser-perl, 
- libopenjpeg-dev, ghostscript, zlib1g-dev, libboost-dev, libproj-dev, 
+ libopenjp2-7-dev,
+ ghostscript, zlib1g-dev, libboost-dev, libproj-dev, 
  qtbase5-dev-tools, qtbase5-dev, qt5-qmake
 Standards-Version: 3.9.8
 Homepage: https://software.ecmwf.int/wiki/display/MAGP/Magics
diff --git a/debian/patches/openjpeg2.patch b/debian/patches/openjpeg2.patch
new file mode 100644
index 0000000..f62e40d
--- /dev/null
+++ b/debian/patches/openjpeg2.patch
@@ -0,0 +1,23 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Use OpenJPEG2 library (openjp2 on Debian) 
+Last-Updated: 2016-06-09
+Forwarded: no
+
+Index: grib-api-1.15.0/cmake/FindOpenJPEG.cmake
+===================================================================
+--- grib-api-1.15.0.orig/cmake/FindOpenJPEG.cmake
++++ grib-api-1.15.0/cmake/FindOpenJPEG.cmake
+@@ -26,9 +26,11 @@ if( DEFINED OPENJPEG_PATH )
+         find_library(OPENJPEG_LIBRARY  openjpeg   PATHS ${OPENJPEG_PATH}/lib     PATH_SUFFIXES openjpeg  NO_DEFAULT_PATH)
+ endif()
+ 
+-find_path(OPENJPEG_INCLUDE_DIR  openjpeg.h PATH_SUFFIXES openjpeg )
++find_path(OPENJPEG_INCLUDE_DIR  openjpeg.h PATH_SUFFIXES openjpeg openjpeg-2.1 )
+ find_library( OPENJPEG_LIBRARY  openjpeg   PATH_SUFFIXES openjpeg )
+-
++if( NOT OPENJPEG_LIBRARY)
++  find_library( OPENJPEG_LIBRARY  openjp2   PATH_SUFFIXES openjpeg )
++endif()
+ set( OPENJPEG_LIBRARIES    ${OPENJPEG_LIBRARY} )
+ set( OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR} )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cedf697..cf4b436 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,7 @@ soname-version.patch
 reproducibility.patch
 pkgconfig-fix.patch
 cmake-config.patch
-#unique-ptr.patch
+# TODO unique-ptr.patch
 compile-fixes.patch
+#TOODO g++-6.patch
+openjpeg2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git