ubuntu/+source/zlib:applied/ubuntu/lucid-devel

Last commit made on 2009-11-09
Get this branch:
git clone -b applied/ubuntu/lucid-devel https://git.launchpad.net/ubuntu/+source/zlib
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
applied/ubuntu/lucid-devel
Repository:
lp:ubuntu/+source/zlib

Recent commits

cda5a33... by Michael Vogt on 2009-11-09

Import patches-applied version 1:1.2.3.3.dfsg-15ubuntu1 to applied/ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 30c61b2e002a173dd0b57de9b177788707561763
Unapplied parent: 49f5737d61c8e517b1cf9b4954a18447d3525916

New changelog entries:
  * 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

49f5737... by Michael Vogt on 2009-11-09

Import patches-unapplied version 1:1.2.3.3.dfsg-15ubuntu1 to ubuntu/lucid

Imported using git-ubuntu import.

Changelog parent: 9fbb951bd518e255d5cde2ba46ef2ea249568131

New changelog entries:
  * 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

30c61b2... by Mark Brown on 2009-08-04

Import patches-applied version 1:1.2.3.3.dfsg-15 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: ea3ff97f7e3aaf5d29cb3d2426dd962b9775c515
Unapplied parent: 9fbb951bd518e255d5cde2ba46ef2ea249568131

New changelog entries:
  * Using Conflicts instead of Replaces for the amd64 lib32 transition
    since that's the latest idea for making it work (closes: #539278).

9fbb951... by Mark Brown on 2009-08-04

Import patches-unapplied version 1:1.2.3.3.dfsg-15 to debian/sid

Imported using git-ubuntu import.

Changelog parent: bc66ab858f95a0813e7168cae36cbadfc038ce37

New changelog entries:
  * Using Conflicts instead of Replaces for the amd64 lib32 transition
    since that's the latest idea for making it work (closes: #539278).

ea3ff97... by Mark Brown on 2009-06-25

Import patches-applied version 1:1.2.3.3.dfsg-14 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: 97a6c867e03002aa6e7283ad80c842718a4c2e73
Unapplied parent: bc66ab858f95a0813e7168cae36cbadfc038ce37

New changelog entries:
  * amd64 has finally abandoned /emul/ia32-linux so install the 32 bit
    binaries in lib32 as for other architectures (closes: #533015).

bc66ab8... by Mark Brown on 2009-06-25

Import patches-unapplied version 1:1.2.3.3.dfsg-14 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 47e7cfccd48501a6020a3b3c899c963044947e2f

New changelog entries:
  * amd64 has finally abandoned /emul/ia32-linux so install the 32 bit
    binaries in lib32 as for other architectures (closes: #533015).

97a6c86... by Mark Brown on 2009-03-01

Import patches-applied version 1:1.2.3.3.dfsg-13 to applied/debian/sid

Imported using git-ubuntu import.

Changelog parent: e4751f7e54e1d004e01989c9bfa52e18f0cd86da
Unapplied parent: 47e7cfccd48501a6020a3b3c899c963044947e2f

New changelog entries:
  * Add LPIA to the list of unaligned architectures to reduce the Ubuntu
    diff a little (closes: #517403).

47e7cfc... by Mark Brown on 2009-03-01

Import patches-unapplied version 1:1.2.3.3.dfsg-13 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 50a7d28d037ce9f65fd2ada5d2b88b72d37b3b79

New changelog entries:
  * Add LPIA to the list of unaligned architectures to reduce the Ubuntu
    diff a little (closes: #517403).

e4751f7... by Mark Brown on 2008-04-06

Import patches-applied version 1:1.2.3.3.dfsg-12 to applied/debian/lenny

Imported using git-ubuntu import.

Unapplied parent: 50a7d28d037ce9f65fd2ada5d2b88b72d37b3b79

50a7d28... by Mark Brown on 2008-04-06

Import patches-unapplied version 1:1.2.3.3.dfsg-12 to debian/lenny

Imported using git-ubuntu import.