Imported Debian patch 5.2.0-6debian/5.2.0-6

5 files changed, 120 insertions, 15 deletions

diff --git a/debian/changelog b/debian/changelog
index e5ee065e0..a9c4c99b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+php5 (5.2.0-6) unstable; urgency=high
+
+  [ sean finney ]
+  * firebird2-dev (and thus php5-interbase) is only available on
+    i386/amd64, so update the control/rules information accordingly.
+    thanks to Bastian Blank for reporting this (closes: #399558).
+
+ -- sean finney <seanius@debian.org>  Wed, 22 Nov 2006 19:04:04 +0100
+
+php5 (5.2.0-5) unstable; urgency=high
+
+  [ sean finney ]
+  * bring some of the mainline php4 modules back into the php source
+    package instead of distributing them in independant source packages:
+    - php5-imap
+    - php5-interbase
+    - php5-mcrypt
+    - php5-pspell
+    - php5-tidy
+    these modules are still provided in the same binary packages as
+    before, but will now be built in tandem with the core php packages.
+  * fix for pdo.so duplicate loading warnings, thanks to Jan Wagner
+    (closes: #398367, #399248).
+
+ -- sean finney <seanius@debian.org>  Mon, 20 Nov 2006 12:41:37 +0100
+
 php5 (5.2.0-4) unstable; urgency=high
 
   * Re-re-enable LFS support, forward-porting vorlon's fixes in
diff --git a/debian/control b/debian/control
index 6ffb000eb..bc9863e1c 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Debian PHP Maintainers <pkg-php-maint@lists.alioth.debian.org>
 Uploaders: Adam Conrad <adconrad@0c3.net>, Steve Langasek <vorlon@debian.org>, Jeroen van Wolffelaar <jeroen@wolffelaar.nl>, Ondřej Surý <ondrej@debian.org>, sean finney <seanius@debian.org>
-Build-Depends: apache-dev (>= 1.3.23), apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), flex (>= 2.5.4), freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev (>= 1.0.0), libcurl3-openssl-dev | libcurl3-dev, libdb4.4-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libjpeg62-dev, libkrb5-dev, libldap2-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev | libmysqlclient12-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng12-dev, libpq-dev | postgresql-dev, librecode-dev, libsnmp9-dev | libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
+Build-Depends: apache-dev (>= 1.3.23), apache2-prefork-dev (>= 2.0.53-3), autoconf, automake1.4, bison, chrpath, debhelper (>= 3), firebird2-dev [i386 amd64], flex (>= 2.5.4), freetds-dev, libapr1-dev (>= 1.2.7-8), libbz2-dev (>= 1.0.0), libc-client-dev, libcurl3-openssl-dev | libcurl3-dev, libdb4.4-dev, libexpat1-dev (>= 1.95.2-2.1), libfreetype6-dev, libgcrypt11-dev, libgd2-xpm-dev (>= 2.0.28-3), libjpeg62-dev, libkrb5-dev, libldap2-dev, libmcrypt-dev, libmhash-dev (>= 0.8.8), libmysqlclient15-dev | libmysqlclient12-dev, libncurses5-dev, libpam0g-dev, libpcre3-dev (>= 6.6), libpng12-dev, libpq-dev | postgresql-dev, libpspell-dev, librecode-dev, libsnmp9-dev | libsnmp-dev, libsqlite0-dev, libssl-dev (>= 0.9.6), libt1-dev, libtidy-dev, libtool (>= 1.4.2-4), libwrap0-dev, libxmltok1-dev, libxml2-dev (>= 2.4.14), libxslt1-dev (>= 1.0.18), re2c, unixodbc-dev, zlib1g-dev (>= 1.0.9)
 Build-Conflicts: bind-dev
 Standards-Version: 3.7.2
 
@@ -171,6 +171,28 @@ Description: GD module for php5
  in. The goal of the language is to allow web developers to write
  dynamically generated pages quickly.
 
+Package: php5-imap
+Architecture: any
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version})
+Description: IMAP module for php5
+ This package provides a module for IMAP functions in PHP scripts.
+ .
+ PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
+ from C, Java and Perl with a couple of unique PHP-specific features thrown
+ in. The goal of the language is to allow web developers to write
+ dynamically generated pages quickly.
+
+Package: php5-interbase
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version})
+Description: interbase/firebird module for php5
+ This package provides a module for interbase/firebird functions in PHP scripts.
+ .
+ PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
+ from C, Java and Perl with a couple of unique PHP-specific features thrown
+ in. The goal of the language is to allow web developers to write
+ dynamically generated pages quickly.
+
 Package: php5-ldap
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
@@ -182,6 +204,17 @@ Description: LDAP module for php5
  in. The goal of the language is to allow web developers to write
  dynamically generated pages quickly.
 
