r46901 - in /packages/cimg/trunk/debian: changelog patches/20_build_examples_using_libopencv.patch patches/20_include_ltiffxx.patch patches/30_do_not_build_minc2_examples.patch patches/series

[tille at users.alioth.debian.org]

Author: tille
Date: Mon Sep 15 15:27:27 2014
New Revision: 46901

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46901
Log:
New upstream version (adapted patches)

Removed:
    packages/cimg/trunk/debian/patches/20_build_examples_using_libopencv.patch
Modified:
    packages/cimg/trunk/debian/changelog
    packages/cimg/trunk/debian/patches/20_include_ltiffxx.patch
    packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.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=46901&op=diff
==============================================================================
--- packages/cimg/trunk/debian/changelog	(original)
+++ packages/cimg/trunk/debian/changelog	Mon Sep 15 15:27:27 2014
@@ -1,5 +1,6 @@
-cimg (1.5.7+dfsg-2) UNRELEASED; urgency=medium
-
+cimg (1.5.9+dfsg-2) UNRELEASED; urgency=medium
+
+  * New upstream version (adapted patches)
   * d/rules: adapt uscan syntax
   * d/watch: enable uscan to use correct version
 

Modified: packages/cimg/trunk/debian/patches/20_include_ltiffxx.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/20_include_ltiffxx.patch?rev=46901&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/20_include_ltiffxx.patch	(original)
+++ packages/cimg/trunk/debian/patches/20_include_ltiffxx.patch	Mon Sep 15 15:27:27 2014
@@ -4,7 +4,7 @@
 
 --- a/examples/Makefile
 +++ b/examples/Makefile
-@@ -176,7 +176,7 @@ CIMG_JPEG_LDFLAGS = -ljpeg
+@@ -182,7 +182,7 @@ CIMG_JPEG_LDFLAGS = -ljpeg
  # Flags to enable native support for TIFF image files, using the TIFF library.
  # ( http://www.libtiff.org/ )
  CIMG_TIFF_CFLAGS = -Dcimg_use_tiff

Modified: 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=46901&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch	(original)
+++ packages/cimg/trunk/debian/patches/30_do_not_build_minc2_examples.patch	Mon Sep 15 15:27:27 2014
@@ -5,7 +5,7 @@
  if this is not commented out
 --- a/examples/Makefile
 +++ b/examples/Makefile
-@@ -180,8 +180,8 @@ CIMG_TIFF_LDFLAGS = -ltiff
+@@ -186,8 +186,8 @@ CIMG_TIFF_LDFLAGS = -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 )

Modified: packages/cimg/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/series?rev=46901&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/series	(original)
+++ packages/cimg/trunk/debian/patches/series	Mon Sep 15 15:27:27 2014
@@ -1,3 +1,2 @@
-20_build_examples_using_libopencv.patch
 20_include_ltiffxx.patch
 30_do_not_build_minc2_examples.patch