r35902 - in /packages/cimg/trunk/debian: changelog control patches/10_examples.patch patches/series rules

[tille at users.alioth.debian.org]

Author: tille
Date: Fri Oct 16 13:38:47 2009
New Revision: 35902

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35902
Log:
Applied patch suggested by upstream to successfully compile examples

Added:
    packages/cimg/trunk/debian/patches/10_examples.patch
    packages/cimg/trunk/debian/patches/series
Modified:
    packages/cimg/trunk/debian/changelog
    packages/cimg/trunk/debian/control
    packages/cimg/trunk/debian/rules

Modified: packages/cimg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/changelog?rev=35902&op=diff
==============================================================================
--- packages/cimg/trunk/debian/changelog (original)
+++ packages/cimg/trunk/debian/changelog Fri Oct 16 13:38:47 2009
@@ -22,10 +22,12 @@
     - Standards-Version: 3.8.3 (no changes needed)
     - Added Homepage field
     - took over Suggests from upstreams Debian packaging
-    - Build-Depends: libgimp2.0-dev
+    - Build-Depends: libgimp2.0-dev, quilt
   * debian/get-orig-source to repack zip to orig.tar.gz
   * Added html docs and examples to the package
   * debian/doc-base
+  * debian/patches: Added a patch by upstream to enable building
+    examples
 
  -- Andreas Tille <tille at debian.org>  Fri, 09 Oct 2009 14:07:50 +0200
 

Modified: packages/cimg/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/control?rev=35902&op=diff
==============================================================================
--- packages/cimg/trunk/debian/control (original)
+++ packages/cimg/trunk/debian/control Fri Oct 16 13:38:47 2009
@@ -6,7 +6,7 @@
  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
+ libfftw3-dev | fftw3-dev, libgimp2.0-dev, quilt
 Build-Depends: debhelper (>= 7)
 Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/cimg/trunk/

Added: 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=35902&op=file
==============================================================================
--- packages/cimg/trunk/debian/patches/10_examples.patch (added)
+++ packages/cimg/trunk/debian/patches/10_examples.patch Fri Oct 16 13:38:47 2009
@@ -1,0 +1,12 @@
+--- CImg-1.3.2.orig/examples/Makefile
++++ CImg-1.3.2/examples/Makefile
+@@ -289,7 +289,8 @@
+ 	$(CC) -I.. -o gmic_gimp.o -c gmic.cpp -Dgmic_gimp -Dgmic_minimal $(CIMG_OPT_CFLAGS) $(CIMG_FFTW3_CFLAGS) $(CIMG_PNG_CFLAGS)
+ 
+ gmic_gimp: gmic_gimp.o gmic_gimp.cpp
+-	$(CC) -I.. -I./plugins -o $(EXEPFX)gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread $(CIMG_OPT_FLAGS) $(CIMG_FFTW3_LDFLAGS) $(CIMG_PNG_LDFLAGS) $(CIMG_GIMP_CFLAGS)
++	$(CC) -Dcimg_cimg_h -I.. -I./plugins -o $(EXEPFX)gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread $(CIMG_OPT_FLAGS) $(CIMG_FFTW3_LDFLAGS) $(CIMG_PNG_LDFLAGS) $(CIMG_GIMP_CFLAGS) 
++	# $(CC) -I.. -I./plugins -o $(EXEPFX)gmic_gimp gmic_gimp.cpp gmic_gimp.o `gimptool-2.0 --cflags` `gimptool-2.0 --libs` -lpthread $(CIMG_OPT_FLAGS) $(CIMG_FFTW3_LDFLAGS) $(CIMG_PNG_LDFLAGS) $(CIMG_GIMP_CFLAGS)
+ 
+ # Specific targets for 'gmic'.
+ gmic_def: gmic_def.raw

Added: packages/cimg/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/series?rev=35902&op=file
==============================================================================
--- packages/cimg/trunk/debian/patches/series (added)
+++ packages/cimg/trunk/debian/patches/series Fri Oct 16 13:38:47 2009
@@ -1,0 +1,1 @@
+10_examples.patch

Modified: packages/cimg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/rules?rev=35902&op=diff
==============================================================================
--- packages/cimg/trunk/debian/rules (original)
+++ packages/cimg/trunk/debian/rules Fri Oct 16 13:38:47 2009
@@ -23,11 +23,11 @@
 	INSTALL_PROGRAM += -s
 endif
 
-# include /usr/share/quilt/quilt.make
+include /usr/share/quilt/quilt.make
 
 build: build-indep-stamp
 build-indep-stamp:
-	# QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	cd examples && $(MAKE) Mlinux "LDFLAGS=-lm -lpthread"
 	cd examples && $(MAKE) clean
 	touch build-indep-stamp
@@ -38,7 +38,7 @@
 	rm -f build-arch-stamp build-indep-stamp
 	-cd examples && $(MAKE) clean
 	rm -Rf html
-	# QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	rm -rf .pc
 	dh_clean