summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-12-08 18:07:48 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-12-08 18:07:48 +0000
commitfc25afd0b3fbe47a9ded2978142dadafe52a989b (patch)
tree6604b7df797e34ad2347c00d7b727c3b943127d8 /debian/changelog
parent193593331d2833dbc640f3bb1ad3dd6bfaac858f (diff)
parentb7475c1ea32e60fca03b7092bfe7ee3fd3dfde47 (diff)
* star-merged with apt--mvo
Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-133 Merge with Michael AND update PO files * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-102 * finalized this release * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-103 * changelog updates * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-104 * build-depend on libdb4.3 now, fix for kFreeBSD (#317718) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-105 * fix mailaddress * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-106 * fix a string (thanks to bubulle) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-107 * merged with bubulle
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog9
1 files changed, 8 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d57825909..2061f8125 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,7 @@ apt (0.6.43ubuntu1) dapper; urgency=low
-- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100
-apt (0.6.43) unstable; urgency=low
+apt (0.6.43) unstable; urgency=medium
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:
* zh_CN.po: Completed to 510 strings(Closes: #338267)
@@ -25,7 +25,11 @@ apt (0.6.43) unstable; urgency=low
* support a download rate limit for http (closes: #146877)
* included lots of the speedup changes from #319377
* add stdint.h to contrib/md5.h (closes: #340448)
+ * ABI change, library name changed (closes: #339147)
+ * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718)
+ * switch to libdb4.3 in build-depends
+<<<<<<< TREE
-- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:22:31 +0100
apt (0.6.42.3ubuntu2) dapper; urgency=low
@@ -43,6 +47,9 @@ apt (0.6.42.3ubuntu1) dapper; urgency=low
* synced with debian
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100
+=======
+ -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100
+>>>>>>> MERGE-SOURCE
apt (0.6.42.3) unstable; urgency=low