lp:~chrisccoulson/zlib/ubuntu.1.2.3.4.dfsg-3-merge
- Get this branch:
- bzr branch lp:~chrisccoulson/zlib/ubuntu.1.2.3.4.dfsg-3-merge
Branch merges
Branch information
Recent revisions
- 23. By Chris Coulson
-
* 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
* Only check for EOF on transparent streams if we have done a zero
byte read to avoid reporting EOF early to applications. This was
breaking R.
* Revert explict EOF indication to avoid triggering an infinite loop
in man-db while rebuilding the caches (closes: #562518).
* New upstream release.
* This release contains refactored handling of 64 bit types which should
stop warnings being generated in some configurations (closes: #439980).
* This release also fixes handling of EOF in gzio (closes: #301283).
* Fix symbol version for inflateUndermine.
* Move -dbg to debug section.
* Add upstream home page.
* Policy 3.8.3.
* Concert to 3.0 (quilt) format. - 22. By Michael Vogt
-
* 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 - 21. By Michael Vogt
-
* zlib.h:
- add z_off64_t and ensure that its mapped to the correct
off_t or off64_t (fixes FTBFS in vips, gtk) - 20. By Michael Vogt
-
* zlib.h:
- add prototypes for the 64 bit functions if
_FILE_OFFSET_ BITS=64 is defined (LP: #402178) - 19. By Colin Watson
-
* Resynchronise with Debian. Remaining changes:
- Do not move from /usr/lib32 to /emul/ia32-linux/ in lib32z1.
- Move zlib.so.* to /lib. - 17. By Michael Vogt
-
* Merge from debian unstable, remaining changes:
- Add lpia to the list of UNALIGNED_OK architectures.
- Do not move from /usr/lib32 to /emul/ia32-linux/ in lib32z1 - 16. By Michael Vogt
-
* Merge from debian unstable, remaining changes:
- Add lpia to the list of UNALIGNED_OK architectures.
- Do not move from /usr/lib32 to /emul/ia32-linux/ in lib32z1 - 14. By Matthias Klose
-
* Merge with Debian; remaining changes:
- Install multilib into /usr/lib32 on amd64.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)