-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2009-02-04 21:52:47 UTC
-
mfrom:
(1.1.12 upstream)
-
Revision ID:
james.westby@ubuntu.com-20090204215247-y556i9zpjzhh0e7j
Tags: 5.2.6.dfsg.1-3ubuntu1
* Merge from debian unstable, 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-mycrpt source)
+ readline support again, now that the libedit issue is fixed.
- debian/control: Add build dependency: libdedit-dev (>= 2.9.cvs.20050518-1)
CLI readline support
- debian/rules:
- Correctly mangle PHP5_* macros for lpia
- Point /usr/lib/php5/build/{libtool.m4, ltmain.sh} to the right locations.
- Configure with --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
to fix a build failure on armel.
- debian/patches/use-specific-libdb-version.patch (LP: #165247), mangle
version ordering in patch to match code for clean application.
- debian/patches/119-sybase-alias.patch:
+ Fix sybase regression since change to mssql. (LP: #240519)
- debian/control: Use libdb-4.6-dev
- Revert to using upstreams' bundled libtool for now, until either upstream
moves to libtool 2.x, or Debian/Ubuntu have the time to rewrite some m4.
* Manually copy autotools-dev's versions of config.{sub.guess} since we
no long have libtoolize doing it for us, thanks to the above changes.
* debian/patches/fix-pecl-libtool.dpatch: fix libtool brokenness with pecl.
(LP: #262251)
* Dropped debian/patches/deprecated_freetds_check.patch in favor of Debian's.