From 788a8f42c1ec146c812550d076e5fb720e83ae52 Mon Sep 17 00:00:00 2001
From: "Eugene V. Lyubimkin" <jackyf@1501-debian>
Date: Mon, 15 Dec 2008 21:17:39 +0200
Subject: Make apt proxy options have the highest priority, unified proxy
 determining code.

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'debian/changelog')

diff --git a/debian/changelog b/debian/changelog
index 90be66400..304e0fb2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,12 @@ apt (0.7.20) unstable; urgency=low
     - Mentioned 'APT::Periodic' and 'APT::Archives' groups of options.
       (Closes: #438559)
     - Mentioned '/* ... */' comments. (Closes: #507601)
+  * 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 ]
   * make "apt-get build-dep" installed packages marked automatic
-- 
cgit v1.2.3