summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@ubuntu.com>2014-11-03 08:59:19 +0100
committerMichael Vogt <mvo@ubuntu.com>2014-11-03 08:59:19 +0100
commit26f6e9b4c32c937d5a138404a9c1b94809c3afd6 (patch)
tree5208d66e39a8c61ba9e9ade61dc1c03f0711d475 /debian
parent0c535a8aedc34705ed115754796856a2b5d92a08 (diff)
parent28460cb27846b2437010b08adf10bde18e370974 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: debian/changelog
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog29
1 files changed, 28 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 40d23dbdf..a0ee4d170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,30 @@
+apt (1.0.9.3ubuntu1) UNRELEASED; urgency=low
+
+ * Merged from debian/sid, remaining changes:
+ - patch for apt cross-building, see http://bugs.debian.org/666772
+ - ubuntu changelog download handling
+ - apt-key net-update/apt-xapian-index
+ - git-buildpackage config adjustments
+ - ubuntu keyring
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 03 Nov 2014 08:57:11 +0100
+
+apt (1.0.9.3) unstable; urgency=medium
+
+ [ josch ]
+ * implement the updated build profile spec
+
+ [ Michael Vogt ]
+ * methods/rsh.cc: replace strcat with std::string (Closes: #76442)
+
+ [ Guillem Jover ]
+ * Update Status field values handling
+
+ [ David Kalnischkies ]
+ * don't cleanup cdrom files in apt-get update (Closes: 765458)
+
+ -- Michael Vogt <mvo@debian.org> Wed, 15 Oct 2014 19:49:38 +0200
+
apt (1.0.9.2ubuntu2) utopic; urgency=medium
[ David Kalnischkies ]
@@ -37,7 +64,7 @@ apt (1.0.9.2) unstable; urgency=medium
[ Guillem Jover ]
* apt-get: Create the temporary downloaded changelog inside tmpdir
- (closes: #763780)
+ (closes: #763780) (CVE-2014-7206)
-- Michael Vogt <mvo@debian.org> Thu, 02 Oct 2014 22:05:39 +0200