From: lucas <lucas@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Thu, 29 May 2008 10:37:52 +0000 (+0000)
Subject: Mention Debian Maintainers and the debian-maintainers package. (#483225)
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=commitdiff_plain;h=0f9085ad6385ebf75fc04dd9203be4c2a5ebaa14

Mention Debian Maintainers and the debian-maintainers package. (#483225)

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@5186 313b444b-1b9f-4f58-a734-7bb04f332e8d
---

diff --git a/common.ent b/common.ent
index 6b6a7b5..b3fe901 100644
--- a/common.ent
+++ b/common.ent
@@ -81,6 +81,7 @@
 <!ENTITY url-ddpo "http://qa.debian.org/developer.php">
 <!ENTITY url-dcg "http://people.debian.org/~enrico/dcg/">
 <!ENTITY url-rt "https://rt.debian.org/">
+<!ENTITY url-wiki-dm "http://wiki.debian.org/Maintainers">
 
 <!ENTITY url-incoming "http://incoming.debian.org/">
 <!ENTITY url-testing-maint "http://www.debian.org/devel/testing">
diff --git a/debian/changelog b/debian/changelog
index 7de7b22..fa61c59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ developers-reference (3.4.0) UNRELEASED; urgency=low
   * Collaborative Maintenance: the 'global part' of debian/control
     is the first paragraph, about the source package. Closes: #483231.
   * debian-private archives are on master. Closes: #475531.
+  * Mention Debian Maintainers and the debian-maintainers package.
+    Closes: #483225.
 
- -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Wed, 28 May 2008 23:51:17 +0200
+ -- Lucas Nussbaum <lucas@lucas-nussbaum.net>  Thu, 29 May 2008 12:34:41 +0200
 
 developers-reference (3.3.9) unstable; urgency=low
 
diff --git a/pkgs.dbk b/pkgs.dbk
index e2d9c44..15cb2f0 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -373,7 +373,8 @@ and dsc-file) with anonymous ftp to <literal>&ftp-master-host;</literal> in
 the directory <ulink
 url="ftp://&ftp-master-host;&upload-queue;">&upload-queue;</ulink>.
 To get the files processed there, they need to be signed with a key in the
-debian keyring.
+Debian Developers keyring or the Debian Maintainers keyring
+(see <ulink url="&url-wiki-dm;"></ulink>).
 </para>
 <para>
 Please note that you should transfer the changes file last.  Otherwise, your
diff --git a/tools.dbk b/tools.dbk
index fcf1d17..01ee79c 100644
--- a/tools.dbk
+++ b/tools.dbk
@@ -537,6 +537,14 @@ linkend="key-maint"/> and the package documentation for more information.
 </para>
 </section>
 
+<section id="debian-maintainers">
+<title><systemitem role="package">debian-maintainers</systemitem></title>
+<para>
+Contains the public GPG keys of Debian Maintainers.
+See <ulink url="&url-wiki-dm;"></ulink> for more information.
+</para>
+</section>
+
 <section id="debview">
 <title><systemitem role="package">debview</systemitem></title>
 <para>