~ubuntu-dev/ubuntu/lucid/php5/lucid-201002101919

Viewing all changes in revision 46.

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2009-07-10 07:19:08 UTC
  • mfrom: (0.3.1 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090710071908-t91rrytsfgqbdd9p
Tags: 5.2.10.dfsg.1-2ubuntu1
* 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
  - debian/patches/119-sybase-alias.patch:
    +  Fix sybase regression since change to mssql. (LP: #240519)
  - debian/patches/fix-autoconf-ftbfs.patch:
    + Fixes FTBFS.
  - debian/control: 
    + Use libdb-4.6-dev
    + Rename Vcs-Browser & Vcs-Git to XS-Original-Vcs-Browser & XS-Original-Vcs-Git (LP: #323731).
    + Use autoconf2.13 to build. Thanks to dreamcast4 (LP: #411890)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: