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

[Nelson A. de Oliveira]

Author: naoliv
Date: 2009-08-07 03:17:18 +0000 (Fri, 07 Aug 2009)
New Revision: 96

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
Log:
- New upstream release;
- Closing some bugs in changelog;
- Fixed building of PerlMagick.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2009-04-12 15:25:53 UTC (rev 95)
+++ trunk/debian/changelog	2009-08-07 03:17:18 UTC (rev 96)
@@ -1,12 +1,28 @@
-imagemagick (7:6.5.1.2-1) UNRELEASED; urgency=low
+imagemagick (7:6.5.4.9-1) UNRELEASED; urgency=low
 
   * New upstream release;
+  * Removed SA35216.diff as it was fixed upstream;
   * The imagemagick package now suggests imagemagick-doc (Closes: #523401);
   * Fix image placing when displaying to the X server root (Closes: #523608);
-  * debian/control: update libltdl-dev dependency;
+  * Fix wrong exit code in display (Closes: #524058);
+  * Fix loading of MS Windows icons with compressed PNG elements
+    (Closes: #534159);
+  * Fix requirement of an X server for running display (Closes: #533494);
+  * debian/control: updated libltdl-dev dependency;
+  * debian/rules: updated build process for PerlMagick;
+  * Updated Standards-Version:
+    - FIXME disable tests when nocheck is present
 
- -- Nelson A. de Oliveira <naoliv at debian.org>  Sun, 12 Apr 2009 12:08:03 -0300
+ -- Nelson A. de Oliveira <naoliv at debian.org>  Fri, 07 Aug 2009 00:12:08 -0300
 
+imagemagick (7:6.5.1.0-1.1) unstable; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * Apply upstream patch to fix integer overflow in XMakeImage()
+    (SA35216.diff; Closes: #530838).
+
+ -- Nico Golde <nion at debian.org>  Fri, 29 May 2009 12:46:08 +0200
+
 imagemagick (7:6.5.1.0-1) unstable; urgency=low
 
   * New upstream release;

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2009-04-12 15:25:53 UTC (rev 95)
+++ trunk/debian/control	2009-08-07 03:17:18 UTC (rev 96)
@@ -5,7 +5,7 @@
 Uploaders: Luciano Bello <luciano at debian.org>,
  Daniel Kobras <kobras at debian.org>, Nelson A. de Oliveira <naoliv at debian.org>,
  Bastien Roucariès <roucaries.bastien+debian at gmail.com>
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 Build-Depends: libjpeg62-dev, libbz2-dev, libtiff4-dev, libwmf-dev, zlib1g-dev,
  libpng12-dev, libx11-dev, libxt-dev, libxext-dev, debhelper (>= 7),
  libxml2-dev, libfreetype6-dev, liblcms1-dev, libexif-dev, libjasper-dev,

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2009-04-12 15:25:53 UTC (rev 95)
+++ trunk/debian/rules	2009-08-07 03:17:18 UTC (rev 96)
@@ -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.5.1
+IMAGEMAGICKVERSION=6.5.4
 
 DESTDIR="$(CURDIR)/debian/tmp"
 
@@ -37,6 +37,9 @@
 	--x-includes=/usr/include/X11 \
 	--x-libraries=/usr/lib/X11
 
+	cd "$(CURDIR)/PerlMagick" && \
+		perl Makefile.PL
+
 	# Patch the generated libtool to avoid passing -rpath when linking,
 	# and to explicitly link libraries against the libraries they
 	# depend on.
@@ -47,6 +50,9 @@
 
 	$(MAKE)
 
+	cd "$(CURDIR)/PerlMagick" && \
+		$(MAKE)
+
 	touch build-stamp
 
 check: check-stamp
@@ -71,11 +77,12 @@
 	dh_testroot
 	rm -f build-stamp
 
-	# Add here commands to clean up after the build process.
-	-cd PerlMagick && $(MAKE) distclean
+	# Commands to clean up after the build process
+	[ ! -f PerlMagick/Makefile ] || (cd PerlMagick && $(MAKE) distclean)
 	[ ! -f Makefile ] || $(MAKE) distclean
-	-cd Magick++ && $(MAKE) distclean
-	-rm "$(CURDIR)/utilities/.libs/*"
+	[ ! -f Magick++/Makefile ] || (cd Magick++ && $(MAKE) distclean)
+	rm -f "$(CURDIR)/utilities/.libs/*" "$(CURDIR)/_configs.sed" \
+		"$(CURDIR)/magick/magick-config.h"
 
 	dh_clean build-stamp
 
@@ -89,13 +96,6 @@
 		DESTDIR="$(CURDIR)/debian/tmp" \
 		pkgdocdir=/usr/share/doc/imagemagick
 
-	cd "$(CURDIR)/PerlMagick" && \
-	$(MAKE) install_vendor  \
-		PREFIX=$(DESTDIR)/usr \
-		SITEPREFIX=$(DESTDIR)/usr \
-		INSTALLMAN3DIR=$(DESTDIR)/usr/share/man/man3 \
-		INSTALLSITEMAN3DIR=$(DESTDIR)/usr/share/man/man3
-
 	mkdir -p $(DESTDIR)/usr/share/pixmaps/
 	install -m 644 "$(CURDIR)/debian/display.xpm" $(DESTDIR)/usr/share/pixmaps/