Merge misc-abi-changes
authorMatt Zimmerman <matt.zimmerman@canonical.com>
Mon, 13 Dec 2004 10:59:20 +0000 (10:59 +0000)
committerMatt Zimmerman <matt.zimmerman@canonical.com>
Mon, 13 Dec 2004 10:59:20 +0000 (10:59 +0000)
commit3826564e07eaffb05eca5af34a0e76f6f161b89c
treeef95b63a23cac888d1a7a821bdeccdd809df9272
parent7db98ffceda347f0bc457c6bdc4ff33d60e26b18
Merge misc-abi-changes
Patches applied:

 * apt@packages.debian.org/apt--misc-abi-changes--0--base-0
   tag of apt@packages.debian.org/apt--main--0--patch-16

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-1
   Fix apt-get -s remove to not display the candidate version

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-2
   Merge from main

 * apt@packages.debian.org/apt--misc-abi-changes--0--patch-3
   Use pid_t throughout to hold process IDs
14 files changed:
apt-inst/deb/dpkgdb.cc
apt-pkg/algorithms.cc
apt-pkg/algorithms.h
apt-pkg/contrib/fileutl.cc
apt-pkg/contrib/fileutl.h
apt-pkg/makefile
cmdline/indexcopy.cc
debian/changelog
ftparchive/multicompress.cc
ftparchive/multicompress.h
ftparchive/writer.cc
methods/gzip.cc
methods/rsh.h
po/apt-all.pot