merged from lp:~mvo/apt/mvo

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 4647c0e249ce58f25468a51a3c28492e09e77ca6..803f0ab0d12488791e985ce393d9867fe69ea781 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,15 @@
-apt (0.7.25ubuntu3) 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
 
   * cmdline/apt-get.cc:
     - fix apt-get source pkg=version regression (closes: #561971)
@@ -15,7 +26,7 @@ apt (0.7.25ubuntu3) UNRELEASED; urgency=low
     - add new --auto-detect option that uses libudev to figure out
       the cdrom/mount-point
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 27 Jan 2010 12:12:16 +0100
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Wed, 27 Jan 2010 16:11:32 +0100
 
 apt (0.7.25ubuntu2) lucid; urgency=low