Imported Debian patch 5.2.6-3debian/5.2.6-3

18 files changed, 262 insertions, 16 deletions

diff --git a/debian/NEWS b/debian/NEWS
index 37f1addd6..0f31b0000 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,18 +1,25 @@
 php5 (5.2.6-1) unstable; urgency=medium
 
-  New php5-dbg package.
+  * Now uses system timezone database.
+
+  Debian PHP now makes use of the system wide timezone database from the
+  tzdata package, making sure any updates there are automatically used
+  by PHP aswell. Note that this requires that the PHP process has access
+  to /etc/localtime and /usr/share/zoneinfo (this is usually the case).
+
+  * New php5-dbg package.
 
   We are now shipping a php5-dgb package which will greatly aid in finding
   the cause of many crashes that you may experience.  So if you are going to
   report a bug for a reproducible crash, please install this package before
   sending a backtrace.
 
-  New libapache2-mod-php5filter package.
+  * New libapache2-mod-php5filter package.
 
   We are now also shipping a new libapache2-mod-php5filter package which
   uses the "Apache 2.0 filter-module support via DSO through APXS".
 
- -- Sean Finney <seanius@debian.org>  Sun, 04 May 2008 13:58:20 +0200
+ -- Thijs Kinkhorst <thijs@debian.org>  Wed, 23 Jul 2008 17:42:06 +0200
 
 php5 (5.2.3-2) unstable; urgency=low
 
diff --git a/debian/changelog b/debian/changelog
index db35e8fa9..624cf0106 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,40 @@
+php5 (5.2.6-3) unstable; urgency=high
+
+  [ Thijs Kinkhorst ]
+  * Drop unneeded php5-timezonedb Suggests and obsolete php3 Conflicts.
+  * Add documentation about the timezonedb change (Closes: #492025).
+
+  [ Adam Conrad ]
+  * Modify 033-we_WANT_libtool.patch to cope with newer versions of
+    libtool that only copy auxilliary files when --install is used,
+    while still working with older versions that DTRT without.
+
+  [ 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
+  * deprecated_freetds_check.patch: fixes the freetds detection routine
+    + Closes: #494230
+    - Thanks to jklowden@freetds.org and the Gentoo folks for the patch
+      (RC bugfix, upload urgency bumped)
+  * 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)
+
+  [ Sean Finney ]
+  * Bump dependency on libmysqlclient15off to require the version from
+    lenny or later, in order to avoid subtle problems not previously detected
+    with libmysqlclient_r on mixed etch/lenny/sid systems (closes: #495575).
+
+ -- Sean Finney <seanius@debian.org>  Wed, 20 Aug 2008 19:32:02 +0200
+
 php5 (5.2.6-2) unstable; urgency=high
 
   [ Raphael Geissert ]
diff --git a/debian/control b/debian/control
index 266573ae2..25d5d6b2d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
 Uploaders: Adam Conrad <adconrad@0c3.net>, Jeroen van Wolffelaar <jeroen@wolffelaar.nl>, Ondřej Surý <ondrej@debian.org>, Sean Finney <seanius@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/
@@ -43,7 +43,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, ${apache2:Depends}, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
 Conflicts: libapache2-mod-php4, libapache2-mod-php5filter
 Provides: ${php:Provides}
-Suggests: php-pear, php5-timezonedb
+Suggests: php-pear
 Description: server-side, HTML-embedded scripting language (Apache 2 module)
  This package provides the PHP5 module for the Apache 2 webserver (as
  found in the apache2-mpm-prefork package).  Please note that this package
@@ -81,8 +81,7 @@ Package: php5-cgi
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
 Provides: ${php:Provides}
-Conflicts: php3 (<= 3.0.18-1)
-Suggests: php-pear, php5-timezonedb
+Suggests: php-pear
 Description: server-side, HTML-embedded scripting language (CGI binary)
  This package provides the /usr/lib/cgi-bin/php5 CGI interpreter built
  for use in Apache 2 with mod_actions, or any other CGI httpd that
@@ -100,8 +99,7 @@ Package: php5-cli
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, mime-support, php5-common (= ${binary:Version}), libmagic1, ucf, tzdata
 Provides: ${php:Provides}
-Conflicts: php3 (<= 3.0.18-1)
-Suggests: php-pear, php5-timezonedb
+Suggests: php-pear
 Description: command-line interpreter for the php5 scripting language
  This package provides the /usr/bin/php5 command interpreter, useful for
  testing PHP scripts from a shell, or perhaps even performing general
@@ -252,7 +250,7 @@ Description: MHASH module for php5
 
 Package: php5-mysql
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
+Depends: libmysqlclient15off (>= 5.0.51a), ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
 Conflicts: php5-mysqli
 Replaces: php5-mysqli
 Description: MySQL module for php5
diff --git a/debian/libapache2-mod-php5.postinst b/debian/libapache2-mod-php5.postinst
index 3a9ac5168..bea59d5c3 100644
--- a/debian/libapache2-mod-php5.postinst
+++ b/debian/libapache2-mod-php5.postinst
@@ -41,6 +41,10 @@ reload_apache()
 }
 
 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
diff --git a/debian/libapache2-mod-php5.postrm b/debian/libapache2-mod-php5.postrm
new file mode 100644
index 000000000..ae2b30708
--- /dev/null
+++ b/debian/libapache2-mod-php5.postrm
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" != "remove" -a "$1" != "purge" ]; then
+        exit 0
+fi
+
+if [ "$1" = "purge" ]; then
+    rm -f /etc/php5/apache2/.start
+fi
+
+exit 0
diff --git a/debian/libapache2-mod-php5.prerm b/debian/libapache2-mod-php5.prerm
index e8c9fd793..801e13c01 100644
--- a/debian/libapache2-mod-php5.prerm
+++ b/debian/libapache2-mod-php5.prerm
@@ -9,6 +9,11 @@ if [ "$1" != "remove" -a "$1" != "purge" ]; then
 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
 
diff --git a/debian/libapache2-mod-php5filter.postinst b/debian/libapache2-mod-php5filter.postinst
index f3ac845fa..ac7312959 100644
--- a/debian/libapache2-mod-php5filter.postinst
+++ b/debian/libapache2-mod-php5filter.postinst
@@ -22,6 +22,10 @@ reload_apache()
 }
 
 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
diff --git a/debian/libapache2-mod-php5filter.postrm b/debian/libapache2-mod-php5filter.postrm
new file mode 100644
index 000000000..ae2b30708
--- /dev/null
+++ b/debian/libapache2-mod-php5filter.postrm
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" != "remove" -a "$1" != "purge" ]; then
+        exit 0
+fi
+
+if [ "$1" = "purge" ]; then
+    rm -f /etc/php5/apache2/.start
+fi
+
+exit 0
diff --git a/debian/libapache2-mod-php5filter.prerm b/debian/libapache2-mod-php5filter.prerm
index ee3a9aefc..3d0e71aa6 100644
--- a/debian/libapache2-mod-php5filter.prerm
+++ b/debian/libapache2-mod-php5filter.prerm
@@ -9,6 +9,11 @@ if [ "$1" != "remove" -a "$1" != "purge" ]; then
 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
 
diff --git a/debian/maxlifetime b/debian/maxlifetime
index 21658eb29..21658eb29 100644..100755
--- a/debian/maxlifetime
+++ b/debian/maxlifetime
diff --git a/debian/patches/033-we_WANT_libtool.patch b/debian/patches/033-we_WANT_libtool.patch
index dd82cf594..ac43c01e3 100644
--- a/debian/patches/033-we_WANT_libtool.patch
+++ b/debian/patches/033-we_WANT_libtool.patch
@@ -2,12 +2,16 @@ Index: php5-5.2.6/build/build2.mk
 ===================================================================
 --- php5-5.2.6.orig/build/build2.mk
 +++ php5-5.2.6/build/build2.mk
