summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-03-31 18:35:21 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-03-31 18:35:21 +0000
commit06f02b954f5c4ca7cb9cc288ea5a8fcb6a1052d4 (patch)
treec13a240d862ab3f62121062d4961b75a63d01e97 /debian/changelog
parent89eaeb446c24bbeacc5f69c170cf60104854432e (diff)
parent0edc7fba37048fa7c9833d664c4231ee9ad2be40 (diff)
* merged with matts tree
Patches applied: * apt@packages.debian.org/apt--main--0--patch-72 Open 0.6.36 * apt@packages.debian.org/apt--main--0--patch-73 Merge apt--mvo--0 * apt@packages.debian.org/apt--main--0--patch-74 Update changelog * apt@packages.debian.org/apt--main--0--patch-75 Merge bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-76 Update changelog * bubulle@debian.org--2005/apt--main--0--patch-58 Correct file permissions * bubulle@debian.org--2005/apt--main--0--patch-59 Bring consistency to the use of capitals in programs messages * bubulle@debian.org--2005/apt--main--0--patch-60 Correct the permission change on configure.in * bubulle@debian.org--2005/apt--main--0--patch-61 Complete unfuzzification of PO files after the capitalization fixes * bubulle@debian.org--2005/apt--main--0--patch-62 Final work of capitalization cleaning and translation unfuzzyfication * bubulle@debian.org--2005/apt--main--0--patch-63 Correct the "arbitary" typo in apt-ftparchive * bubulle@debian.org--2005/apt--main--0--patch-64 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-65 Italian translation update
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog22
1 files changed, 15 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index 65423a754..1820b2cbf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
-apt (0.6.34ubuntu1) hoary; urgency=low
-
- * Implement MaxSize and MaxAge, MinAge in apt.cron.daily, to prevent the
- cache from growing too large (Ubuntu #6761)
- * "apt-key update" calls gpg with "--ignore-time-conflict (ubuntu #7536)
-
- -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Mar 2005 16:45:33 +0100
+apt (0.6.35) hoary; urgency=low
+
+ * Merge apt--mvo--0 (incorporates 0.6.34ubuntu1):
+ - Implement MaxSize and MaxAge in apt.cron.daily, to prevent the cache
+ from growing too large (Ubuntu #6761)
+ - some comments about the pkgAcqMetaSig::Custom600Headers() added
+ - use gpg --with-colons
+ - commented the ftp no_proxy unseting in methods/ftp.cc
+ - added support for "Acquire::gpgv::options" in methods/gpgv.cc
+ * Merge bubulle@debian.org--2005/apt--main--0
+ - Make capitalization more consistent
+ - Un-fuzzy translations resulting from capitalization changes
+ - Italian translation update
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Mon, 7 Mar 2005 20:08:33 -0800
apt (0.6.34) hoary; urgency=low