* [BREAK] merged lp:~mvo/apt/history

  - this writes a /var/log/apt/history tagfile that contains details
    from the transaction (complements term.log)
* methods/http.cc:
  - add cache-control headers even if no cache is given to allow
    adding options for intercepting proxies
  - add Acquire::http::ProxyAutoDetect configuration that 
    can be used to call a external helper to figure out the 
    proxy configuration and return it to apt via stdout
    (this is a step towards WPAD and zeroconf/avahi support)
* abicheck/
  - add new abitest tester using the ABI Compliance Checker from
    http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
* Change the package index Info methods to allow apt-cache policy to be
  useful when using several different archives on the same host.
  (Closes: #329814, LP: #22354)

1 files changed, 2 insertions, 0 deletions

diff --git a/methods/http.h b/methods/http.h
index 13f02ec77..ceee36cbe 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -134,6 +134,7 @@ class HttpMethod : public pkgAcqMethod
    bool Flush(ServerState *Srv);
    bool ServerDie(ServerState *Srv);
    int DealWithHeaders(FetchResult &Res,ServerState *Srv);
+   bool AutoDetectProxy();
 
    virtual bool Fetch(FetchItem *);
    virtual bool Configuration(string Message);
@@ -145,6 +146,7 @@ class HttpMethod : public pkgAcqMethod
    static void SigTerm(int);
    
    string NextURI;
+   string AutoDetectProxyCmd;
    
    public:
    friend class ServerState;