[php-maint] Bug#542906: NMU uploaded
Andreas Barth
aba at not.so.argh.org
Sun Aug 30 10:48:14 UTC 2009
Hi,
I uploaded an NMU of your package.
Please see this as help to get the package into a releaseable condition again.
Please find the used diff below.
Cheers,
Andi
diff -u php5-5.2.10.dfsg.1/debian/changelog php5-5.2.10.dfsg.1/debian/changelog
--- php5-5.2.10.dfsg.1/debian/changelog
+++ php5-5.2.10.dfsg.1/debian/changelog
@@ -1,3 +1,11 @@
+php5 (5.2.10.dfsg.1-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTBFS with new autoconf. Thanks to Russ Allbery for the patch.
+ Closes: #542906
+
+ -- Andreas Barth <aba at not.so.argh.org> Sun, 30 Aug 2009 13:49:40 +0200
+
php5 (5.2.10.dfsg.1-2) unstable; urgency=low
* Declare that PEAR replaces XML_UTIL (Closes: #534621)
only in patch2:
unchanged:
--- php5-5.2.10.dfsg.1.orig/configure.in
+++ php5-5.2.10.dfsg.1/configure.in
@@ -1,7 +1,7 @@
## $Id: configure.in,v 1.579.2.52.2.139 2009/06/17 12:22:41 iliaa Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
-divert(1)
+dnl divert(1)
dnl ## Diversion 1 is the autoconf + automake setup phase. We also
dnl ## set the PHP version, deal with platform-specific compile
@@ -23,16 +23,16 @@
dnl ## All of these are normally in the extension directories.
dnl ## Diversion 5 is the last one. Here we generate files and clean up.
-dnl include Zend specific macro definitions first
-dnl -------------------------------------------------------------------------
-sinclude(Zend/acinclude.m4)
-
dnl Basic autoconf + automake initialization, generation of config.nice.
dnl -------------------------------------------------------------------------
AC_PREREQ(2.13)
AC_INIT(README.CVS-RULES)
+dnl include Zend specific macro definitions first
+dnl -------------------------------------------------------------------------
+sinclude(Zend/acinclude.m4)
+
PHP_CONFIG_NICE(config.nice)
PHP_CANONICAL_HOST_TARGET
@@ -263,7 +263,7 @@
sinclude(TSRM/tsrm.m4)
-divert(2)
+dnl divert(2)
dnl ## Diversion 2 is where we set PHP-specific options and come up
dnl ## with reasonable default values for them. We check for pthreads here
@@ -302,7 +302,7 @@
PTHREADS_FLAGS
fi
-divert(3)
+dnl divert(3)
dnl ## In diversion 3 we check for compile-time options to the PHP
dnl ## core and how to deal with different system dependencies.
@@ -661,7 +661,7 @@
PHP_CRYPT_R_STYLE
fi
-divert(4)
+dnl divert(4)
dnl ## In diversion 4 we check user-configurable general settings.
@@ -902,7 +902,7 @@
AC_MSG_RESULT([using system default])
fi
-divert(5)
+dnl divert(5)
dnl ## In diversion 5 we check which extensions should be compiled.
dnl ## All of these are normally in the extension directories.
only in patch2:
unchanged:
--- php5-5.2.10.dfsg.1.orig/scripts/phpize.m4
+++ php5-5.2.10.dfsg.1/scripts/phpize.m4
@@ -1,6 +1,6 @@
dnl This file becomes configure.in for self-contained extensions.
-divert(1)
+dnl divert(1)
AC_PREREQ(2.13)
AC_INIT(config.m4)
only in patch2:
unchanged:
--- php5-5.2.10.dfsg.1.orig/ext/standard/config.m4
+++ php5-5.2.10.dfsg.1/ext/standard/config.m4
@@ -1,6 +1,6 @@
dnl $Id: config.m4,v 1.80.2.3.2.3 2007/07/11 11:56:03 jani Exp $ -*- autoconf -*-
-divert(3)dnl
+dnl divert(3)dnl
dnl
dnl Check if flush should be called explicitly after buffered io
@@ -205,7 +205,7 @@
AC_CHECK_FUNCS(getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan)
AC_FUNC_FNMATCH
-divert(5)dnl
+dnl divert(5)dnl
dnl
dnl Check for regex library type
More information about the pkg-php-maint
mailing list