[website] 06/08: Add 'Uploading a new package release' section and improve 'Tag a release' section.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository website.

commit 1fee4d01944c82f6c7bc31a18285a8300c457ad8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 22 02:20:07 2014 +0100

    Add 'Uploading a new package release' section and improve 'Tag a release' section.
---
 policy.xml | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 56 insertions(+), 8 deletions(-)

diff --git a/policy.xml b/policy.xml
index 726c182..9f4cc26 100644
--- a/policy.xml
+++ b/policy.xml
@@ -1115,7 +1115,7 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
             </para>
           </sect5>
           <sect5 id="push-package-to-alioth">
-            <title>To push the package</title>
+            <title>Push the package</title>
             <para>
               Make sure you've
               <link linkend="git-repository-on-alioth">created the repository on Alioth</link>
@@ -1125,24 +1125,72 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
             <para>
               Push all your local changes to Alioth:
 <programlisting>
-<command>git push</command> --all --set-upstream 
-<command>git push</command> --tags
+<command>git push</command> <option>--all</option> <option>--set-upstream</option>
+<command>git push</command> <option>--tags</option>
 </programlisting>
             </para>
           </sect5>
+        </sect4>
+        <sect4 id="git-release-upload">
+          <title>Uploading a new package release</title>
+          <para>
+            Before uploading a package, make sure that the appropriate
+            <ulink url="https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Distribution">distribution</ulink>
+            and
+            <ulink url="https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Urgency">urgency</ulink>
+            are set in the
+            <link linkend="debian-changelog"><filename>debian/changelog</filename></link>.
+          </para>
+          <para>
+            The defaults used by <command>dch</command> <option>-r</option>
+            are usually fine, security uploads should use
+            <literal>urgency=high</literal>.
+          </para>
+          <para>
+            A non default distribution and urgency can be specified with the
+            <option>--distribution</option> and <option>--urgency</option>
+            options, or their short form:
+<programlisting>
+<command>dch</command> <option>-r</option> <option>-D</option> <replaceable><distribution></replaceable> <option>-u</option> <replaceable><urgency></replaceable>
+</programlisting>
+          </para>
+          <para>
+            ...
+          </para>
+
           <sect5 id="git-tag-release">
-            <title>To tag a release</title>
+            <title>Tag a release</title>
             <para>
+              It's highly recommended to not tag a release before it's uploaded
+              to the archive.
+              Forcefully updating an existing tag for changes made before the
+              actual upload is not desirable, especially when the tag is signed.
+            </para>
+            <para>
+              To tag a release using the version from latest entry in
+              <link linkend="debian-changelog"><filename>debian/changelog</filename></link>
+              you can use:
 <programlisting>
-<command>git tag</command> <option>debian/x.y-z</option>.
+<command>debcommit</command> <option>-a</option> <option>-r</option>
 </programlisting>
+              The <option>-a</option> is used commit all changed files,
+              and not only tag the release.
             </para>
             <para>
-              You can also easily retroactively make tags:
+              You can also tag a specific distribution and/or version using:
 <programlisting>
-<command>git tag</command> <option>debian/x.y-z</option> <option><commit></option>
+<command>git tag</command> <replaceable><distribution>/<package_version></replaceable>
 </programlisting>
-              Remember to push the new tags.
+            </para>
+            <para>
+              To tag a release using a specific commit instead of the most
+              recent in the current branch use:
+<programlisting>
+<command>git tag</command> <replaceable>debian/x.y-z</replaceable> <replaceable><commit></replaceable>
+</programlisting>
+            </para>
+            <para>
+              Remember to push the new tags:
 <programlisting>
 <command>git push</command> <option>--tags</option>
 </programlisting>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.git