summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2009-08-19 11:28:34 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2009-08-19 11:28:34 +0200
commitf30eb61fde728f125bf7c673cadc17f43d82a2d0 (patch)
treec8ae7fbad1d15c3611104848c1d52abccd9904c9 /debian/changelog
parent9a64707c285290c4e191e04d92c0fab9f6f118f5 (diff)
parent889053489a8b9b91feeb698fc164446e9b5f9c67 (diff)
merged from the mvo branch
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog14
1 files changed, 13 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 2d3446d48..2131b8077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+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:
@@ -233,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.