-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2010-01-26 14:09:58 UTC
-
mfrom:
(1.1.16 upstream)
(0.3.6 sid)
-
Revision ID:
james.westby@ubuntu.com-20100126140958-sos69zwa00q2nt19
Tags: 5.2.12.dfsg.1-2ubuntu1
* 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.