[Apt-listbugs-commits] [SCM] apt-listbugs development tree branch, master, updated. debian/0.1.3-18-g9acbf92

[Ryan Niebur]

The following commit has been merged in the master branch:
commit 9acbf92fa2dadf8381a6684145a88f2b0eb4bf37
Author: Francesco Poli (t1000) <frx at firenze.linux.it>
Date:   Wed May 5 23:36:30 2010 +0200

    fix outdated man page about proxy configuration
    
    Commit 8aba1f3df726ecac9943a7c089bc42b0c7df2eee changed the overriding
    relations in proxy configuration, but failed to update the man page.
    The present commit is meant to rectify this situation.

diff --git a/apt-listbugs b/apt-listbugs
index cba3f3b..f82126f 100755
--- a/apt-listbugs
+++ b/apt-listbugs
@@ -146,23 +146,27 @@ apt-listbugs [-h] [-v] [-s <severities>] [-T <tags>] [-S <stats>] [-B <bug#>] [-
 
 * http_proxy
 
-  If http_proxy is set, the value is used for HTTP Proxy.
-  The default is to use the same value set for APT (in apt.conf).
+  If http_proxy is set, the value is used for HTTP Proxy, unless
+  proxy settings are found in APT configuration (see below).
 
 == CONFIGURATION FILE
 
-apt-listbugs understands APT configuration file (see apt.conf). The notable configuration options are 
+apt-listbugs understands APT configuration file (see apt.conf). The
+notable configuration options are 
 
 * Acquire::HTTP::Proxy
 
-  The default HTTP Proxy setting.
+  Default HTTP Proxy setting (overrides any http_proxy environment variable
+  value).
 
-  Special keyword 'DIRECT' will disable proxy configuration.
+  An empty string or the special keyword 'DIRECT' will disable proxy.
 
 * Acquire::HTTP::Proxy::bugs.debian.org
 
-  HTTP Proxy setting, overrides the default HTTP Proxy setting. Useful
-  for setting HTTP proxy for apt-listbugs.
+  Specific HTTP Proxy setting (overrides the default HTTP Proxy setting).
+  Useful for setting HTTP proxy for apt-listbugs.
+
+  The special keyword 'DIRECT' will disable proxy.
 
 * AptListbugs::IgnoreRegexp
 
@@ -183,7 +187,7 @@ apt-listbugs understands APT configuration file (see apt.conf). The notable conf
   Reading package status... Done
   Retrieving bug reports... Done
   Parsing Found/Fixed information... Done
-  important bugs of apt-listbugs (0.0.57 -> ) <pending>
+  important bugs of apt-listbugs (0.0.57 -> ) <unfixed>
    #332442 - apt-listbugs: Apt-listbugs doesn't actually download any bug reports
    #389903 - apt-listbugs: Does not offer to exit if timeout occurs fetching reports
   Summary:
diff --git a/debian/changelog b/debian/changelog
index 7b01781..2b7d74b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ apt-listbugs (0.1.4) UNRELEASED; urgency=low
     change (Closes: #572192)
   * fixed "Should not depends on transitional libhttp-access2-ruby1.8
     package" (Closes: #574075)
-  * clarified man page about proxy environment variables
+  * fixed and clarified man page about proxy configuration
   * switched to dpkg-source 3.0 (native) format
   * dropped the requirement for the user to set soap_use_proxy environment
     variable (this ruby module interface should not be exposed to application
@@ -18,7 +18,7 @@ apt-listbugs (0.1.4) UNRELEASED; urgency=low
   * updated German translation, thanks Thomas Mueller! (Closes: #578305)
   * flush stdin after running the web browser (Closes: #578299)
 
- -- Francesco Poli (t1000) <frx at firenze.linux.it>  Sun, 02 May 2010 22:10:35 +0200
+ -- Francesco Poli (t1000) <frx at firenze.linux.it>  Wed, 05 May 2010 23:05:28 +0200
 
 apt-listbugs (0.1.3) unstable; urgency=low
 

-- 
apt-listbugs development tree