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

Guillaume Delacour kcd-guest at alioth.debian.org
Sun Mar 14 16:42:12 UTC 2010 

Author: kcd-guest
Date: 2010-03-14 16:42:09 +0000 (Sun, 14 Mar 2010)
New Revision: 1341

Added:
   modules/trunk/php-imagick/debian/compat
Modified:
   modules/trunk/php-imagick/debian/TODO
   modules/trunk/php-imagick/debian/changelog
   modules/trunk/php-imagick/debian/control
   modules/trunk/php-imagick/debian/imagick.ini
   modules/trunk/php-imagick/debian/phpX-imagick.postinst
   modules/trunk/php-imagick/debian/phpX-imagick.postrm
   modules/trunk/php-imagick/debian/rules
   modules/trunk/php-imagick/debian/watch
Log:
New upstream release 3.0.0~rc1 to close many bugs and build ok with php 5.3

Modified: modules/trunk/php-imagick/debian/TODO
===================================================================
--- modules/trunk/php-imagick/debian/TODO	2010-03-13 06:39:31 UTC (rev 1340)
+++ modules/trunk/php-imagick/debian/TODO	2010-03-14 16:42:09 UTC (rev 1341)
@@ -5,5 +5,3 @@
 
 "configure: WARNING: You will need re2c 0.13.4 or later if you want to regenerate PHP parsers."
 in configure call during build.
-
-- Package last (but beta) version: 2.3.0RC2 (released on 2009-05-20)

Modified: modules/trunk/php-imagick/debian/changelog
===================================================================
--- modules/trunk/php-imagick/debian/changelog	2010-03-13 06:39:31 UTC (rev 1340)
+++ modules/trunk/php-imagick/debian/changelog	2010-03-14 16:42:09 UTC (rev 1341)
@@ -1,21 +1,30 @@
-php-imagick (2.2.2-1) unstable; urgency=low
+php-imagick (3.0.0~rc1-1) unstable; urgency=low
 
-  * New upstream release (Closes: #524863).
-  * New maintainer (Closes: #530621).
+  * New upstream release (Closes: #524863, #570649, #573139)
+  * New maintainer (Closes: #530621)
+  * Change Build-Depends from libmagick9-dev to libmagickwand-dev
+    (Thanks Ivan Borzenkov)
   * debian/rules:
-    + Add rm -f *.cdbs-config_list to clean rule.
-    + Add "debian/" to generated post{inst,rm} in clean rule.
-    + Delete "/usr/share/cdbs/1/rules/tarball.mk" (source is now a dir)
-      and move "phpize --clean" to clean rule.
-    + Delete "--with-regex" and "--disable-rpath" (enable by default)
-      in configure call (unrecognized options).
-    + Delete lintian override (no-shlibs-control-file).
-  * Bump to Standards-Version 3.8.2 (move section from web to php).
-  * Suppress unless end-of-line spaces (Thanks Denis Briand).
-  * Bump to compatibility 7 in debian/{control,compat}.
-  * add "set -e" (instead of "#!/bin/sh -e") in post{inst,rm} files.
+    + 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)
+  * 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}:
+    + add "set -e" (instead of "#!/bin/sh -e")
+    + comment loading on remove (Closes: #498150)
+    (Thanks Ivan Borzenkov)
+  * debian/imagick.ini: change comment style from "#" to ";"
+    (Closes: #563433, #566970, thanks Thijs Kinkhorst)
+  * debian/{changelog,copyright}: suppress unnecessary spaces
 
- -- Guillaume Delacour <gui at iroqwa.org>  Tue, 06 Jul 2009 08:27:34 +0000
+ -- Guillaume Delacour <gui at iroqwa.org>  Tue, 09 Mar 2010 17:58:50 +0000
 
 php-imagick (2.1.1RC1-1) unstable; urgency=low
 

Added: modules/trunk/php-imagick/debian/compat
===================================================================
--- modules/trunk/php-imagick/debian/compat	                        (rev 0)
+++ modules/trunk/php-imagick/debian/compat	2010-03-14 16:42:09 UTC (rev 1341)
@@ -0,0 +1 @@
+7

Modified: modules/trunk/php-imagick/debian/control
===================================================================
--- modules/trunk/php-imagick/debian/control	2010-03-13 06:39:31 UTC (rev 1340)
+++ modules/trunk/php-imagick/debian/control	2010-03-14 16:42:09 UTC (rev 1341)
@@ -3,8 +3,8 @@
 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>
-Build-Depends: debhelper (>= 7), php5-dev, libmagick9-dev, cdbs
-Standards-Version: 3.8.2
+Build-Depends: debhelper (>= 7), php5-dev, libmagickwand-dev, cdbs
+Standards-Version: 3.8.4
 Homepage: http://pecl.php.net/package/imagick
 
 Package: php5-imagick

Modified: modules/trunk/php-imagick/debian/imagick.ini
===================================================================
--- modules/trunk/php-imagick/debian/imagick.ini	2010-03-13 06:39:31 UTC (rev 1340)
+++ modules/trunk/php-imagick/debian/imagick.ini	2010-03-14 16:42:09 UTC (rev 1341)
@@ -1,2 +1,2 @@
-# configuration for php imagick module
+; configuration for php imagick module
 extension=imagick.so

Modified: modules/trunk/php-imagick/debian/phpX-imagick.postinst
===================================================================
--- modules/trunk/php-imagick/debian/phpX-imagick.postinst	2010-03-13 06:39:31 UTC (rev 1340)
+++ modules/trunk/php-imagick/debian/phpX-imagick.postinst	2010-03-14 16:42:09 UTC (rev 1341)
@@ -1,10 +1,17 @@
-#! /bin/sh
+#!/bin/sh
 set -e
 
-if test "$1" = "configure"; then
-    ucf /usr/share/phpX-imagick/imagick.ini-dist /etc/phpX/conf.d/imagick.ini
+# uncomment module loading (install after remove case)
+if test -e /etc/phpX/conf.d/imagick.ini
+then
+	sed -i s/\;extension/extension/g /etc/phpX/conf.d/imagick.ini
 fi
 
+if test "$1" = "configure"
+then
+	ucf /usr/share/phpX-imagick/imagick.ini-dist /etc/phpX/conf.d/imagick.ini
+fi
+
 #DEBHELPER#
 
 exit 0

Modified: modules/trunk/php-imagick/debian/phpX-imagick.postrm
===================================================================
--- modules/trunk/php-imagick/debian/phpX-imagick.postrm	2010-03-13 06:39:31 UTC (rev 1340)
+++ modules/trunk/php-imagick/debian/phpX-imagick.postrm	2010-03-14 16:42:09 UTC (rev 1341)
@@ -1,13 +1,21 @@
-#! /bin/sh
+#!/bin/sh
 set -e
 
-if test "$1" = "purge"; then
-    if which ucf >/dev/null 2>&1; then
-        ucf --purge /etc/phpX/conf.d/imagick.ini
-    fi
-    rm -f /etc/phpX/conf.d/imagick.ini
+# if just removing the package, comment out the module loading
+if test "$1" = "remove"
+then
+	sed -i s/extension/\;extension/g /etc/phpX/conf.d/imagick.ini
 fi
 
+if test "$1" = "purge"
+then
+	if which ucf >/dev/null 2>&1
+	then
+		ucf --purge /etc/phpX/conf.d/imagick.ini
+	fi
+	rm -f /etc/phpX/conf.d/imagick.ini
+fi
+
 #DEBHELPER#
 
 exit 0

Modified: modules/trunk/php-imagick/debian/rules
===================================================================
--- modules/trunk/php-imagick/debian/rules	2010-03-13 06:39:31 UTC (rev 1340)
+++ modules/trunk/php-imagick/debian/rules	2010-03-14 16:42:09 UTC (rev 1341)
@@ -1,7 +1,8 @@
 #!/usr/bin/make -f
 
-DEB_SRCDIR := $(shell basename imagick-*)
+DEB_TAR_SRCDIR := $(shell basename $(wildcard *.tgz) .tgz)
 
+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)
@@ -16,11 +17,11 @@
 patch: apply-patches
 
 clean::
-	rm -f debian/php[5]-imagick.postrm debian/php[5]-imagick.postinst
-	cd $(DEB_SRCDIR) && phpize --clean
+	rm -f debian/php[5]-imagick.postrm \
+		debian/php[5]-imagick.postinst *.cdbs*
 
 configure_for_php%:
-	cd $(DEB_SRCDIR) && phpize && \
+	cd $(DEB_SRCDIR) && phpize --clean && 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
@@ -41,3 +42,8 @@
 
 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

Modified: modules/trunk/php-imagick/debian/watch
===================================================================
--- modules/trunk/php-imagick/debian/watch	2010-03-13 06:39:31 UTC (rev 1340)
+++ modules/trunk/php-imagick/debian/watch	2010-03-14 16:42:09 UTC (rev 1341)
@@ -1,2 +1,3 @@
 version=3
-http://pecl.php.net/package/imagick /get/imagick-(.+)\.tgz
+#http://pecl.php.net/package/imagick /get/imagick-(.+)\.tgz
+http://pecl.php.net/package/imagick /get/imagick-([\d.bRC]+)\.tgz

More information about the Pkg-php-commits mailing list