~ubuntu-branches/ubuntu/lucid/php5/lucid-201002130000

Viewing all changes in revision 35.

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2008-07-17 15:16:15 UTC
  • Revision ID: james.westby@ubuntu.com-20080717151615-5a61mr37av6f8w26
Tags: 5.2.6-2ubuntu1
* Merge from debian unstable, remaining changes:
  - debin/control, debian/rules: Disable a few build dependencies and
    accompanying binary pckages which we do not want to support in main:
    + freebird2-dev/php5-interbase (we have a seperate php-interbase source)
    + libc-client-dev/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/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 msqql. (LP: #240519)
  - debian/control: Use libdb-4.6-dev

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: