[Pkg-php-commits] r879 - php5/trunk/debian

[Raphael Geissert]

tags 439286 pending
tags 440624 pending
thanks

Author: atomo64-guest
Date: 2007-09-19 23:25:11 +0000 (Wed, 19 Sep 2007)
New Revision: 879

Modified:
   php5/trunk/debian/changelog
   php5/trunk/debian/php5-common.php5.cron.d
   php5/trunk/debian/rules
Log:
Using test-results.txt as a target
cronjob now checks for existance of /usr/lib/php5/maxlifetime (Closes: #439286)
Fixed memory limit of 1232M in php.ini for cli (Closes: #440624)

Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog	2007-09-19 21:17:14 UTC (rev 878)
+++ php5/trunk/debian/changelog	2007-09-19 23:25:11 UTC (rev 879)
@@ -1,9 +1,15 @@
 php5 (5.2.4-2) UNRELEASED; urgency=low
 
+  [ sean finney ]
   * NOT RELEASED YET
 
- -- sean finney <seanius at debian.org>  Sun, 16 Sep 2007 15:44:40 +0200
+  [ Raphael Geissert ]
+  * Using test-results.txt as a target
+  * cronjob now checks for existance of /usr/lib/php5/maxlifetime (Closes: #439286)
+  * Fixed memory limit of 1232M in php.ini for cli (Closes: #440624)
 
+ -- Raphael Geissert <atomo64 at gmail.com>  Wed, 19 Sep 2007 17:00:20 -0500
+
 php5 (5.2.4-1) unstable; urgency=low
 
   * New upstream release.

Modified: php5/trunk/debian/php5-common.php5.cron.d
===================================================================
--- php5/trunk/debian/php5-common.php5.cron.d	2007-09-19 21:17:14 UTC (rev 878)
+++ php5/trunk/debian/php5-common.php5.cron.d	2007-09-19 23:25:11 UTC (rev 879)
@@ -4,4 +4,4 @@
 #  files, or 24 minutes if not defined.  See /usr/lib/php5/maxlifetime
 
 # Look for and purge old sessions every 30 minutes
-09,39 *     * * *     root   [ -d /var/lib/php5 ] && find /var/lib/php5/ -type f -cmin +$(/usr/lib/php5/maxlifetime) -print0 | xargs -r -0 rm
+09,39 *     * * *     root   [ -x /usr/lib/php5/maxlifetime ] && [ -d /var/lib/php5 ] && find /var/lib/php5/ -type f -cmin +$(/usr/lib/php5/maxlifetime) -print0 | xargs -r -0 rm

Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules	2007-09-19 21:17:14 UTC (rev 878)
+++ php5/trunk/debian/rules	2007-09-19 23:25:11 UTC (rev 879)
@@ -135,10 +135,12 @@
 	fi
 	rm -f prepared-stamp
 
-build: build-apache2-stamp build-cgi-stamp build-cli-stamp build-pear-stamp
+test-results.txt:
 	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
 	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)
@@ -324,7 +326,7 @@
 
 	# 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