merged from the jackyf-devel branch

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 21772e5df10ca23ac189be4a24f068570f056586..2131b807760848e556f823026f8764c92d8a96f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
+apt (0.7.22.3) UNRELEASED; urgency=low
+
+  [ Eugene V. Lyubimkin ]
+  * methods/{http,https,ftp}, doc/apt.conf.5.xml:
+    - Changed and unified the code that determines which proxy to use. Now
+      'Acquire::{http,ftp}::Proxy[::<host>]' options have the highest priority,
+      and '{http,ftp}_proxy' environment variables are used only if options
+      mentioned above are not specified.
+      (Closes: #445985, #157759, #320184, #365880, #479617)
+
+ -- Michael Vogt <mvo@debian.org>  Wed, 19 Aug 2009 11:14:15 +0200
+
 apt (0.7.22.2) unstable; urgency=low
 
   * debian/apt.cron.daily:
     - Make sure that VERBOSE is always set (Closes: #539366)
     - Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476)
+    - Support using debdelta to download packages (Closes: #532079)
 
  -- Julian Andres Klode <jak@debian.org>  Thu, 06 Aug 2009 12:17:19 +0200
 
@@ -232,7 +245,7 @@ apt (0.7.20) unstable; urgency=low
   * buildlib/config.{sub,guess}:
     - Renewed. This fixes lintian errors.
   * doc/apt.conf.5.xml, debian/apt-transport-https:
-    - Documented briefly 'APT::https' group of options. (Closes: #507398)
+    - Documented briefly 'Acquire::https' group of options. (Closes: #507398)
     - Applied patch from Daniel Burrows to document 'Debug' group of options.
       (Closes: #457265)
     - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.