[Pkg-php-commits] r1423 - modules/trunk/php-imagick/debian

[Guillaume Delacour]

Author: kcd-guest
Date: 2010-05-31 19:18:53 +0000 (Mon, 31 May 2010)
New Revision: 1423

Modified:
   modules/trunk/php-imagick/debian/changelog
   modules/trunk/php-imagick/debian/rules
Log:
Rewrite debian/rules to be php5-oriented, lack time to made it any php-version-oriented

Modified: modules/trunk/php-imagick/debian/changelog
===================================================================
--- modules/trunk/php-imagick/debian/changelog	2010-05-24 11:49:56 UTC (rev 1422)
+++ modules/trunk/php-imagick/debian/changelog	2010-05-31 19:18:53 UTC (rev 1423)
@@ -5,7 +5,8 @@
   * Change Build-Depends from libmagick9-dev to libmagickwand-dev
     (Thanks Ivan Borzenkov)
   * debian/rules:
-    + Add rm -f *.cdbs-config_list (*.cdbs*) to clean rule
+    + Rewrite php5 oriented only, work in progress to adapt multi php version
+    + Remove tarball mode rules
     + Fix generated path of debian/post{inst,rm} in clean rule
     + Delete "--with-regex" and "--disable-rpath" options (enabled by default)
       in configure call (unrecognized options)
@@ -13,7 +14,7 @@
     + Touch examples/ and CREDITS in upstream tarball
       (lintian package-contains-ancient-file rule)
     + Delete unnecessary patch rule
-    + phpize --clean is now called in clean rule
+    + phpize5 --clean is now called in clean rule
   * Bump to Standards-Version 3.8.4 (move section from web to php)
   * Bump to compatibility 7 in debian/{control,compat}
   * debian/phpX-imagick.post{inst,rm}:
@@ -24,6 +25,7 @@
     (Closes: #563433, #566970, thanks Thijs Kinkhorst)
   * debian/{changelog,copyright}: suppress unnecessary spaces
   * Switch to dpkg-source 3.0 (quilt) format
+  * debian/watch: mangle version according Debian Policy 5.6.12
 
  -- Guillaume Delacour <gui at iroqwa.org>  Tue, 09 Mar 2010 17:58:50 +0000
 

Modified: modules/trunk/php-imagick/debian/rules
===================================================================
--- modules/trunk/php-imagick/debian/rules	2010-05-24 11:49:56 UTC (rev 1422)
+++ modules/trunk/php-imagick/debian/rules	2010-05-31 19:18:53 UTC (rev 1423)
@@ -14,34 +14,30 @@
 #
 
 clean::
-	rm -f debian/php[5]-imagick.postrm \
-		debian/php[5]-imagick.postinst *.cdbs*
-	cd $(DEB_SRCDIR) && phpize --clean
+	rm -f debian/php5-imagick.postrm \
+		debian/php5-imagick.postinst
+	cd $(DEB_SRCDIR) && phpize5 --clean
 
-configure_for_php%:
-	cd $(DEB_SRCDIR) && phpize && \
-	    ./configure --with-imagick --with-php-config=/usr/bin/php-config$* \
+configure_for_php5::
+	cd $(DEB_SRCDIR) && phpize5 && \
+	    ./configure --with-imagick --with-php-config=/usr/bin/php-config5 \
 	    --disable-static --with-imagick=shared,/usr
-	sed -e 's/phpX/php$*/g' < debian/phpX-imagick.postinst > debian/php$*-imagick.postinst
-	sed -e 's/phpX/php$*/g' < debian/phpX-imagick.postrm   > debian/php$*-imagick.postrm
+	sed -e 's/phpX/php5/g' < debian/phpX-imagick.postinst > debian/php5-imagick.postinst
+	sed -e 's/phpX/php5/g' < debian/phpX-imagick.postrm   > debian/php5-imagick.postrm
 
 #
 # cdbs things
 #
 
-define install_rule
+install/php5-imagick:: configure_for_php5
 	$(MAKE) -C $(DEB_SRCDIR)
-	mkdir -p debian/php$1-imagick$(PHP_EX$1)
-	install -m 644 -o root -g root $(DEB_SRCDIR)/modules/imagick.so debian/php$1-imagick$(PHP_EX$1)/imagick.so
-	echo "php$1:Depends=phpapi-`php-config$1 --phpapi`, php$1-common" >> debian/php$1-imagick.substvars
-	mkdir -p debian/php$1-imagick/usr/share/php$1-imagick/
-	cp debian/imagick.ini debian/php$1-imagick/usr/share/php$1-imagick/imagick.ini-dist
-endef
+	mkdir -p debian/php5-imagick$(PHP_EX5)
+	install -m 644 -o root -g root $(DEB_SRCDIR)/modules/imagick.so debian/php5-imagick$(PHP_EX5)/imagick.so
+	echo "php5:Depends=phpapi-`php-config5 --phpapi`, php5-common" >> debian/php5-imagick.substvars
+	mkdir -p debian/php5-imagick/usr/share/php5-imagick
+	cp debian/imagick.ini debian/php5-imagick/usr/share/php5-imagick/imagick.ini-dist
 
-install/php5-imagick:: configure_for_php5
-	$(call install_rule,5)
-
 # package-contains-ancient-file error (1970-01-01), update timestamp
-binary-post-install/php%-imagick::
-	touch debian/php$*-imagick/usr/share/doc/php$*-imagick/examples/*.php
-	touch debian/php$*-imagick/usr/share/doc/php$*-imagick/CREDITS
+binary-post-install/php5-imagick::
+	touch debian/php5-imagick/usr/share/doc/php5-imagick/examples/*.php
+	touch debian/php5-imagick/usr/share/doc/php5-imagick/CREDITS