r36993 - in /packages/cimg/trunk/debian: changelog control rules

[tille at users.alioth.debian.org]

Author: tille
Date: Fri Nov  5 15:30:11 2010
New Revision: 36993

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36993
Log:
Adjust some Dependencies, fix clean target; Upload to unstable

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=36993&op=diff
==============================================================================
--- packages/cimg/trunk/debian/changelog (original)
+++ packages/cimg/trunk/debian/changelog Fri Nov  5 15:30:11 2010
@@ -1,11 +1,18 @@
-cimg (1.4.4-1) UNRELEASED; urgency=low
+cimg (1.4.4-1) unstable; urgency=low
 
   * New upstream version
   * Stabilized gzipped tarball's MD5 sum in ‘debian/get-orig-source’.
   * 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
+  * debian/control
+    - Build-Depends: libcv-dev, libhighgui-dev
+    - Recommends: libcv-dev, libhighgui-dev
+    - Depends: libmagick++-dev (instead of libmagick++9-dev)
+  * debian/rules:
+    - Make sure no object files from test build will make it into
+      examples package
+    - Do not compress .gmic file in examples
 
  -- 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=36993&op=diff
==============================================================================
--- packages/cimg/trunk/debian/control (original)
+++ packages/cimg/trunk/debian/control Fri Nov  5 15:30:11 2010
@@ -16,8 +16,9 @@
 
 Package: cimg-dev
 Architecture: all
-Depends: libx11-dev, libxrandr-dev, libmagick++9-dev, libfftw3-dev | fftw3-dev,
+Depends: libx11-dev, libxrandr-dev, libmagick++-dev, libfftw3-dev | fftw3-dev,
  ${misc:Depends}, ${shlibs:Depends}
+Recommends: libcv-dev, libhighgui-dev
 Suggests: xmedcon, lapack3-dev, cimg-doc, cimg-examples
 Description: powerful image processing library
  The CImg Library is a C++ toolkit providing simple classes and functions

Modified: packages/cimg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/rules?rev=36993&op=diff
==============================================================================
--- packages/cimg/trunk/debian/rules (original)
+++ packages/cimg/trunk/debian/rules Fri Nov  5 15:30:11 2010
@@ -18,7 +18,8 @@
 	            --exclude=.pgm \
 	            --exclude=.ppm \
 	            --exclude=Makefile \
-	            --exclude=.raw
+	            --exclude=.raw \
+	            --exclude=.gmic
 
 override_dh_installchangelogs:
 	dh_installchangelogs --exclude=CHANGES.txt
@@ -27,6 +28,8 @@
 
 override_dh_auto_install:
 	cd examples && $(MAKE) Mlinux "LDFLAGS=-lm -lpthread -lHalf"
+	# After test build of examples remove remaining object files
+	cd examples && $(MAKE) clean
 
 CHANGEFILES=gaussian_fit1d.cpp \
             use_RGBclass.cpp