r45109 - in /packages/cimg/trunk/debian: changelog patches/10_examples.patch patches/20_fix-missing-libX11-binutils-gold.patch patches/30_do_not_build_minc2_examples.patch patches/series

[tille at users.alioth.debian.org]

Author: tille
Date: Sat Jun 23 14:03:40 2012
New Revision: 45109

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45109
Log:
New upstream version, does not finally build yet

Added:
    packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch
Modified:
    packages/cimg/trunk/debian/changelog
    packages/cimg/trunk/debian/patches/10_examples.patch
    packages/cimg/trunk/debian/patches/20_fix-missing-libX11-binutils-gold.patch
    packages/cimg/trunk/debian/patches/series

Modified: packages/cimg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/changelog?rev=45109&op=diff
==============================================================================
--- packages/cimg/trunk/debian/changelog (original)
+++ packages/cimg/trunk/debian/changelog Sat Jun 23 14:03:40 2012
@@ -1,3 +1,12 @@
+cimg (1.5.0-1) UNRELEASED; urgency=low
+
+  * New upstream version (adapted patches)
+    debian/patches/30_fix-opencv-ftbfs.patch disabled because applied upstream
+  * debian/patches/30_do_not_build_minc2_examples.patch: Examples will
+    file when trying to use minc file format so exclude these from build
+
+ -- Andreas Tille <tille at debian.org>  Fri, 22 Jun 2012 14:56:54 +0200
+
 cimg (1.4.9-2) unstable; urgency=low
 
   * debian/patches/30_fix-opencv-ftbfs.patch: Fix problem with opencv

Modified: packages/cimg/trunk/debian/patches/10_examples.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/10_examples.patch?rev=45109&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/10_examples.patch (original)
+++ packages/cimg/trunk/debian/patches/10_examples.patch Sat Jun 23 14:03:40 2012
@@ -1,7 +1,7 @@
 Author: Andreas Tille <tille at debian.org>
 Description: Do not use relative path to header file
---- CImg-1.4.4.orig/examples/use_skeleton.cpp
-+++ CImg-1.4.4/examples/use_skeleton.cpp
+--- cimg-1.5.0.orig/examples/use_skeleton.cpp
++++ cimg-1.5.0/examples/use_skeleton.cpp
 @@ -43,7 +43,7 @@
  
  #include <queue>

Modified: packages/cimg/trunk/debian/patches/20_fix-missing-libX11-binutils-gold.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/20_fix-missing-libX11-binutils-gold.patch?rev=45109&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/20_fix-missing-libX11-binutils-gold.patch (original)
+++ packages/cimg/trunk/debian/patches/20_fix-missing-libX11-binutils-gold.patch Sat Jun 23 14:03:40 2012
@@ -2,9 +2,9 @@
  missing XGetWindowAttributes symbol, found in libX11. Adding thus -lX11 to link
  options of gmic_gimp.
 Author: Fabrice Coutadeur <fabricesp at ubuntu.com>
---- cimg-1.4.4.orig/examples/Makefile
-+++ cimg-1.4.4/examples/Makefile
-@@ -288,7 +288,7 @@ gmic_gimp.o: gmic.cpp gmic_def.h
+--- cimg-1.5.0.orig/examples/Makefile
++++ cimg-1.5.0/examples/Makefile
+@@ -292,7 +292,7 @@
  	$(CC) -o gmic_gimp.o -c gmic.cpp -Dcimg_build -Dgmic_gimp -Dgmic_minimal $(CIMG_OPT_CFLAGS) $(CIMG_FFTW3_CFLAGS) $(CIMG_PNG_CFLAGS)
  
  gmic_gimp: gmic_gimp.o gmic_gimp.cpp

Added: packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch?rev=45109&op=file
==============================================================================
--- packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch (added)
+++ packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch Sat Jun 23 14:03:40 2012
@@ -1,0 +1,18 @@
+Author: Andreas Tille <tille at debian.org>
+Description: Do not build minc format file examples
+ There seems to be some change in parallel to cimg-dev 1.5 in minc library which leads to
+   ../CImg.h:298:35: fatal error: minc_io_simple_volume.h: No such file or directory
+ if this is not commented out
+--- cimg-1.5.0.orig/examples/Makefile
++++ cimg-1.5.0/examples/Makefile
+@@ -181,8 +181,8 @@
+ 
+ # 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_LDFLAGS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -lhdf5 -lz -L${HOME}/local/lib
++# CIMG_MINC2_CFLAGS = -Dcimg_use_minc2 -I${HOME}/local/include
++# CIMG_MINC2_LDFLAGS = -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/ )

Modified: packages/cimg/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/series?rev=45109&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/series (original)
+++ packages/cimg/trunk/debian/patches/series Sat Jun 23 14:03:40 2012
@@ -1,2 +1,3 @@
 10_examples.patch
 20_fix-missing-libX11-binutils-gold.patch
+30_do_not_build_minc2_examples.patch