merge from the debian-sid branch

[apt.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 3fd3f0a33592facc112bdd9259818177ba7d979d..0f01d1867dc5a1ca11f602345eba6caed9f6ca5b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,14 @@
-apt (0.7.26~exp4) experimental; urgency=low
+apt (0.7.26~exp4) UNRELEASED; urgency=low
+
+  [ Michael Vogt ]
+  * [ 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)
 
   [ David Kalnischkies ]
   * apt-pkg/depcache.cc: