[SCM] website branch, master, updated. ad038136d24d649bb5d4e73820fcc445880ab333

Bas Couwenberg sebastic at xs4all.nl
Sun Jan 19 22:32:58 UTC 2014


The following commit has been merged in the master branch:
commit 5a301fc9c7bf98d35e7176129a79f1cc4ec5e980
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 19 23:32:16 2014 +0100

    Improve Config::Module section. Add explicit debian/control examples.

diff --git a/policy.xml b/policy.xml
index b2d0b6c..b224b99 100644
--- a/policy.xml
+++ b/policy.xml
@@ -1019,18 +1019,6 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
 </programlisting>
             </para>
           </sect5>
-          <sect5 id="">
-            <title></title>
-            <para>
-              ...
-            </para>
-          </sect5>
-          <sect5 id="">
-            <title></title>
-            <para>
-              ...
-            </para>
-          </sect5>
         </sect4>
       </sect3>
       <sect3 id="git-package-branches">
@@ -1368,7 +1356,12 @@ lintian ../build-area/*changes
         <listitem>
           <formalpara>
             <title>Section</title>
-            <para>Should be <quote>science</quote> for the source package.</para>
+            <para>
+              Should be <quote>science</quote> for the source package.
+<programlisting>
+Section: science
+</programlisting>
+            </para>
           </formalpara>
         </listitem>
         <listitem>
@@ -1380,6 +1373,9 @@ lintian ../build-area/*changes
               (<ulink url="http://www.debian.org/doc/debian-policy/ch-archive.html#s-priorities">see §2.5</ulink>).
               Packages of priority <quote>extra</quote> are excluded from some
               QA tests.
+<programlisting>
+Priority: optional
+</programlisting>
             </para>
           </formalpara>
         </listitem>
@@ -1395,6 +1391,9 @@ lintian ../build-area/*changes
               <ulink url="http://qa.debian.org/developer.php?login=pkg-grass-devel@lists.alioth.debian.org">QA page</ulink>
               corresponding to this email to gather information about the
               packages.
+<programlisting>
+Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+</programlisting>
             </para>
           </formalpara>
         </listitem>
@@ -1403,10 +1402,16 @@ lintian ../build-area/*changes
             <title>Uploaders</title>
             <para>
               Please add yourself as an uploader when you have a significant
-              interest in a package. Being Uploader means that you are expected
-              to answer to the bug reports. For more occasional works, you can
-              do a
-              <ulink url="http://www.debian.org/doc/developers-reference/pkgs#nmu-team-upload">team upload</ulink>.
+              interest in a package.
+              Being Uploader means that you are expected to answer to the bug
+              reports.
+              For more occasional works, you can do a
+              <ulink url="http://www.debian.org/doc/developers-reference/pkgs#nmu-team-upload">team upload</ulink>
+              with <command>dch</command> <option>--team</option>.
+<programlisting>
+Uploaders: <replaceable>John Doe <johndoe at example.com></replaceable>,
+           <replaceable>Your Name <yourname at example.com></replaceable>
+</programlisting>
             </para>
           </formalpara>
         </listitem>
@@ -1417,6 +1422,9 @@ lintian ../build-area/*changes
               Please always use the latest unless there are concerns for
               backporting. If no changes are needed, please indicate this
               fact in the changelog, and increment the value of the field.
+<programlisting>
+Standards-Version: 3.9.5
+</programlisting>
             </para>
           </formalpara>
         </listitem>
@@ -1425,12 +1433,15 @@ lintian ../build-area/*changes
             <title>Homepage</title>
             <para>
               Should be documented whenever possible.
+<programlisting>
+Homepage: <replaceable>http://www.example.com/</replaceable>
+</programlisting>
             </para>
           </formalpara>
         </listitem>
         <listitem>
           <formalpara id="vcs-url">
-            <title>Vcs-Git: and Vcs-Browser:</title>
+            <title>Vcs-Git and Vcs-Browser</title>
             <para>
               Please use the following templates, and refer to the Debian Policy
               <ulink url="http://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-VCS-fields">§ 5.6.26</ulink>
@@ -1448,18 +1459,25 @@ Vcs-Svn: svn://anonscm.debian.org/pkg-grass/packages/<package>/trunk/
           </formalpara>
         </listitem>
       </orderedlist>
-      <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
-        <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.
+      <sect3 id="cme">
+        <title>Config::Model</title>
+        <para>
+          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>.
+        </para>
+        <para>
+          To do so make sure you have installed
+          <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.
+        </para>
+        <para>
+          Please note that sometimes you need to call this more than once.
+        </para>
 <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
@@ -1468,22 +1486,27 @@ Vcs-Svn: svn://anonscm.debian.org/pkg-grass/packages/<package>/trunk/
 <command>cme check</command> <option>dpkg-control</option>
 <command>cme fix</command> <option>dpkg-control</option>
 </programlisting>
-      </para>
+      </sect3>
     </sect2>
     <sect2 id="debian-copyright">
       <title><filename>debian/copyright</filename></title>
       <para>
         We use the
         <ulink url="http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/">machine-readable format</ulink>
-        for the <filename>debian/copyright</filename> file. The
-        <computeroutput>Source</computeroutput> field does not need to contain
-        the full URL to the particular version that is being packaged, since
-        this can be determined by the <command>uscan</command> program with the
-        <filename>debian/watch</filename> file. Please list yourself in the
-        <computeroutput>Files: debian/*</computeroutput> section if you think
-        that your contributions are not trivial and therefore subjected to
-        copyright. Please chose a license that is compatible with the program
-        you package. You can also use
+        for the <filename>debian/copyright</filename> file.
+      </para>
+      <para>
+        The <literal>Source</literal> field does not need to contain the full
+        URL to the particular version that is being packaged,
+        since this can be determined by the <command>uscan</command> program
+        with the <filename>debian/watch</filename> file.
+      </para>
+      <para>
+        Please list yourself in the <literal>Files: debian/*</literal> section
+        if you think that your contributions are not trivial and therefore
+        subjected to copyright.
+        Please chose a license that is compatible with the program you package.
+        You can also use
         <quote>same as if it were in the public domain</quote> or
         <quote>same as the packaged program itself</quote>.
       </para>
@@ -1499,11 +1522,12 @@ Vcs-Svn: svn://anonscm.debian.org/pkg-grass/packages/<package>/trunk/
         To verify the correct syntax of the
         <filename>debian/copyright</filename> file you can use:
 <programlisting>
-<command>config-edit</command> <option>-application dpkg-copyright</option> <option>-ui none</option>
+<command>cme check</command> <option>dpkg-copyright</option>
+<command>cme fix</command> <option>dpkg-copyright</option>
 </programlisting>
         or 
 <programlisting>
-<command>cme fix</command> <option>dpkg-copyright</option>
+<command>config-edit</command> <option>-application dpkg-copyright</option> <option>-ui none</option>
 </programlisting>
         from package <filename>libconfig-model-dpkg-perl</filename>
         (see <link linkend="cme">Config::Model</link> above).
@@ -1519,7 +1543,8 @@ Vcs-Svn: svn://anonscm.debian.org/pkg-grass/packages/<package>/trunk/
       <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>.
+        in <filename>~/.devscripts</filename> and using
+        <ulink url="http://manpages.debian.net/cgi-bin/man.cgi?query=dch"><command>dch</command></ulink>.
       </para>
     </sect2>
     <sect2 id="debian-upstream">

-- 
pkg-grass website



More information about the Pkg-grass-devel mailing list