-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Vogt
-
Date:
2009-11-09 13:22:10 UTC
-
mfrom:
(1.1.6 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20091109132210-mmf01a5f690udjef
Tags: 1:1.2.3.3.dfsg-15ubuntu1
* Merge from debian unstable, 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)
- Move zlib.so.* to /lib.
- drop Conflicts on libc6-i386 (<= 2.9-18) because we do not have
to do a /emul/ia32-linux -> /usr/lib32 transition