[cimg] 09/11: Adapt patches to new upstream version

[Andreas Tille]

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

tille pushed a commit to branch master
in repository cimg.

commit f13031e3b32528a41fb0d80a5623dc37edb7dc67
Author: Andreas Tille <tille at debian.org>
Date:   Tue May 3 10:58:38 2016 +0200

    Adapt patches to new upstream version
---
 debian/patches/20_include_ltiffxx.patch             | 15 ---------------
 debian/patches/30_do_not_build_minc2_examples.patch | 12 ++++++++----
 debian/patches/series                               |  5 ++---
 3 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/debian/patches/20_include_ltiffxx.patch b/debian/patches/20_include_ltiffxx.patch
deleted file mode 100644
index c217082..0000000
--- a/debian/patches/20_include_ltiffxx.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Wed, 15 Jan 2014 14:03:50 +0100
-Description: examples also need -ltiffxx
-
---- a/examples/Makefile
-+++ b/examples/Makefile
-@@ -182,7 +182,7 @@ CIMG_JPEG_LIBS = -ljpeg
- # Flags to enable native support for TIFF image files, using the TIFF library.
- # ( http://www.libtiff.org/ )
- CIMG_TIFF_CFLAGS = -Dcimg_use_tiff
--CIMG_TIFF_LIBS = -ltiff
-+CIMG_TIFF_LIBS = -ltiff -ltiffxx
- 
- # Flags to enable native support for MINC2 image files, using the MINC2 library.
- # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
diff --git a/debian/patches/30_do_not_build_minc2_examples.patch b/debian/patches/30_do_not_build_minc2_examples.patch
index 4e7095f..da4a1e4 100644
--- a/debian/patches/30_do_not_build_minc2_examples.patch
+++ b/debian/patches/30_do_not_build_minc2_examples.patch
@@ -6,14 +6,18 @@ Description: Do not build minc format file examples
 
 --- a/examples/Makefile
 +++ b/examples/Makefile
-@@ -186,8 +186,8 @@ CIMG_TIFF_LIBS = -ltiff -ltiffxx
+@@ -204,10 +204,10 @@ CIMG_TIFF_LIBS = -ltiff
  
  # Flags to enable native support for MINC2 image files, using the MINC2 library.
  # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
--CIMG_MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
+-CIMG_MINC2_DEFINE = -Dcimg_use_minc2
+-CIMG_MINC2_INCDIR = -I${HOME}/local/include
+-CIMG_MINC2_CFLAGS = $(CIMG_MINC2_DEFINE) $(CIMG_MINC2_INCDIR)
 -CIMG_MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
-+# CIMG_MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
-+# CIMG_MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
++#CIMG_MINC2_DEFINE = -Dcimg_use_minc2
++#CIMG_MINC2_INCDIR = -I${HOME}/local/include
++#CIMG_MINC2_CFLAGS = $(CIMG_MINC2_DEFINE) $(CIMG_MINC2_INCDIR)
++#CIMG_MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
  
  # Flags to enable native support for EXR image files, using the OpenEXR library.
  # ( http://www.openexr.com/ )
diff --git a/debian/patches/series b/debian/patches/series
index 4cb9fc3..17cd973 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-20_include_ltiffxx.patch
 30_do_not_build_minc2_examples.patch
-use_pkg-config.patch
-fix_privacy_breach.patch
+# use_pkg-config.patch
+# fix_privacy_breach.patch

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