[Pkg-php-commits] [php/debian-sid] remove binary package for php5-mhash which is now built-in

[Sean Finney]

the mhash extension has been removed in php5.3, replaced by built in
hash extension, which provides a BC layer for the mhash functions.

the --with-mhash configure flag is also moved from the apache2 configure
options to the common configure options, so that it will be built-in to
all php sapi's.
---
 debian/control    |   17 +++--------------
 debian/modulelist |    1 -
 debian/rules      |    2 +-
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index e077b39..52db6ae 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,8 @@ Description: server-side, HTML-embedded scripting language (metapackage)
 Package: php5-common
 Architecture: any
 Depends: sed (>= 4.1.1-1), ${shlibs:Depends}
-Provides: php5-json
-Conflicts: php5-json
+Provides: php5-json, php5-mhash
+Conflicts: php5-json, php5-mhash
 Description: Common files for packages built from the php5 source
  This package contains the documentation and example files relevant to all
  the other packages built from the php5 source.
@@ -127,7 +127,7 @@ Description: Files for PHP5 module development
  generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
 Package: php5-dbg
-Depends: php5-common (= ${binary:Version}), libapache2-mod-php5 (= ${binary:Version}) | libapache2-mod-php5filter (= ${binary:Version}) | php5-cgi (= ${binary:Version}) | php5-cli (= ${binary:Version}) | php5-curl (= ${binary:Version}) | php5-gd (= ${binary:Version}) | php5-gmp (= ${binary:Version}) | php5-imap (= ${binary:Version}) | php5-interbase (= ${binary:Version}) | php5-ldap (= ${binary:Version}) | php5-mcrypt (= ${binary:Version}) | php5-mhash (= ${binary:Version}) | php5-mysql (= ${binary:Version}) | php5-odbc (= ${binary:Version}) | php5-pgsql (= ${binary:Version}) | php5-pspell (= ${binary:Version}) | php5-recode (= ${binary:Version}) | php5-snmp (= ${binary:Version}) | php5-sqlite (= ${binary:Version}) | php5-sybase (= ${binary:Version}) | php5-tidy (= ${binary:Version}) | php5-xmlrpc (= ${binary:Version}) | php5-xsl (= ${binary:Version})
+Depends: php5-common (= ${binary:Version}), libapache2-mod-php5 (= ${binary:Version}) | libapache2-mod-php5filter (= ${binary:Version}) | php5-cgi (= ${binary:Version}) | php5-cli (= ${binary:Version}) | php5-curl (= ${binary:Version}) | php5-gd (= ${binary:Version}) | php5-gmp (= ${binary:Version}) | php5-imap (= ${binary:Version}) | php5-interbase (= ${binary:Version}) | php5-ldap (= ${binary:Version}) | php5-mcrypt (= ${binary:Version}) | php5-mysql (= ${binary:Version}) | php5-odbc (= ${binary:Version}) | php5-pgsql (= ${binary:Version}) | php5-pspell (= ${binary:Version}) | php5-recode (= ${binary:Version}) | php5-snmp (= ${binary:Version}) | php5-sqlite (= ${binary:Version}) | php5-sybase (= ${binary:Version}) | php5-tidy (= ${binary:Version}) | php5-xmlrpc (= ${binary:Version}) | php5-xsl (= ${binary:Version})
 Recommends: gdb
 Section: debug
 Priority: extra
@@ -238,17 +238,6 @@ Description: MCrypt module for php5
  in. The goal of the language is to allow web developers to write dynamically
  generated pages quickly. This version of PHP5 was built with the Suhosin patch.
 
-Package: php5-mhash
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
-Description: MHASH module for php5
- This package provides a module for mhash 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. This version of PHP5 was built with the Suhosin patch.
-
 Package: php5-mysql
 Architecture: any
 Depends: libmysqlclient15off (>= 5.0.51a), ${shlibs:Depends}, ${misc:Depends}, ${php:Depends}, php5-common (= ${binary:Version})
diff --git a/debian/modulelist b/debian/modulelist
index 062cc82..a4f0329 100644
--- a/debian/modulelist
+++ b/debian/modulelist
@@ -5,7 +5,6 @@ imap IMAP
 interbase Interbase
 ldap LDAP
 mcrypt MCrypt
-mhash MHASH
 mysql MySQL
 odbc ODBC
 pgsql PostgreSQL
diff --git a/debian/rules b/debian/rules
index b70142f..85587e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,6 +115,7 @@ COMMON_CONFIG=--build=$(DEB_BUILD_GNU_TYPE) \
 		--with-openssl=/usr \
 		--enable-soap \
 		--enable-zip \
+		--with-mhash=yes \
 		--with-mime-magic=$(MAGIC_MIME) \
 		--with-exec-dir=/usr/lib/php5/libexec \
 		--with-system-tzdata
@@ -229,7 +230,6 @@ configure-apache2-stamp: prepared-stamp
 		--with-ldap=shared,/usr \
 		--with-ldap-sasl=/usr \
 		--with-mcrypt=shared,/usr \
-		--with-mhash=shared,/usr \
 		--with-mysql=shared,/usr \
 		--with-mysqli=shared,/usr/bin/mysql_config \
 		--with-pspell=shared,/usr \
-- 
1.6.3.3