* Merge from Debian unstable. Remaining changes: - d/rules: Simplify apache config settings since we never build interbase or firebird. - debian/rules: export DEB_HOST_MULTIARCH properly. - Add build-dependency on lemon, which we now need. - Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe. - Dropped libcurl-dev not in the archive. - debian/control: replace build-depends on mysql-server with mysql-server-core-5.5 and mysql-client-5.5 to avoid upstart and mysql-server-5.5 postinst confusion with starting up multiple mysqlds listening on the same port. - Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in universe. - Dropped libonig-dev and libqgdbm since its in universe. (libonig MIR has been declined due to an inactive upstream. So this is probably a permanent change). - modulelist: Drop imap, interbase, sybase, and mcrypt. - debian/rules: * Dropped building of mcrypt, imap, and interbase. * Install apport hook for php5. * stop mysql instance on clean just in case we failed in tests * Dropped Changes: * d/rules: enable Suhosin patch with PHP5_SUHOSIN=yes -- Upstream suhosin has been slow to adopt PHP 5.4, and is showing signs of disengagement. Therefore, we will follow Debian's lead and drop Suhosin for now. - d/control: build-depend on mysql 5.5 instead of 5.1 for running tests. -- Debian just deps on mysql-server - Suggest php5-suhosin rather than recommends. -- Dropping suhosin - d/setup-mysql.sh: modify to work with mysql 5.5 differences -- superseded in Debian. - Only build php5-sqlite for sqlite3, dropping the obsolete sqlite2. -- superseded in Debian - d/maxlifetime: Improve maxlifetime script to scan for more SAPIs and scan all *.ini in conf.d directory. -- Change came from Debian - d/libapache2-mod-php5.postinst,libapache2-mod-php5filter.postinst: Restart apache on first install to ensure module is fully enabled. -- Change came from Debian - debian/patches/php5-CVE-2012-1823.patch: filter query strings that are prefixed with '-' -- Fixed upstream - debian/control: Recommend php5-dev for php-pear. -- This was a poorly conceived idea anyway. - Pre-Depend on a new enough version of dpkg for dpkg-maintscript-helper rather than checking whether it exists at run-time, leading to more predictable behaviour on upgrades. -- Applied in Debian - d/p/gd-multiarch-fix.patch: superseded * d/NEWS: add note explaining that SUHOSIN is no longer enabled in the Ubuntu packages.