summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2012-05-24 16:01:15 +0200
committerMichael Vogt <michael.vogt@ubuntu.com>2012-05-24 16:01:15 +0200
commitd9e10d0fdf812ebced54f4ea827d6132e0ebfef5 (patch)
tree904dd0148a028ef30a67013d98eac90e92c30cae /debian
parentd3f6489bf47dcf4fa5d8c2cd6a543ffa5f0105fe (diff)
parent4c86a6348d9916b6404709452affa10e9c776efa (diff)
merged from debian-sid
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog18
1 files changed, 18 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 661610f79..4edc80ac3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+apt (0.9.6) UNRELEASED; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/contrib/fileutl.cc:
+ - dup() given compressed fd in OpenDescriptor if AutoClose
+ is disabled as otherwise gzclose() and co will close it
+ * doc/*.xml:
+ - mark even more stuff as untranslateable and improve the
+ markup here and there (no real text change)
+ - use docbook DTD 4.5 instead of 4.2 to have valid docs
+
+ [ Justin B Rye ]
+ * doc/*.xml:
+ - remove 'GNU/Linux' from 'Debian systems' strings as Debian
+ has more systems than just GNU/Linux nowadays
+
+ -- David Kalnischkies <kalnischkies@gmail.com> Tue, 22 May 2012 18:13:19 +0200
+
apt (0.9.5ubuntu1) UNRELEASED; urgency=low
* merged from debian, remaining changes: