[Pkg-php-commits] r1127 - in php5/trunk/debian: . patches
Raphael Geissert
atomo64-guest at alioth.debian.org
Fri Jul 25 02:57:06 UTC 2008
tags 471548 pending
tags 478995 pending
thanks
Author: atomo64-guest
Date: 2008-07-25 02:57:06 +0000 (Fri, 25 Jul 2008)
New Revision: 1127
Added:
php5/trunk/debian/patches/bad_whatis_entries.patch
Modified:
php5/trunk/debian/changelog
php5/trunk/debian/control
php5/trunk/debian/libapache2-mod-php5.postinst
php5/trunk/debian/libapache2-mod-php5.prerm
php5/trunk/debian/libapache2-mod-php5filter.postinst
php5/trunk/debian/libapache2-mod-php5filter.prerm
php5/trunk/debian/patches/series
php5/trunk/debian/rules
Log:
debian/rules:
+ Avoid installing useless test suites in php-pear (Closes: #478995)
+ Remove any empty directory in php-pear
+ Also get rid of usr/share/php/data/Structures_Graph/*
- Those were meant to be used by upstream maintainer
debian/php5-dev.lintian-overrides:
- usr/lib/php5/build/run-tests.php is not meant to be used directly
debian/control: bumped Standards Version to 3.8.0, no changes needed
bad_whatis_entries.patch: fixes the whatis entries of all the manpages
debian/libapache2-mod-php5*-{prerm,postinst}:
- Create a status file when removing the package (but not purging)
while having the mod enabled so reinstallation of the package
does not end up disabling the module (Closes: #471548)
Modified: php5/trunk/debian/changelog
===================================================================
--- php5/trunk/debian/changelog 2008-07-23 15:56:01 UTC (rev 1126)
+++ php5/trunk/debian/changelog 2008-07-25 02:57:06 UTC (rev 1127)
@@ -6,6 +6,21 @@
* Drop unneeded php5-timezonedb Suggests and obsolete php3 Conflicts.
* Add documentation about the timezonedb change (Closes: #492025).
+ [ Raphael Geissert ]
+ * debian/rules:
+ + Avoid installing useless test suites in php-pear (Closes: #478995)
+ + Remove any empty directory in php-pear
+ + Also get rid of usr/share/php/data/Structures_Graph/*
+ - Those were meant to be used by upstream maintainer
+ * debian/php5-dev.lintian-overrides:
+ - usr/lib/php5/build/run-tests.php is not meant to be used directly
+ * debian/control: bumped Standards Version to 3.8.0, no changes needed
+ * bad_whatis_entries.patch: fixes the whatis entries of all the manpages
+ * debian/libapache2-mod-php5*-{prerm,postinst}:
+ - Create a status file when removing the package (but not purging)
+ while having the mod enabled so reinstallation of the package
+ does not end up disabling the module (Closes: #471548)
+
-- Thijs Kinkhorst <thijs at debian.org> Wed, 23 Jul 2008 17:44:09 +0200
php5 (5.2.6-2) unstable; urgency=high
Modified: php5/trunk/debian/control
===================================================================
--- php5/trunk/debian/control 2008-07-23 15:56:01 UTC (rev 1126)
+++ php5/trunk/debian/control 2008-07-25 02:57:06 UTC (rev 1127)
@@ -5,7 +5,7 @@
Uploaders: Adam Conrad <adconrad at 0c3.net>, Jeroen van Wolffelaar <jeroen at wolffelaar.nl>, Ondřej Surý <ondrej at debian.org>, Sean Finney <seanius at debian.org>
Build-Depends: apache2-prefork-dev, autoconf, automake1.4, bison, chrpath, debhelper (>= 5), firebird2.0-dev [i386 amd64 powerpc sparc] | firebird1.5-dev [i386 amd64] | firebird2-dev [i386 amd64], flex, freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev, libc-client-dev, libcurl4-openssl-dev | libcurl-dev, libdb4.6-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev, libgmp3-dev, libjpeg62-dev, libkrb5-dev, libldap2-dev, libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng12-dev, libpq-dev, libpspell-dev, librecode-dev, libsasl2-dev, libsnmp-dev, libsqlite0-dev, libssl-dev, libt1-dev, libtidy-dev, libtool, libwrap0-dev, libxmltok1-dev, libxml2-dev, libxslt1-dev (>= 1.0.18), quilt, re2c, unixodbc-dev, zlib1g-dev, tzdata
Build-Conflicts: bind-dev
-Standards-Version: 3.7.3
+Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/pkg-php/php5/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-php/php5/trunk
Homepage: http://www.php.net/
Modified: php5/trunk/debian/libapache2-mod-php5.postinst
===================================================================
--- php5/trunk/debian/libapache2-mod-php5.postinst 2008-07-23 15:56:01 UTC (rev 1126)
+++ php5/trunk/debian/libapache2-mod-php5.postinst 2008-07-25 02:57:06 UTC (rev 1127)
@@ -41,6 +41,10 @@
}
if [ -n "$2" ]; then
+ # recover the previous state
+ if [ -e /etc/php5/apache2/.start ]; then
+ a2enmod php5 >/dev/null || true
+ fi
# we're upgrading. test if we're enabled, and if so, restart to reload the module.
if [ -e /etc/apache2/mods-enabled/php5.load ]; then
reload_apache
Modified: php5/trunk/debian/libapache2-mod-php5.prerm
===================================================================
--- php5/trunk/debian/libapache2-mod-php5.prerm 2008-07-23 15:56:01 UTC (rev 1126)
+++ php5/trunk/debian/libapache2-mod-php5.prerm 2008-07-25 02:57:06 UTC (rev 1127)
@@ -9,7 +9,16 @@
fi
if [ -e /etc/apache2/apache2.conf ]; then
+ if [ -e /etc/apache2/mods-enabled/php5.load ]; then
+ # set a flag to remember the original state
+ # useful when reinstalling the same version.
+ touch /etc/php5/apache2/.start
+ fi
a2dismod php5 || true
fi
+if [ "$1" = "purge" ]; then
+ rm -f /etc/php5/apache2/.start
+fi
+
exit 0
Modified: php5/trunk/debian/libapache2-mod-php5filter.postinst
===================================================================
--- php5/trunk/debian/libapache2-mod-php5filter.postinst 2008-07-23 15:56:01 UTC (rev 1126)
+++ php5/trunk/debian/libapache2-mod-php5filter.postinst 2008-07-25 02:57:06 UTC (rev 1127)
@@ -22,6 +22,10 @@
}
if [ -n "$2" ]; then
+ # recover the previous state
+ if [ -e /etc/php5/apache2filter/.start ]; then
+ a2enmod php5filter >/dev/null || true
+ fi
# we're upgrading. test if we're enabled, and if so, restart to reload the module.
if [ -e /etc/apache2/mods-enabled/php5filter.load ]; then
reload_apache
Modified: php5/trunk/debian/libapache2-mod-php5filter.prerm
===================================================================
--- php5/trunk/debian/libapache2-mod-php5filter.prerm 2008-07-23 15:56:01 UTC (rev 1126)
+++ php5/trunk/debian/libapache2-mod-php5filter.prerm 2008-07-25 02:57:06 UTC (rev 1127)
@@ -9,7 +9,16 @@
fi
if [ -e /etc/apache2/apache2.conf ]; then
+ if [ -e /etc/apache2/mods-enabled/php5.load ]; then
+ # set a flag to remember the original state
+ # useful when reinstalling the same version.
+ touch /etc/php5/apache2filter/.start
+ fi
a2dismod php5filter || true
fi
+if [ "$1" = "purge" ]; then
+ rm -f /etc/php5/apache2filter/.start
+fi
+
exit 0
Added: php5/trunk/debian/patches/bad_whatis_entries.patch
===================================================================
--- php5/trunk/debian/patches/bad_whatis_entries.patch (rev 0)
+++ php5/trunk/debian/patches/bad_whatis_entries.patch 2008-07-25 02:57:06 UTC (rev 1127)
@@ -0,0 +1,35 @@
+Index: php5-5.2.6/sapi/cli/php.1.in
+===================================================================
+--- php5-5.2.6.orig/sapi/cli/php.1.in
++++ php5-5.2.6/sapi/cli/php.1.in
+@@ -1,6 +1,5 @@
+ .TH PHP 1 "2008" "The PHP Group" "Scripting Language"
+ .SH NAME
+-.TP 15
+ php \- PHP Command Line Interface 'CLI'
+ .SH SYNOPSIS
+ .B php
+Index: php5-5.2.6/scripts/man1/php-config.1.in
+===================================================================
+--- php5-5.2.6.orig/scripts/man1/php-config.1.in
++++ php5-5.2.6/scripts/man1/php-config.1.in
+@@ -1,6 +1,5 @@
+ .TH php\-config 1 "2006" "The PHP Group" "Scripting Language"
+ .SH NAME
+-.TP 15
+ php\-config \- get information about PHP configuration and compile options
+ .SH SYNOPSIS
+ .B php\-config
+Index: php5-5.2.6/scripts/man1/phpize.1.in
+===================================================================
+--- php5-5.2.6.orig/scripts/man1/phpize.1.in
++++ php5-5.2.6/scripts/man1/phpize.1.in
+@@ -1,7 +1,6 @@
+ .TH phpize 1 "2006" "The PHP Group" "Scripting Language"
+ .SH NAME
+-.TP 15
+-phpize - prepare a PHP extension for compiling
++phpize \- prepare a PHP extension for compiling
+ .SH SYNOPSIS
+ .B phpize
+ [options]
Modified: php5/trunk/debian/patches/series
===================================================================
--- php5/trunk/debian/patches/series 2008-07-23 15:56:01 UTC (rev 1126)
+++ php5/trunk/debian/patches/series 2008-07-25 02:57:06 UTC (rev 1127)
@@ -33,3 +33,4 @@
tzdb-nofree_ents_ifnotzdata.patch
CVE-2008-2829.patch
libedit_is_editline.patch
+bad_whatis_entries.patch
Modified: php5/trunk/debian/rules
===================================================================
--- php5/trunk/debian/rules 2008-07-23 15:56:01 UTC (rev 1126)
+++ php5/trunk/debian/rules 2008-07-25 02:57:06 UTC (rev 1127)
@@ -30,7 +30,7 @@
export QUILT_DIFF_OPTS QUILT_NO_DIFF_TIMESTAMPS
PROG_SENDMAIL = /usr/sbin/sendmail
-CFLAGS = -O2 -Wall -fsigned-char -fno-strict-aliasing
+CFLAGS += -O2 -Wall -fsigned-char -fno-strict-aliasing
# LFS support
ifneq (yes,$(PHP5_COMPAT))
CFLAGS += $(shell getconf LFS_CFLAGS)
@@ -385,7 +385,7 @@
main/win95nt.h
# install PEAR
- cp -r pear-build/* debian/php-pear/
+ cp -a pear-build/* debian/php-pear/
# everything under usr/share/php/data except 'PEAR' is b0rken
# and actually needs to be fixed
@@ -393,8 +393,15 @@
$(RM) debian/php-pear/usr/share/php/data/Structures_Graph/LICENSE
[ ! -f debian/php-pear/usr/share/php/doc/PEAR/INSTALL ] || \
$(RM) debian/php-pear/usr/share/php/doc/PEAR/INSTALL
+ for f in Structures_Graph/publish.sh Structures_Graph/package.sh \
+ Structures_Graph/genpackage.xml.pl; do \
+ $(RM) debian/php-pear/usr/share/php/data/$$f; \
+ done
+ # we don't want test suites
+ $(RM) -r debian/php-pear/usr/share/php/test/
[ -d debian/php-pear/usr/share/php/doc ] && { \
- mv debian/php-pear/usr/share/php/doc/* debian/php-pear/usr/share/doc/php-pear/PEAR/; \
+ mv debian/php-pear/usr/share/php/doc/* \
+ debian/php-pear/usr/share/doc/php-pear/PEAR/; \
$(RM) -r debian/php-pear/usr/share/php/doc; \
ln -s ../doc/php-pear/PEAR debian/php-pear/usr/share/php/doc; \
}
@@ -458,6 +465,7 @@
# install lintian overrides
cp debian/php5.lintian-overrides $(CURDIR)/debian/php5-common/usr/share/lintian/overrides/php5-common
+ cp debian/php5-dev.lintian-overrides $(CURDIR)/debian/php5-dev/usr/share/lintian/overrides/php5-dev
# install some generic lintian overrides
ext=`debian/php5-dev/usr/bin/php-config5 --extension-dir | cut -b2- `; \
@@ -465,11 +473,12 @@
mkdir -p $(CURDIR)/debian/"$$sapi"/usr/share/lintian/overrides/; \
printf "%s: package-contains-empty-directory %s/\n" \
"$$sapi" "$${ext}" \
- > $(CURDIR)/debian/"$$sapi"/usr/share/lintian/overrides/"$$sapi"; \
+ >> $(CURDIR)/debian/"$$sapi"/usr/share/lintian/overrides/"$$sapi"; \
done
# directories cleanup:
-rmdir -p debian/libapache2-mod-php5/usr/share/man/man1
+ -find debian/php-pear -type d -exec rmdir --ignore-fail-on-non-empty -p '{}' \; >/dev/null 2>&1
touch install-stamp
More information about the Pkg-php-commits
mailing list