r36992 - in /packages/cimg/trunk/debian: changelog control patches/10_do_not_build_gmic_examples.patch patches/10_examples.patch patches/20_examples2.patch patches/series

[tille at users.alioth.debian.org]

Author: tille
Date: Fri Nov  5 12:57:42 2010
New Revision: 36992

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36992
Log:
Adapt patches to new upstream, two new build-depends

Added:
    packages/cimg/trunk/debian/patches/10_examples.patch
      - copied, changed from r36989, packages/cimg/trunk/debian/patches/20_examples2.patch
Removed:
    packages/cimg/trunk/debian/patches/10_do_not_build_gmic_examples.patch
    packages/cimg/trunk/debian/patches/20_examples2.patch
Modified:
    packages/cimg/trunk/debian/changelog
    packages/cimg/trunk/debian/control
    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=36992&op=diff
==============================================================================
--- packages/cimg/trunk/debian/changelog (original)
+++ packages/cimg/trunk/debian/changelog Fri Nov  5 12:57:42 2010
@@ -5,6 +5,7 @@
   * Make sure package builds with binutils-gold (Thanks for the patch
     provided by Fabrice Coutadeur <fabricesp at ubuntu.com>)
     Closes: #602166
+  * Build-Depends: libcv-dev, libhighgui-dev
 
  -- Andreas Tille <tille at debian.org>  Thu, 04 Nov 2010 21:59:49 +0100
 

Modified: packages/cimg/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/control?rev=36992&op=diff
==============================================================================
--- packages/cimg/trunk/debian/control (original)
+++ packages/cimg/trunk/debian/control Fri Nov  5 12:57:42 2010
@@ -6,7 +6,8 @@
  Christophe Prud'homme <prudhomm at debian.org>,
  Andreas Tille <tille at debian.org>
 Build-Depends-Indep: doxygen, libx11-dev, libxrandr-dev, libmagick++-dev,
- libfftw3-dev | fftw3-dev, libgimp2.0-dev, quilt (>= 0.46-8)
+ libfftw3-dev | fftw3-dev, libgimp2.0-dev, quilt (>= 0.46-8), libcv-dev,
+ libhighgui-dev
 Build-Depends: debhelper (>= 7.1)
 Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/cimg/trunk/

Copied: packages/cimg/trunk/debian/patches/10_examples.patch (from r36989, packages/cimg/trunk/debian/patches/20_examples2.patch)
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/10_examples.patch?rev=36992&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/20_examples2.patch (original)
+++ packages/cimg/trunk/debian/patches/10_examples.patch Fri Nov  5 12:57:42 2010
@@ -1,7 +1,7 @@
 Author: Andreas Tille <tille at debian.org>
 Description: Do not use relative path to header file
---- CImg-1.3.2.orig/examples/use_skeleton.cpp
-+++ CImg-1.3.2/examples/use_skeleton.cpp
+--- CImg-1.4.4.orig/examples/use_skeleton.cpp
++++ CImg-1.4.4/examples/use_skeleton.cpp
 @@ -43,7 +43,7 @@
  
  #include <queue>

Modified: packages/cimg/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/series?rev=36992&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/series (original)
+++ packages/cimg/trunk/debian/patches/series Fri Nov  5 12:57:42 2010
@@ -1,2 +1,1 @@
-10_do_not_build_gmic_examples.patch
-20_examples2.patch
+10_examples.patch