Merge lp:~blueyed/ubuntu/oneiric/apt/fix-apt-key-man-ubuntu-references into lp:ubuntu/oneiric/apt

[Daniel Hahler]

[Jamie Strandboge (jdstrand)]

Thanks for your patch! Unfortunately this needs to be updated:
* there are merge conflicts with 0.8.16~exp5ubuntu8
* debian/changelog should reference 'oneiric', not natty
* '<literal>ubuntu-archive-keyring</literal>' should be changed to '<literal>ubuntu-keyring</literal>'

review: Needs Fixing

[Daniel Hahler (blueyed)]

Well, I guess there's string freeze currently anyway, and it should not get into Oneiric because of that probably anyway.

Therefore I will postpone proposing this branch for when the P-series opens.

[Marc Deslauriers (mdeslaur)]

P is open now, could you retarget your branch please?

[Martin Pitt (pitti)]

Michael already merged this to the correct branch: lp:~ubuntu-core-dev/apt/ubuntu/

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-17 11:32:58 +0000
+++ debian/changelog	2011-09-11 20:29:18 +0000
@@ -1,3 +1,9 @@
+apt (0.8.16~exp5ubuntu7) natty; urgency=low
+
+  * doc/apt-key.8.xml: Ubuntu specific documentation changes (LP: #445903)
+
+ -- Daniel Hahler <[e-mail]>  Sun, 11 Sep 2011 22:17:50 +0200
+
 apt (0.8.16~exp5ubuntu6) oneiric; urgency=low
 
   [ Michael Vogt 
 
=== modified file 'doc/apt-key.8.xml'
--- doc/apt-key.8.xml	2011-08-08 14:30:07 +0000
+++ doc/apt-key.8.xml	2011-09-11 20:29:18 +0000
@@ -131,7 +131,7 @@
        Update the local keyring with the archive keyring and remove from
        the local keyring the archive keys which are no longer valid.
        The archive keyring is shipped in the <literal>archive-keyring</literal> package of your
-       distribution, e.g. the <literal>debian-archive-keyring</literal> package in Debian.
+       distribution, e.g. the <literal>ubuntu-archive-keyring</literal> package in Ubuntu.
 
      </para>
 
@@ -181,12 +181,12 @@
      <listitem><para>Local trust database of archive keys.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term><filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename></term>
-     <listitem><para>Keyring of Debian archive trusted keys.</para></listitem>
+     <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename></term>
+     <listitem><para>Keyring of Ubuntu archive trusted keys.</para></listitem>
      </varlistentry>
 
-     <varlistentry><term><filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename></term>
-     <listitem><para>Keyring of Debian archive removed trusted keys.</para></listitem>
+     <varlistentry><term><filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename></term>
+     <listitem><para>Keyring of Ubuntu archive removed trusted keys.</para></listitem>
      </varlistentry>
 
    </variablelist>