Merge apt--mvo--0

Patches applied:

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-2
   * merge with matts tree, added documentation for the gpgv stuff

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-3
   * added gpgv::Options to configure-index

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-4
   * PulseIntervall can be configured now to make frontends like synaptic hayppy. it's done in a way that does not break binary compatibility

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-5
   * fix for apt-get update removing the cdroms Release.gpg files

 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-6
   * path scoring changed, the non-symlink path is scored highest

diff --git a/debian/changelog b/debian/changelog
index 3720861..9e0ac04 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+apt (0.6.33) hoary; urgency=low
+
+  * Merge michael.vogt@ubuntu.com--2005/apt--mvo--0 (through patch-6)
+    - patch-1: cosmetic changes (whitespace, "Apt::GPGV->APT::GPGV")
+    - patch-2: (doc) documentation for gpgv
+    - patch-3: (doc) new config variables added configure-index
+    - patch-4: pkgAcquire::Run() pulse intervall can be configured
+    - patch-5: fix for apt-get update removing Release.gpg files (#6865)
+    - patch-6: change the path scoring in apt-cdrom, prefer pathes without
+      symlinks
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Sat, 26 Feb 2005 15:21:17 -0800
+
 apt (0.6.32) hoary; urgency=low
 
   * Merge michael.vogt@ubuntu.com--2005/apt--mvo--0 (patch-1)