[website] 08/10: Improve new upstream release structure.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository website.

commit 8dc8c89639cbaa80791de86e2cbf028177063141
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 24 20:50:56 2015 +0200

    Improve new upstream release structure.
---
 policy.xml | 69 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/policy.xml b/policy.xml
index dd7614a..4a6f167 100644
--- a/policy.xml
+++ b/policy.xml
@@ -1087,6 +1087,34 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
         <sect4 id="git-new-upstream">
           <title>Upgrading to a new upstream release</title>
           <para>
+            To download the new upstream release and import the sources into
+            the git repository, the most common way is to use
+            <command>uscan</command> and <command>git-import-orig</command>
+            as follows.
+          </para>
+          <para>
+            First download the upstream tarball with <command>uscan</command>:
+<programlisting>
+<command>uscan</command> <option>--verbose</option> <option>--download</option>
+</programlisting>
+          </para>
+          <para>
+            Then import the downloaded tarball with
+            <command>git-import-orig</command>:
+<programlisting>
+<command>git-import-orig</command> <option>--pristine-tar</option> <option><replaceable>../<package>_<version>.orig.tar.gz</replaceable></option>
+</programlisting>
+          </para>
+          <para>
+            Finally create a new
+            <link linkend="debian-changelog"><filename>debian/changelog</filename></link>
+            entry for the new upstream release and commit the change:
+<programlisting>
+<command>dch</command> <option>-v</option> <replaceable><version></replaceable>-1 <literal>"New upstream release."</literal>
+<command>debcommit</command> <option>-a</option>
+</programlisting>
+          </para>
+          <para>
             <command>git-buildpackage</command>'s command
             <command>git-import-orig</command> makes it easy to update the
             <literal>upstream</literal> branch using upstream releases
@@ -1100,13 +1128,12 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
             produced when building a source package from the repository alone
             (not doing so results in archive rejection of package updates).
           </para>
-          <tip>
-            <para>
-              With recent versions of <command>git-buildpackage</command>,
-              it is often unnecessary to rename the freshly downloaded original
-              upstream archive.
-            </para>
-          </tip>
+          <para>
+            When the <option>pristine-tar</option> option is not configured in
+            <link linkend="debian-gbp.conf"><filename>debian/gbp.conf</filename></link>
+            you need to explicitly use
+            <command>git-import-orig</command> <option>--pristine-tar</option>.
+          </para>
           <para>
             If you do not use <command>git-buildpackage</command>, please use
             <command>pristine-tar</command> anyway to register the compressed
@@ -1121,12 +1148,6 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
 <command>pristine-tar commit</command> <option><replaceable><tarball></replaceable></option> <option><replaceable><tag></replaceable></option>
 </programlisting>
           </para>
-          <para>
-            When the <option>pristine-tar</option> option is not configured in
-            <link linkend="debian-gbp.conf"><filename>debian/gbp.conf</filename></link>
-            you need to explicitly use
-            <command>git-import-orig</command> <option>--pristine-tar</option>.
-          </para>
           <warning>
             <para>
               While it's possible to use the <option>--uscan</option> option
@@ -1142,28 +1163,6 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
               is still affected.
             </para>
           </warning>
-          <para>
-            First download the upstream tarball with <command>uscan</command>:
-<programlisting>
-<command>uscan</command> <option>--verbose</option> <option>--download</option>
-</programlisting>
-          </para>
-          <para>
-            Then import the downloaded tarball with
-            <command>git-import-orig</command>:
-<programlisting>
-<command>git-import-orig</command> <option>--pristine-tar</option> <option><replaceable>../<package>_<version>.orig.tar.gz</replaceable></option>
-</programlisting>
-          </para>
-          <para>
-            And create a new
-            <link linkend="debian-changelog"><filename>debian/changelog</filename></link>
-            entry for the new upstream release:
-<programlisting>
-<command>dch</command> <option>-v</option> <replaceable><version></replaceable>-1 <literal>"New upstream release."</literal>
-<command>debcommit</command> <option>-a</option>
-</programlisting>
-          </para>
           <sect5 id="git-update-patches">
             <title>Update patches for new upstream release</title>
             <para>

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