Merge from bubulle@debian.org--2005/apt--main--0 (translations)

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 19d5bcd1f2d4e3ff5f57364dd51bf682b945e9a5..9a2ad132fff02520fd3a2b77f5ddfb3924e0e225 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,29 @@
+apt (0.6.34) hoary; urgency=low
+
+  * Add missing semicolon to configure-index (Closes: #295773)
+  * Update build-depends on gettext to 0.12 (Closes: #295077)
+  * Merge from bubulle@debian.org--2005/apt--main--0 to get
+    translation updates
+
+ -- Matt Zimmerman <mdz@ubuntu.com>  Fri,  4 Mar 2005 16:13:15 -0800
+
+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)
+    - Implement Acquire::gpgv::options (Ubuntu bug#6283)
 
  -- Matt Zimmerman <mdz@ubuntu.com>  Tue,  8 Feb 2005 19:31:15 -0800