-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2010-03-16 09:09:50 UTC
-
mfrom:
(1.1.18 upstream)
(0.3.10 sid)
-
Revision ID:
james.westby@ubuntu.com-20100316090950-e36m0pzranoixifd
Tags: 5.3.2-1ubuntu1
* Merge from debian unstable:
- debian/control:
* Dropped firebird2.1-dev, libc-client-dev, libmcrypt-dev as it is in universe.
* Dropped libmysqlclient15-dev, build against mysql 5.1.
* Dropped libcurl-dev not in the archive.
* Suggest php5-suhosin rather than recommends.
* Dropped php5-imap, php5-interbase, php5-mcrypt since we have versions already in
universe.
* Dropped libonig-dev and libqgdbm since its in universe. (will be re-added in lucid+1)
* Dropped locales-all.
- modulelist: Drop imap, interbase, and mcrypt.
- debian/rules:
* Dropped building of mcrypt, imap, and interbase.
* Install apport hook for php5.
- Dropped debian/patches/libedit_is_editline.patch.