[Pkg-gmagick-svn-commit] r70 - branches/experimental/debian

[naoliv at alioth.debian.org]

Author: naoliv
Date: 2008-08-27 20:07:43 +0000 (Wed, 27 Aug 2008)
New Revision: 70

Modified:
   branches/experimental/debian/changelog
   branches/experimental/debian/rules
Log:
New upstream relase
Fix #496818 #496212


Modified: branches/experimental/debian/changelog
===================================================================
--- branches/experimental/debian/changelog	2008-08-22 13:56:27 UTC (rev 69)
+++ branches/experimental/debian/changelog	2008-08-27 20:07:43 UTC (rev 70)
@@ -1,3 +1,10 @@
+imagemagick (7:6.4.3.4.dfsg1-1) experimental; urgency=low
+
+  * New upstream release;
+  * Fix parallel building support in debian/rules (Closes: #496212).
+
+ -- Nelson A. de Oliveira <naoliv at debian.org>  Wed, 27 Aug 2008 16:16:54 -0300
+
 imagemagick (7:6.4.3.2.dfsg1-1) experimental; urgency=low
 
   * New upstream release;

Modified: branches/experimental/debian/rules
===================================================================
--- branches/experimental/debian/rules	2008-08-22 13:56:27 UTC (rev 69)
+++ branches/experimental/debian/rules	2008-08-27 20:07:43 UTC (rev 70)
@@ -13,9 +13,9 @@
 DESTDIR="$(CURDIR)/debian/tmp"
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-        NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+MAKEFLAGS += -j$(NUMJOBS)
 endif
-MAKEFLAGS += -j$(NUMJOBS)
 
 include /usr/share/quilt/quilt.make
 
@@ -45,7 +45,7 @@
 	-e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
 	-e '/^archive_cmds="/s/"$$/ \\$$deplibs"/'
 
-	$(MAKE) $(MAKEFLAGS)
+	$(MAKE)
 
 	touch build-stamp