Viewing all changes in revision 60.
- Committer: Bazaar Package Importer
- 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
* 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.
  - 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.
- files added:
- Zend/tests/bug44827.phpt
- ext/intl/resourcebundle
- ext/intl/tests/_files
- ext/intl/tests/_files/resourcebundle
- ext/snmp/tests
- ext/standard/tests/file/windows_links
- files removed:
- debian/patches/ref-converted-to-value-in-_call.patch
- files modified:
- Makefile.global
expand all
collapse all
added
removed