-@@ -52,6 +52,11 @@ $(TOUCH_FILES):
+@@ -52,6 +52,15 @@ $(TOUCH_FILES):
  
  aclocal.m4: configure.in acinclude.m4
  	@echo rebuilding $@
 +	@libtoolize=`./build/shtool path glibtoolize libtoolize`; \
-+	$$libtoolize --copy --automake --force; \
++	if $$libtoolize --help | grep -q -- --install; then \
++	  $$libtoolize --copy --install --automake --force; \
++	else \
++	  $$libtoolize --copy --automake --force; \
++	fi; \
 +	ltpath=`dirname $$libtoolize`; \
 +	ltfile=`cd $$ltpath/../share/aclocal; pwd`/libtool.m4; \
 +	cp $$ltfile ./build/libtool.m4
diff --git a/debian/patches/bad_whatis_entries.patch b/debian/patches/bad_whatis_entries.patch
new file mode 100644
index 000000000..84e4dd0f9
--- /dev/null
+++ b/debian/patches/bad_whatis_entries.patch
@@ -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]
diff --git a/debian/patches/deprecated_freetds_check.patch b/debian/patches/deprecated_freetds_check.patch
new file mode 100644
index 000000000..3eb36cdef
--- /dev/null
+++ b/debian/patches/deprecated_freetds_check.patch
@@ -0,0 +1,88 @@
+Allow ext/mssql and ext/pdo_dblib to build with >=freetds-0.82
+Original patch by jklowden at freetds dot org
+ext/pdo_dblib patch by matthias at dsx ado at
+Rediffed for Gentoo (wrong direction)
+http://bugs.php.net/bug.php?id=44991
+
+diff -r 57e37b68a255 -r f1222f67e562 ext/mssql/config.m4
+--- a/ext/mssql/config.m4	Tue Jul 01 19:37:24 2008 +0200
++++ b/ext/mssql/config.m4	Thu Jul 17 11:35:57 2008 +0200
+@@ -10,11 +10,11 @@
+ 
+   if test "$PHP_MSSQL" = "yes"; then
+     for i in /usr/local /usr; do
+-      if test -f $i/include/tds.h; then
++      if test -f $i/include/sybdb.h; then
+         FREETDS_INSTALLATION_DIR=$i
+         FREETDS_INCLUDE_DIR=$i/include
+         break
+-      elif test -f $i/include/freetds/tds.h; then
++      elif test -f $i/include/freetds/sybdb.h; then
+         FREETDS_INSTALLATION_DIR=$i
+         FREETDS_INCLUDE_DIR=$i/include/freetds
+         break
+@@ -27,10 +27,10 @@
+ 
+   elif test "$PHP_MSSQL" != "no"; then
+ 
+-    if test -f $PHP_MSSQL/include/tds.h; then
++    if test -f $PHP_MSSQL/include/sybdb.h; then
+       FREETDS_INSTALLATION_DIR=$PHP_MSSQL
+       FREETDS_INCLUDE_DIR=$PHP_MSSQL/include
+-    elif test -f $PHP_MSSQL/include/freetds/tds.h; then
++    elif test -f $PHP_MSSQL/include/freetds/sybdb.h; then
+       FREETDS_INSTALLATION_DIR=$PHP_MSSQL
+       FREETDS_INCLUDE_DIR=$PHP_MSSQL/include/freetds
+     else
+@@ -38,8 +38,8 @@
+     fi
+   fi  
+ 
+-  if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
+-     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
++  if test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
++     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
+   fi
+ 
+   PHP_ADD_INCLUDE($FREETDS_INCLUDE_DIR)
+diff -r 57e37b68a255 -r f1222f67e562 ext/pdo_dblib/config.m4
+--- a/ext/pdo_dblib/config.m4	Tue Jul 01 19:37:24 2008 +0200
++++ b/ext/pdo_dblib/config.m4	Thu Jul 17 11:35:57 2008 +0200
+@@ -13,11 +13,11 @@
+   if test "$PHP_PDO_DBLIB" = "yes"; then
+ 
+     for i in /usr/local /usr; do
+-      if test -f $i/include/tds.h; then
++      if test -f $i/include/sybdb.h; then
+         PDO_FREETDS_INSTALLATION_DIR=$i
+         PDO_FREETDS_INCLUDE_DIR=$i/include
+         break
+-      elif test -f $i/include/freetds/tds.h; then
++      elif test -f $i/include/freetds/sybdb.h; then
+         PDO_FREETDS_INSTALLATION_DIR=$i
+         PDO_FREETDS_INCLUDE_DIR=$i/include/freetds
+         break;
+@@ -30,10 +30,10 @@
+ 
+   elif test "$PHP_PDO_DBLIB" != "no"; then
+ 
+-    if test -f $PHP_PDO_DBLIB/include/tds.h; then
++    if test -f $PHP_PDO_DBLIB/include/sybdb.h; then
+       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
+       PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include
+-    elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then
++    elif test -f $PHP_PDO_DBLIB/include/freetds/sybdb.h; then
+       PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB
+       PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds
+     else
+@@ -45,8 +45,8 @@
+     PHP_LIBDIR=lib
+   fi
+ 
+-  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.so"; then
+-     AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so])
++  if test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.a" && test ! -r "$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.so"; then
++     AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libsybdb.[a|so])
+   fi
+ 
+   PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR)
diff --git a/debian/patches/series b/debian/patches/series
index 02fca8a6c..8e52aa432 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,3 +33,5 @@ force_libmysqlclient_r.patch
 tzdb-nofree_ents_ifnotzdata.patch
 CVE-2008-2829.patch
 libedit_is_editline.patch
+bad_whatis_entries.patch
+deprecated_freetds_check.patch
diff --git a/debian/php5-common.README.Debian b/debian/php5-common.README.Debian
index 7c8766a70..439fb3f98 100644
--- a/debian/php5-common.README.Debian
+++ b/debian/php5-common.README.Debian
@@ -7,6 +7,7 @@ Table of Contents:
 * php5-cgi and apache2
 * Restarting your web server after installing modules
 * Configuration layout
+* Timezone data from system timezone database
 * Further documentation, errata, etc
 
 
@@ -129,6 +130,21 @@ you can just remove the symlink.
 
 sean finney <seanius@debian.org>  Thu, 19 Oct 2006 23:33:05 +0200
 
+Timezone data from system timezone database
+---------------------------------------------------------------------
+
+Debian PHP has been patched to use of the system wide timezone database
+from the tzdata package, making sure any updates there are automatically
+used by PHP aswell.
+
+Note that this requires that the PHP process has access to /etc/localtime
+and /usr/share/zoneinfo. For any regular installation this should be the
+case, but in specific secured environments when reading the timezone
+database is impossible PHP will give a "Timezone database is corrupt -
+this should *never* happen!" error.
+ 
+Thijs Kinkhorst <thijs@debian.org>  Wed, 23 Jul 2008 17:42:06 +0200
+
 Further documentation, errata, etc
 ---------------------------------------------------------------------
 
diff --git a/debian/php5-dev.dirs b/debian/php5-dev.dirs
index 415f082dd..9c68fefa7 100644
--- a/debian/php5-dev.dirs
+++ b/debian/php5-dev.dirs
@@ -1 +1,2 @@
 /usr/bin
+/usr/share/lintian/overrides
diff --git a/debian/php5-dev.lintian-overrides b/debian/php5-dev.lintian-overrides
new file mode 100644
index 000000000..5890e1a11
--- /dev/null
+++ b/debian/php5-dev.lintian-overrides
@@ -0,0 +1 @@
+W: php5-dev: script-not-executable ./usr/lib/php5/build/run-tests.php
diff --git a/debian/rules b/debian/rules
index a0b9f41ad..c81e9af62 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ QUILT_NO_DIFF_TIMESTAMPS=1
 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 @@ install: build
 			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 @@ install: build
 		$(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: build
 
 	# 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 @@ install: build
 		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