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

[Nelson A. de Oliveira]

Author: naoliv
Date: 2010-01-15 23:07:02 +0000 (Fri, 15 Jan 2010)
New Revision: 115

Modified:
   trunk/debian/rules
Log:
Small fixes in debian/rules


Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2010-01-15 20:01:22 UTC (rev 114)
+++ trunk/debian/rules	2010-01-15 23:07:02 UTC (rev 115)
@@ -25,6 +25,7 @@
 	--prefix=/usr \
 	--mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info \
+	--with-modules \
 	--with-gs-font-dir=/usr/share/fonts/type1/gsfonts \
 	--with-magick-plus-plus \
 	--with-djvu \
@@ -66,11 +67,10 @@
 		unset DISPLAY; \
 		LD_LIBRARY_PATH="$(CURDIR)/magick/.libs:$(CURDIR)/wand/.libs:$(CURDIR)/Magick++/lib/.libs:$$LD_LIBRARY_PATH" \
 		$(MAKE) check LD_RUN_PATH= && echo "*** Testsuite succeeded ***" || echo "*** Testsuite failed ***"; \
+		cat test-suite.log; \
 	else \
 		echo "Skipping regression tests because we appear to be cross-compiling"; \
 	fi
-	# Show all the tests that were run
-	cat test-suite.log
 endif
 
 	touch check-stamp
@@ -138,8 +138,8 @@
 	dh_install
 	# Remove extra coders
 	while read FILE; do \
-		rm -f debian/libmagickcore2/$$FILE; \
-	done < debian/libmagickcore2-extra.install
+		rm -f debian/libmagickcore3/$$FILE; \
+	done < debian/libmagickcore3-extra.install
 	dh_installmenu
 	dh_installman
 	dh_installmime