~ubuntu-branches/ubuntu/natty/zlib/natty

Viewing all changes in revision 23.

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2010-05-17 18:06:51 UTC
  • mfrom: (1.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20100517180651-i83cowr4hqrdalo3
Tags: 1:1.2.3.4.dfsg-3ubuntu1
* Merge from debian testing.  Remaining changes:
  - zlib.h: add z_off64_t and ensure that its mapped to the correct
    off_t or off64_t (fixes FTBFS in vips, gtk)
  - drop Conflicts on libc6-i386 (<= 2.9-18) because we do not have
    to do a /emul/ia32-linux -> /usr/lib32 transition

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: