From: Michael Vogt <mvo@debian.org>
Date: Thu, 6 Jun 2013 17:25:59 +0000 (+0200)
Subject: merged trunk
X-Git-Tag: 0.9.9~10
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/1af17f1de32234f3a878bd22eea1f45dff06eeb9?ds=inline;hp=--cc

merged trunk
---

1af17f1de32234f3a878bd22eea1f45dff06eeb9
diff --cc debian/changelog
index 450a9c382,7d22ba396..aa8553251
--- a/debian/changelog
+++ b/debian/changelog
@@@ -17,7 -17,12 +17,13 @@@ apt (0.9.8.2) unstable; urgency=lo
    * Fix crash when the "mirror" method does not find any entry
      (closes: #699303)
  
++
+   [ Johan Kiviniemi ]
+   * cmdline/apt-key:
+     - Create new keyrings with mode 0644 instead of 0600.
+     - Accept a nonexistent --keyring file with the adv subcommand as well.
+ 
 - -- Christian Perrier <bubulle@debian.org>  Thu, 16 May 2013 22:28:22 +0200
 + -- Michael Vogt <mvo@debian.org>  Thu, 06 Jun 2013 19:15:14 +0200
  
  apt (0.9.8.1) unstable; urgency=low