[Pkg-gmagick-svn-commit] r122 - trunk/debian

[Nelson A. de Oliveira]

Author: naoliv
Date: 2010-06-06 22:38:17 +0000 (Sun, 06 Jun 2010)
New Revision: 122

Modified:
   trunk/debian/NEWS
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
Log:
Update for new upstream release.


Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS	2010-03-17 14:48:45 UTC (rev 121)
+++ trunk/debian/NEWS	2010-06-06 22:38:17 UTC (rev 122)
@@ -2,7 +2,7 @@
 
   The SVG, WMF, OpenEXR, DjVu and Graphviz coders have been moved to a new
   package, libmagickcore3-extra. In order to use some of these coders with
-  Imagemagick you will need to install it (if recommended packages aren't
+  ImageMagick you will need to install it (if recommended packages aren't
   installed by default in your system).
 
  -- Nelson A. de Oliveira <naoliv at debian.org>  Mon, 28 Sep 2009 19:22:10 -0300

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-03-17 14:48:45 UTC (rev 121)
+++ trunk/debian/changelog	2010-06-06 22:38:17 UTC (rev 122)
@@ -1,3 +1,12 @@
+imagemagick (7:6.6.2.3-1) UNRELEASED; urgency=low
+
+  * New upstream release;
+  * Change Recommends on ufraw to ufraw-batch (Closes: #579775);
+  * Fix FTBFS when using dash to run the configure script, by setting
+    CONFIG_SHELL=/bin/bash (Closes: #582073, #583024). Thank you, Niko Tyni!
+
+ -- Nelson A. de Oliveira <naoliv at debian.org>  Sun, 06 Jun 2010 17:52:37 -0300
+
 imagemagick (7:6.6.0.4-2) unstable; urgency=low
 
   * Revert debian/patches/type.xml.patch for now, while we address this issue

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2010-03-17 14:48:45 UTC (rev 121)
+++ trunk/debian/control	2010-06-06 22:38:17 UTC (rev 122)
@@ -19,7 +19,7 @@
 Package: imagemagick
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libmagickcore3-extra, ghostscript, netpbm, ufraw
+Recommends: libmagickcore3-extra, ghostscript, netpbm, ufraw-batch
 Suggests: imagemagick-doc, autotrace, cups-bsd | lpr | lprng, curl, enscript,
  ffmpeg, gimp, gnuplot, grads, groff-base, hp2xx, html2ps, libwmf-bin, mplayer,
  povray, radiance, sane-utils, texlive-base-bin, transfig, xdg-utils

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2010-03-17 14:48:45 UTC (rev 121)
+++ trunk/debian/rules	2010-06-06 22:38:17 UTC (rev 122)
@@ -8,7 +8,7 @@
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-IMAGEMAGICKVERSION=6.6.0
+IMAGEMAGICKVERSION=6.6.2
 
 DESTDIR="$(CURDIR)/debian/tmp"
 
@@ -21,6 +21,7 @@
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
+	CONFIG_SHELL=/bin/bash \
 	MagickDocumentPath="/usr/share/doc/imagemagick" ./configure \
 	--prefix=/usr \
 	--mandir=\$${prefix}/share/man \
@@ -29,6 +30,7 @@
 	--with-gs-font-dir=/usr/share/fonts/type1/gsfonts \
 	--with-magick-plus-plus \
 	--with-djvu \
+	--with-perl \
 	--enable-shared \
 	--without-dps \
 	--without-fpx \
@@ -83,8 +85,9 @@
 	[ ! -f PerlMagick/Makefile ] || (cd PerlMagick && $(MAKE) distclean)
 	[ ! -f Makefile ] || $(MAKE) distclean
 	[ ! -f Magick++/Makefile ] || (cd Magick++ && $(MAKE) distclean)
-	rm -f "$(CURDIR)/utilities/.libs/*" "$(CURDIR)/_configs.sed" \
-		"$(CURDIR)/magick/magick-config.h"
+	rm -f "$(CURDIR)"/utilities/.libs/* "$(CURDIR)"/_configs.sed \
+		"$(CURDIR)"/magick/magick-config.h \
+		"$(CURDIR)"/Magick++/demo/demo_out*.miff
 
 	dh_clean build-stamp