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

[Guillaume Delacour]

Author: kcd-guest
Date: 2010-04-09 18:42:21 +0000 (Fri, 09 Apr 2010)
New Revision: 1363

Added:
   modules/trunk/php-imagick/debian/source/
Removed:
   modules/trunk/php-imagick/debian/TODO
Modified:
   modules/trunk/php-imagick/debian/
   modules/trunk/php-imagick/debian/changelog
   modules/trunk/php-imagick/debian/control
   modules/trunk/php-imagick/debian/rules
   modules/trunk/php-imagick/debian/watch
Log:
Raphael suggestions


Property changes on: modules/trunk/php-imagick/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Deleted: modules/trunk/php-imagick/debian/TODO
===================================================================
--- modules/trunk/php-imagick/debian/TODO	2010-03-29 19:26:18 UTC (rev 1362)
+++ modules/trunk/php-imagick/debian/TODO	2010-04-09 18:42:21 UTC (rev 1363)
@@ -1,7 +0,0 @@
-TODO
------------------
-
-- Provide re2c support:
-
-"configure: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers."
-in configure call during build.

Modified: modules/trunk/php-imagick/debian/changelog
===================================================================
--- modules/trunk/php-imagick/debian/changelog	2010-03-29 19:26:18 UTC (rev 1362)
+++ modules/trunk/php-imagick/debian/changelog	2010-04-09 18:42:21 UTC (rev 1363)
@@ -7,13 +7,13 @@
   * debian/rules:
     + Add rm -f *.cdbs-config_list (*.cdbs*) to clean rule
     + Fix generated path of debian/post{inst,rm} in clean rule
-    + Include "/usr/share/cdbs/1/rules/tarball.mk" to build with tar source
-      (Thanks Ivan Borzenkov)
     + Delete "--with-regex" and "--disable-rpath" options (enabled by default)
       in configure call (unrecognized options)
     + Delete lintian override (no-shlibs-control-file)
     + 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
   * 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}:
@@ -23,6 +23,7 @@
   * debian/imagick.ini: change comment style from "#" to ";"
     (Closes: #563433, #566970, thanks Thijs Kinkhorst)
   * debian/{changelog,copyright}: suppress unnecessary spaces
+  * Switch to dpkg-source 3.0 (quilt) format
 
  -- Guillaume Delacour <gui at iroqwa.org>  Tue, 09 Mar 2010 17:58:50 +0000
 

Modified: modules/trunk/php-imagick/debian/control
===================================================================
--- modules/trunk/php-imagick/debian/control	2010-03-29 19:26:18 UTC (rev 1362)
+++ modules/trunk/php-imagick/debian/control	2010-04-09 18:42:21 UTC (rev 1363)
@@ -2,7 +2,7 @@
 Section: php
 Priority: optional
 Maintainer: Debian PHP Maintainers <pkg-php-maint at lists.alioth.debian.org>
-Uploaders: Ola Lundqvist <opal at debian.org>, Guillaume Delacour <gui at iroqwa.org>
+Uploaders: Guillaume Delacour <gui at iroqwa.org>
 Build-Depends: debhelper (>= 7), php5-dev, libmagickwand-dev, cdbs
 Standards-Version: 3.8.4
 Homepage: http://pecl.php.net/package/imagick

Modified: modules/trunk/php-imagick/debian/rules
===================================================================
--- modules/trunk/php-imagick/debian/rules	2010-03-29 19:26:18 UTC (rev 1362)
+++ modules/trunk/php-imagick/debian/rules	2010-04-09 18:42:21 UTC (rev 1363)
@@ -1,8 +1,7 @@
 #!/usr/bin/make -f
 
-DEB_TAR_SRCDIR := $(shell basename $(wildcard *.tgz) .tgz)
+DEB_SRCDIR := $(shell basename imagick-*)
 
-include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 PHP_EX5=$(shell /usr/bin/php-config5 --extension-dir)
@@ -14,14 +13,13 @@
 # local hacks
 #
 
-patch: apply-patches
-
 clean::
 	rm -f debian/php[5]-imagick.postrm \
 		debian/php[5]-imagick.postinst *.cdbs*
+	cd $(DEB_SRCDIR) && phpize --clean
 
 configure_for_php%:
-	cd $(DEB_SRCDIR) && phpize --clean && phpize && \
+	cd $(DEB_SRCDIR) && phpize && \
 	    ./configure --with-imagick --with-php-config=/usr/bin/php-config$* \
 	    --disable-static --with-imagick=shared,/usr
 	sed -e 's/phpX/php$*/g' < debian/phpX-imagick.postinst > debian/php$*-imagick.postinst
@@ -37,7 +35,7 @@
 	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
+	cp debian/imagick.ini debian/php$1-imagick/usr/share/php$1-imagick/imagick.ini-dist
 endef
 
 install/php5-imagick:: configure_for_php5

Modified: modules/trunk/php-imagick/debian/watch
===================================================================
--- modules/trunk/php-imagick/debian/watch	2010-03-29 19:26:18 UTC (rev 1362)
+++ modules/trunk/php-imagick/debian/watch	2010-04-09 18:42:21 UTC (rev 1363)
@@ -1,2 +1,3 @@
 version=3
-http://pecl.php.net/package/imagick /get/imagick-(.+)\.tgz
+opts="uversionmangle=s/RC/rc/,dversionmangle=s/~//" \
+	http://pecl.php.net/package/imagick /get/imagick-(.+)\.tgz