+Package: php5-mcrypt
+Architecture: any
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version})
+Description: MCrypt module for php5
+ This package provides a module for MCrypt functions in PHP scripts.
+ .
+ PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
+ from C, Java and Perl with a couple of unique PHP-specific features thrown
+ in. The goal of the language is to allow web developers to write
+ dynamically generated pages quickly.
+
 Package: php5-mhash
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
@@ -236,6 +269,17 @@ Description: PostgreSQL module for php5
  in. The goal of the language is to allow web developers to write
  dynamically generated pages quickly.
 
+Package: php5-pspell
+Architecture: any
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version})
+Description: pspell module for php5
+ This package provides a module for pspell functions in PHP scripts.
+ .
+ PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
+ from C, Java and Perl with a couple of unique PHP-specific features thrown
+ in. The goal of the language is to allow web developers to write
+ dynamically generated pages quickly.
+
 Package: php5-recode
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
@@ -284,6 +328,22 @@ Description: Sybase / MS SQL Server module for php5
  in. The goal of the language is to allow web developers to write
  dynamically generated pages quickly.
 
+Package: php5-tidy
+Architecture: any
+Depends: ${shlibs:Depends}, ${php:Depends}, ${misc:Depends}, php5-common (= ${Source-Version})
+Description: tidy module for php5
+ This package provides a module for tidy functions in PHP scripts.
+ .
+ Tidy is an extension based on Libtidy (http://tidy.sf.net/) and allows
+ a PHP developer to clean, repair, and traverse HTML, XHTML, and XML
+ documents -- including ones with embedded scripting languages such as PHP
+ or ASP within them using OO constructs.
+ .
+ PHP5 is an HTML-embedded scripting language. Much of its syntax is borrowed
+ from C, Java and Perl with a couple of unique PHP-specific features thrown
+ in. The goal of the language is to allow web developers to write
+ dynamically generated pages quickly.
+
 Package: php5-xmlrpc
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${Source-Version})
diff --git a/debian/extramodulelist b/debian/extramodulelist
index c0a3321a1..0104f9b65 100644
--- a/debian/extramodulelist
+++ b/debian/extramodulelist
@@ -1,6 +1,7 @@
 mysql MySQL mysqli
 mysql MySQL pdo_mysql
-common PHP5Common pdo
+interbase InterBase/Firebird pdo_firebird
+common PDO pdo
 odbc ODBC pdo_odbc
 pgsql PostgreSQL pdo_pgsql
 sqlite SQLite pdo_sqlite
diff --git a/debian/modulelist b/debian/modulelist
index 4c7bb54d5..39aac6f8c 100644
--- a/debian/modulelist
+++ b/debian/modulelist
@@ -1,13 +1,18 @@
 curl CURL
 gd GD
+imap IMAP
+interbase Interbase
 ldap LDAP
+mcrypt MCrypt
 mhash MHASH
 mysql MySQL
 odbc ODBC
 pgsql PostgreSQL
+pspell pspell
 recode recode
 snmp SNMP
 sqlite SQLite
 sybase Sybase sybase_ct
+tidy tidy
 xmlrpc XML-RPC
 xsl XSL
diff --git a/debian/rules b/debian/rules
index 68e546c30..036ef0158 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ export DH_OPTIONS
 
 DEB_HOST_GNU_TYPE    ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_ARCH   ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 
 PHP5_HOST_GNU_TYPE    = $(shell echo $(DEB_HOST_GNU_TYPE) | sed 's/-gnu$$//')
 PHP5_BUILD_GNU_TYPE   = $(shell echo $(DEB_BUILD_GNU_TYPE) | sed 's/-gnu$$//')
@@ -52,6 +53,11 @@ 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))
+	IBFLAGS=--with-interbase=shared,/usr
+endif
+
 COMMON_CONFIG=--build=$(PHP5_BUILD_GNU_TYPE)-gnu \
 		--host=$(PHP5_HOST_GNU_TYPE)-gnu \
 		--mandir=/usr/share/man \
@@ -190,6 +196,7 @@ configure-apache-stamp: patch-stamp
 		--with-config-file-scan-dir=/etc/php5/apache/conf.d \
 		$(COMMON_CONFIG) \
 		--without-mm \
