-
Committer:
Package Import Robot
-
Author(s):
Colin Watson
-
Date:
2011-11-23 12:58:51 UTC
-
mfrom:
(1.1.22)
(0.3.34 sid)
-
Revision ID:
package-import@ubuntu.com-20111123125851-8sa9ixwbxp6n7ryp
Tags: 5.3.8.0-1ubuntu1
* Resynchronise with Debian. Remaining changes:
- debian/rules: export DEB_HOST_MULTIARCH properly.
- Only build php5-sqlite for sqlite3, dropping the obsolete sqlite2.
- 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.1 and mysql-client-5.1 to avoid upstart and
mysql-server-5.1 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.
- Suggest php5-suhosin rather than recommends.
- 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
- debian/control: Recommend php5-dev for php-pear.
- debian/rules: --enable-pcntl for cgi as well.
* debian/patches/temporary-path-fixes-for-multiarch.patch: Handle
multiarch libmysqlclient as well.