* Merge from debian testing, remaining changes: - debian/control, debian/rules: Disable a few build dependencies and accompanying, binary packages which we do not want to support in main: + firebird2-dev/php5-interbase (we have a seperate php-interbase source) + libc-client/php5-imap (we have a seperate php-imap source) + libmcrypt-dev/php5-mcrypt (seperate php-mycrpt source) + readline support again, now that the libedit issue is fixed. - debian/control: Add build dependency: libdedit-dev (>= 2.9.cvs.20050518-1) CLI readline support. - debian/rules: + Correctly mangle PHP5_* macros for lpia - debian/control: + Use libdb-4.6-dev. + Rename Vcs-Browser & Vcs-Git to XS-Original-Vcs-Browser & XS-Original-Vcs-Git (LP: #323731). - Dropped patches: - debian/patches/119-sybase-alias.patch: Use Debian's patch. - debian/patches/fix-autoconf-ftbfs.patch: Use Debian's patch - debian/patches/fix-zlib-decompression: Already in upstream - Use the default pear/install-pear-nozlib.phar in php 5.2.11 - debian/control: Move php5-suhoshin to Suggests. - debian/rules: Fix broken symlink for pear. - Dropped dependency on autoconf2.13.