From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Wed, 3 Feb 2010 18:41:17 +0000 (-0800)
Subject: merged from lp:~mvo/apt/mvo
X-Git-Tag: 0.7.25.3ubuntu1~2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/424d785b672f80a0f1a5b6ab4a858c48f4c49bfd

merged from lp:~mvo/apt/mvo
---

424d785b672f80a0f1a5b6ab4a858c48f4c49bfd
diff --cc debian/changelog
index a290d0389,03936a31b..803f0ab0d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,8 +1,16 @@@
 -apt (0.7.25.1) UNRELEASED; urgency=low
 +apt (0.7.25ubuntu4) lucid; urgency=low
 +
 +  * cmdline/apt-cdrom.cc:
 +    - make Acquire::cdrom::AutoDetect default, this can be
 +      turned off with "--no-auto-detect"
++  * methods/http.cc:
++    - add cache-control headers even if no cache is given to allow
++      adding options for intercepting proxies
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 02 Feb 2010 16:58:59 -0800
 +
 +apt (0.7.25ubuntu3) lucid; urgency=low
  
 -  * merged lp:~mvo/apt/history
 -    - this writes a /var/log/apt/history tagfile that contains details
 -      from the transaction (complements term.log)
    * cmdline/apt-get.cc:
      - fix apt-get source pkg=version regression (closes: #561971)
    * apt-pkg/contrib/cdromutl.cc: