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

[Nelson A. de Oliveira]

Author: naoliv
Date: 2010-11-16 11:39:58 +0000 (Tue, 16 Nov 2010)
New Revision: 125

Modified:
   trunk/debian/NEWS
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
Log:
NMU 8:6.6.0.4-2.1


Modified: trunk/debian/NEWS
===================================================================
--- trunk/debian/NEWS	2010-06-20 23:24:11 UTC (rev 124)
+++ trunk/debian/NEWS	2010-11-16 11:39:58 UTC (rev 125)
@@ -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-06-20 23:24:11 UTC (rev 124)
+++ trunk/debian/changelog	2010-11-16 11:39:58 UTC (rev 125)
@@ -1,11 +1,10 @@
-imagemagick (7:6.6.2.6-1) unstable; urgency=low
+imagemagick (8:6.6.0.4-2.1) unstable; 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!
+  * Non-maintainer upload.
+  * Re-upload 6.6.0.4 with bumped epoch to revert ABI breakage (closes:
+    #587227).
 
- -- Nelson A. de Oliveira <naoliv at debian.org>  Sun, 20 Jun 2010 19:59:55 -0300
+ -- Julien Cristau <jcristau at debian.org>  Thu, 05 Aug 2010 13:19:32 -0400
 
 imagemagick (7:6.6.0.4-2) unstable; urgency=low
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2010-06-20 23:24:11 UTC (rev 124)
+++ trunk/debian/control	2010-11-16 11:39:58 UTC (rev 125)
@@ -19,7 +19,7 @@
 Package: imagemagick
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: libmagickcore3-extra, ghostscript, netpbm, ufraw-batch
+Recommends: libmagickcore3-extra, ghostscript, netpbm, ufraw
 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-06-20 23:24:11 UTC (rev 124)
+++ trunk/debian/rules	2010-11-16 11:39:58 UTC (rev 125)
@@ -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.2
+IMAGEMAGICKVERSION=6.6.0
 
 DESTDIR="$(CURDIR)/debian/tmp"
 
@@ -21,7 +21,6 @@
 build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 
-	CONFIG_SHELL=/bin/bash \
 	MagickDocumentPath="/usr/share/doc/imagemagick" ./configure \
 	--prefix=/usr \
 	--mandir=\$${prefix}/share/man \
@@ -30,7 +29,6 @@
 	--with-gs-font-dir=/usr/share/fonts/type1/gsfonts \
 	--with-magick-plus-plus \
 	--with-djvu \
-	--with-perl \
 	--enable-shared \
 	--without-dps \
 	--without-fpx \
@@ -85,9 +83,8 @@
 	[ ! -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 \
-		"$(CURDIR)"/Magick++/demo/demo_out*.miff
+	rm -f "$(CURDIR)/utilities/.libs/*" "$(CURDIR)/_configs.sed" \
+		"$(CURDIR)/magick/magick-config.h"
 
 	dh_clean build-stamp