diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-01-19 08:25:10 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-01-19 08:25:10 +0000 |
| commit | 007dc9e082687e65a7ed89fc416bab05eaa5f96f (patch) | |
| tree | 8b996ae97cb04713cb3b0e824255d0fe3d6dfcf5 /debian | |
| parent | 47f17da4f65ee4887f46e4442ce2843e3e744d89 (diff) | |
Merge michael.vogt@canonical.com--2004/apt--status-fd--0
Patches applied:
* michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--base-0
tag of apt@packages.debian.org/apt--main--0--patch-32
* michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-1
* michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-2
* changed version of the library
* michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-3
* merged with matt again
* michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4
* merged with apt--main--0 and fixed permissions in po/
* michael.vogt@canonical.com--2004/apt--status-fd--0--patch-1
tag of michael.vogt@canonical.com--2004--laptop/apt--status-fd--0--patch-4
* michael.vogt@canonical.com--2004/apt--status-fd--0--patch-2
* merged with matt's tree
* michael.vogt@canonical.com--2004/apt--status-fd--0--patch-3
* removed a stupid "<<<" merge in the changelog
* michael.vogt@canonical.com--2004/apt--status-fd--0--patch-4
* star-merged with apt@packages.debian.org/apt--main--0
* michael.vogt@canonical.com--2004/apt--status-fd--0--patch-5
* removed the "pre-fork/post-fork" change and put it into it's own branch, star-merged with matt so that it applies cleanly
* michael.vogt@canonical.com--2004/apt--status-fd--0--patch-6
* cleaned a incorrect log-file merge
* michael.vogt@canonical.com--2004/apt--status-fd--0--patch-7
* removed a conflict in =tagging-method
* michael.vogt@canonical.com--2004/apt--status-fd--0--patch-8
* cleaned up the delta so that it no longer contains unreleated whitespace changes
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d0dae01d2..6731bd3d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ apt (0.6.30) unstable; urgency=low * Add ppc64 to buildlib/archtable - + * Merge michael.vogt@canonical.com--2004/apt--status-fd--0 + - Support preserving dpkg status file descriptor, to support + better integration with synaptic -- apt (0.6.29) hoary; urgency=low |