[SCM] website branch, master, updated. 6c81bc5c8c44b116076250c659bc3a0cf7eb1cd7

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 6c81bc5c8c44b116076250c659bc3a0cf7eb1cd7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 19 19:24:03 2014 +0100

    Improve Config::Model paragraph, link to it from copyright section. Mention Git and Subversion in changelog section.

diff --git a/policy.xml b/policy.xml
index bf8baf7..1492c16 100644
--- a/policy.xml
+++ b/policy.xml
@@ -1447,16 +1447,26 @@ Vcs-Svn: svn://anonscm.debian.org/pkg-grass/packages/<package>/trunk/
           </formalpara>
         </listitem>
       </orderedlist>
-      <para>
-        It is a very good idea to use <command>Config::Model</command> to unify
-        the formatting of <filename>debian/control</filename>.
+      <para id="cme">
+        It is a very good idea to use
+        <ulink url="http://packages.qa.debian.org/libc/libconfig-model-perl.html"><command>Config::Model</command></ulink>
+        to unify the formatting of <filename>debian/control</filename>.
         To do so make sure you have installed
-        <command>apt-get</command> <option>install libconfig-model-dpkg-perl libconfig-model-itself-perl</option>
-        and than you can simply call
-        <command>cme</command> <option> fix dpkg-control</option>
+        <literal>libconfig-model-perl</literal>
+        and <literal>libconfig-model-dpkg-perl</literal>
+        and then you can simply call
+        <command>cme fix</command> <option>dpkg-control</option>
         to get a properly formated, sanity checked
-        <filename>debian/control</filename> file.  Please note that sometimes
-        you need to call this more than once.
+        <filename>debian/control</filename> file.
+        Please note that sometimes you need to call this more than once.
+<programlisting>
+<command>apt-get install</command> <option>libconfig-model-dpkg-perl libconfig-model-perl</option>
+# Install libconfig-model-itself-perl for a graphical model editor
+<command>apt-get install</command> <option>libconfig-model-itself-perl</option>
+
+<command>cme check</command> <option>dpkg-control</option>
+<command>cme fix</command> <option>dpkg-control</option>
+</programlisting>
       </para>
     </sect2>
     <sect2 id="debian-copyright">
@@ -1494,15 +1504,19 @@ Vcs-Svn: svn://anonscm.debian.org/pkg-grass/packages/<package>/trunk/
 <programlisting>
 <command>cme fix</command> <option>dpkg-copyright</option>
 </programlisting>
-        from package <filename>libconfig-model-dpkg-perl</filename> (see above).
+        from package <filename>libconfig-model-dpkg-perl</filename>
+        (see <link linkend="cme">Config::Model</link> above).
       </para>
     </sect2>
     <sect2 id="debian-changelog">
       <title><filename>debian/changelog</filename></title>
       <para>
-        Packages hosted in our Subversion repository, that have been modified
-        but not uploaded must use <literal>UNRELEASED</literal> as a
-        distribution name. This can be done automatically by declaring
+        Packages hosted in our Git or Subversion repository,
+        that have been modified but not uploaded must use
+        <literal>UNRELEASED</literal> as a distribution name.
+      </para>
+      <para>
+        This can be done automatically by declaring
         <literal><varname>DEBCHANGE_RELEASE_HEURISTIC</varname>=<replaceable>changelog</replaceable></literal>
         in <filename>~/.devscripts</filename> and using <command>dch</command>.
       </para>

-- 
pkg-grass website