summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2010-05-04 09:57:24 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2010-05-04 09:57:24 +0200
commit52d9d000a74ea71edff93f00ae38aceb9ada53d4 (patch)
treee03749a63a2057b107ba900bbdbdfb9ad320c037 /debian
parent3b1fffc35f3eb277d92f38c687c270edd1d8550d (diff)
parent8f40076991ecc89ab1e3c486da2696a44c285f18 (diff)
merge from the mvo branch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog13
1 files changed, 13 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index f166b7d32..eb618118d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+apt (0.7.26~exp4) unstable; urgency=low
+
+ * [ Abi break ] apt-pkg/acquire-item.{cc,h}:
+ - add "IsIndexFile" to constructor of pkgAcqFile so that it sends
+ the right cache control headers
+ * apt-pkg/depcache.cc:
+ - fix incorrect std::cout usage for debug output
+ * test/libapt/getlanguages_test.cc:
+ - Add test for Esperanto that has nocounty associated with them
+ (LP: #560956)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 04 May 2010 09:55:08 +0200
+
apt (0.7.26~exp3) UNRELEASED; urgency=low
[ Christian Perrier ]