* 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-mcrypt source) + readline support again, now that the libedit issue is fixed. - debian/control: Add build dependency: libedit-dev (>= 2.9.cvs.20050518-1) CLI readline support. - debian/rules: + Correctly mangle PHP5_* macros for lpia - debian/control: + Rename Vcs-Browser & Vcs-Git to XS-Original-Vcs-Browser & XS-Original-Vcs-Git (LP: #323731). - debian/control: Move php5-suhoshin to Suggests. - debian/rules: Fix broken symlink for pear. - main/php_version.h: updated with Ubuntu version info - debian/patches/series: Re-enable the 033-we_WANT_libtool.patch patch - debian/rules, debian/source_php5.py: Install apport hook. * Dropped patches: CVE-2009-3557.patch and CVE-2009-3558.patch, no longer needed.