Imported Debian patch 5.2.4-2debian/5.2.4-2

1 files changed, 17 insertions, 14 deletions

diff --git a/debian/rules b/debian/rules
index 17f9b93da..3d679f113 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,6 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-# This is the debhelper compatability version to use.
-export DH_COMPAT=4
-
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
@@ -62,8 +59,8 @@ ifeq ($(wildcard /usr/share/file/magic.mime), /usr/share/file/magic.mime)
 MAGIC_MIME = /usr/share/file/magic.mime
 endif
 
-# only enable interbase support for i386/amd64
-ifneq (,$(filter $(DEB_BUILD_ARCH),amd64 i386))
+# only enable interbase support for i386/amd64/powerpc/sparc
+ifneq (,$(filter $(DEB_BUILD_ARCH),amd64 i386 powerpc sparc))
 	IBFLAGS=--with-interbase=shared,/usr \
 		--with-pdo-firebird=shared,/usr
 endif
@@ -129,16 +126,18 @@ prepared-stamp: $(QUILT_STAMPFN)
 unprepared:
 	dh_testdir
 	sed -i -e 's/EXTRA_VERSION="-$(PHP5_DEBIAN_REVISION)"/EXTRA_VERSION=""/' configure.in
-	if [ -f prepared-stamp ]; then \
-		rm -f aclocal.m4 config.sub config.guess ltmain.sh; \
-		./buildconf --force; \
-	fi
+	rm -f configure aclocal.m4 config.sub config.guess ltmain.sh
+	rm -f build/libtool.m4 main/php_config.h.in
 	rm -f prepared-stamp
 
-build: build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp
+test-results.txt:
+	mkdir -p temp_session_store
 	env NO_INTERACTION=1 TEST_PHP_CGI_EXECUTABLE=./cgi-build/sapi/cgi/cgi-bin.php5 TEST_PHP_EXECUTABLE=./apache2-build/sapi/cli/php ./apache2-build/sapi/cli/php run-tests.php > test-results.txt
+	rm -rf temp_session_store
 	cat test-results.txt
 
+build: build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp test-results.txt
+
 build-apache2-stamp: configure-apache2-stamp
 	dh_testdir
 	cd apache2-build && $(MAKE)
@@ -280,9 +279,11 @@ configure-cli-stamp: prepared-stamp
 	   Zend/
 	touch configure-cli-stamp
 
-clean: unprepared
+clean: unprepared unpatch
 	dh_testdir
 	dh_testroot
+
+
 	rm -f configure-apache2-stamp build-apache2-stamp
 	rm -f configure-cgi-stamp build-cgi-stamp
 	rm -f configure-cli-stamp build-cli-stamp
@@ -293,6 +294,7 @@ clean: unprepared
 	rm -rf cli-build
 	rm -rf pear-build
 	rm -f debian/copyright
+	rm -f test-results.txt
 	dh_clean
 	# clean up autogenerated cruft
 	cat debian/modulelist | while read package extname dsoname; do \
@@ -324,7 +326,7 @@ install: build
 
 	# sanitize php.ini file
 	cat php.ini-dist | tr "\t" " " > debian/php5-common/usr/share/php5/php.ini-dist
-	cat php.ini-dist | tr "\t" " " | sed -e'/memory_limit =/ s/8M/32M/g' > debian/php5-common/usr/share/php5/php.ini-dist.cli
+	cat php.ini-dist | tr "\t" " " | sed -e'/memory_limit =/ s/128M/32M/g' > debian/php5-common/usr/share/php5/php.ini-dist.cli
 	cat php.ini-dist | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-dist
 	cat php.ini-recommended | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-recommended
 	cat php.ini-paranoid | tr "\t" " " > debian/php5-common/usr/share/doc/php5-common/examples/php.ini-paranoid
@@ -397,6 +399,9 @@ install: build
 	# install common files
 	install -m755 debian/maxlifetime debian/php5-common/usr/lib/php5
 
+	# install lintian overrides
+	cp debian/php5.lintian-overrides $(CURDIR)/debian/php5-common/usr/share/lintian/overrides/php5-common
+
 	touch install-stamp
 
 # Build architecture-independent files here.
@@ -479,8 +484,6 @@ binary-arch: build install
 	dh_link -s
 	dh_compress -s -Xphp.ini
 	dh_fixperms -s -X /var/lib/php5
-	mkdir -p debian/php5-common/usr/share/lintian/overrides
-	echo "php5-common: non-standard-dir-perm var/lib/php5/ 1733 != 0755" >> debian/php5-common/usr/share/lintian/overrides/php5-common
 	mkdir -p debian/php5-common/usr/share/linda/overrides
 	echo "Tag: non-standard-dir-perm" >> debian/php5-common/usr/share/linda/overrides/php5-common
 	echo "Data: /var/lib/php5.*" >> debian/php5-common/usr/share/linda/overrides/php5-common