[magics] 04/05: g++6, unique_ptr compilation fixes

[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 d63bc95d67cd090cc5455f042902042e27f77eac
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Thu Jun 9 15:26:46 2016 +0100

    g++6, unique_ptr compilation fixes
---
 debian/changelog                |  1 +
 debian/patches/openjpeg2.patch  | 23 -----------------------
 debian/patches/series           |  5 ++---
 debian/patches/unique-ptr.patch |  2 +-
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3aa3aa9..1e3089d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 magics++ (2.28.0-3) UNRELEASED; urgency=medium
 
   * Transition to openjpeg2. Closes: #826820
+  * g++6, unique_ptr compilation fixes
 
  -- Alastair McKinstry <mckinstry at debian.org>  Thu, 09 Jun 2016 15:05:00 +0100
 
diff --git a/debian/patches/openjpeg2.patch b/debian/patches/openjpeg2.patch
deleted file mode 100644
index f62e40d..0000000
--- a/debian/patches/openjpeg2.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 cf4b436..5ca6e6d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ soname-version.patch
 reproducibility.patch
 pkgconfig-fix.patch
 cmake-config.patch
-# TODO unique-ptr.patch
+unique-ptr.patch
 compile-fixes.patch
-#TOODO g++-6.patch
-openjpeg2.patch
+g++-6.patch
diff --git a/debian/patches/unique-ptr.patch b/debian/patches/unique-ptr.patch
index 42b2c6c..33e469b 100644
--- a/debian/patches/unique-ptr.patch
+++ b/debian/patches/unique-ptr.patch
@@ -1,5 +1,5 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
-Description: For G++ 6, we move to c++11, auto_ptr is deprecated.
+Description: For G++ 6, we move to c++14, auto_ptr is deprecated.
  So use std::unique_ptr
 Last-Updated: 2016-03-22
 Forwarded: no

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