+		--disable-pdo \
 		--without-mysql --without-sybase-ct --without-sqlite
 	cd apache-build && \
 	cp ../Zend/zend_ini_scanner.c ../Zend/zend_language_scanner.c \
@@ -217,23 +224,29 @@ configure-apache2-stamp: patch-stamp
 		--with-xpm-dir=shared,/usr/X11R6 \
 		--with-png-dir=shared,/usr \
 		--with-freetype-dir=shared,/usr \
+		--with-imap=shared,/usr \
+		--with-imap-ssl \
+		$(IBFLAGS) \
 		--with-ttf=shared,/usr \
 		--with-t1lib=shared,/usr \
 		--with-ldap=shared,/usr \
+		--with-mcrypt=shared,/usr \
 		--with-mhash=shared,/usr \
 		--with-mysql=shared,/usr \
 		--with-mysqli=shared,/usr/bin/mysql_config \
+		--with-pspell=shared,/usr \
 		--with-unixODBC=shared,/usr \
 		--with-recode=shared,/usr \
 		--with-xsl=shared,/usr \
 		--with-snmp=shared,/usr \
 		--with-sqlite=shared,/usr \
 		--with-sybase-ct=shared,/usr \
+		--with-tidy=shared,/usr \
 		--with-xmlrpc=shared \
 		--with-pgsql=shared,/usr PGSQL_INCLUDE=`pg_config --includedir` \
 		--enable-pdo=shared \
 		--without-pdo-dblib \
-		--without-pdo-firebird \
+		--with-pdo-firebird=shared,/usr \
 		--with-pdo-mysql=shared,/usr \
 		--with-pdo-odbc=shared,unixODBC,/usr \
 		--with-pdo-pgsql=shared,/usr/bin/pg_config \
@@ -256,6 +269,7 @@ configure-cgi-stamp: patch-stamp
 		--with-config-file-scan-dir=/etc/php5/cgi/conf.d \
 		$(COMMON_CONFIG) \
 		--without-mm \
+		--disable-pdo \
 		--without-mysql --without-sybase-ct --without-sqlite
 	cd cgi-build && \
 	cp ../Zend/zend_ini_scanner.c ../Zend/zend_language_scanner.c \
@@ -275,6 +289,7 @@ configure-cli-stamp: patch-stamp
 		--with-config-file-scan-dir=/etc/php5/cli/conf.d \
 		$(COMMON_CONFIG) \
 		--without-mm \
+		--disable-pdo \
 		--without-mysql --without-sybase-ct --without-sqlite \
 		--enable-pcntl \
 		--with-ncurses=/usr
@@ -437,8 +452,6 @@ binary-indep: build install
 	dh_builddeb
 
 # Build architecture-dependent files here.
-# Pass -a to all debhelper commands in this target to reduce clutter.
-#binary-arch: DH_OPTIONS=-a
 binary-arch: build install
 	# Need this version of debhelper for DH_OPTIONS to work.
 	dh_testdir
@@ -476,7 +489,7 @@ binary-arch: build install
 	done
 
 	cat debian/copyright.header LICENSE Zend/LICENSE > debian/copyright
-	dh_installdocs -a
+	dh_installdocs -s
 
 	cat debian/modulelist | while read package extname dsoname; do \
 		rm -rf debian/php5-$$package/usr/share/doc/php5-$$package; \
@@ -489,17 +502,17 @@ binary-arch: build install
 	done
 	dh_installcron -pphp5-common --name=php5
 	dh_installchangelogs -pphp5-common NEWS
-	dh_strip -a
-	dh_link -a
-	dh_compress -a -Xphp.ini
-	dh_fixperms -a -X /var/lib/php5
+	dh_strip -s
+	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
-	dh_installdeb -a
-	dh_shlibdeps -a
+	dh_installdeb -s
+	dh_shlibdeps -s
 
 	phpapi=`./debian/php5-dev/usr/bin/php-config5 --phpapi`; \
 	for i in libapache-mod-php5 libapache2-mod-php5 php5-cgi php5-cli; do \
@@ -520,9 +533,9 @@ binary-arch: build install
 
 	echo "apache:Depends=apache-common (>= $(APACHE_VERSION))" >>debian/libapache-mod-php5.substvars
 	echo "apache2:Depends=apache2-mpm-prefork (>> 2.0.52) | apache2-mpm-itk, apache2.2-common" >>debian/libapache2-mod-php5.substvars
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+	dh_gencontrol -s
+	dh_md5sums -s
+	dh_builddeb -s
 
 binary: binary-arch binary-indep
 .PHONY: build clean binary-indep binary-arch binary install configure