summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-05-04 13:26:49 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-05-04 13:26:49 +0200
commit6ee2b0f83ea3c41b52c8076eac63f921c51b9887 (patch)
tree545614a9d8074a34ec7daf2491c8a037055e62be /debian
parent173ae2a460b905b18911f42964fd38dbac2959d6 (diff)
parent52d9d000a74ea71edff93f00ae38aceb9ada53d4 (diff)
merge from the debian-sid branch
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
1 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 3fd3f0a33..0f01d1867 100644
--- 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: