[website] 03/10: Move patch update after new upstream to subsection.

[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 7f9f45acead5c6c19342768ff97adb593b44c843
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Apr 24 18:34:33 2015 +0200

    Move patch update after new upstream to subsection.
---
 policy.xml | 69 ++++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 47 insertions(+), 22 deletions(-)

diff --git a/policy.xml b/policy.xml
index b569aa2..9451ad6 100644
--- a/policy.xml
+++ b/policy.xml
@@ -820,6 +820,13 @@ pkg-grass/
           <listitem>
             <para>
               <link linkend="git-new-upstream">Upgrading to a new upstream release</link>
+              <itemizedlist>
+                <listitem>
+                  <para>
+                    <link linkend="git-update-patches">Update patches for new upstream release</link>
+                  </para>
+                </listitem>
+              </itemizedlist>
             </para>
           </listitem>
           <listitem>
@@ -1151,38 +1158,56 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
 <command>dch</command> <option>-v</option> <replaceable><version></replaceable>-1 <literal>"New upstream release."</literal>
 </programlisting>
           </para>
-          <para>
-            If <link linkend="patches">patches</link> are included in the source package it's likely they have
-            been applied upstream and can be removed, or need to be refreshed.
-          </para>
-          <para>
-            Step through the list of patches and update them for the new
-            upstream release.
+          <sect5 id="git-update-patches">
+            <title>Update patches for new upstream release</title>
+            <para>
+              If <link linkend="patches">patches</link> are included in the source package it's likely they have
+              been applied upstream and can be removed, or need to be refreshed.
+            </para>
+            <para>
+              Step through the list of patches and update them for the new
+              upstream release.
 <programlisting>
 <command>quilt push</command> && <command>quilt refresh</command>
 </programlisting>
-          </para>
-          <para>
-            Check all patches that fail to apply and remove the ones applied
-            upstream, <command>git rm</command> the patch file and remove its
-            entry in <filename>debian/patches/series</filename>.
+            </para>
+            <para>
+              Check all patches that fail to apply and remove the ones applied
+              upstream, <command>git rm</command> the patch file and remove its
+              entry in <filename>debian/patches/series</filename>.
 <programlisting>
 <command>quilt delete</command> <replaceable><patch></replaceable>
 <command>git rm</command> <filename>debian/patches/<replaceable><patch></replaceable></filename>
 </programlisting>
-          </para>
-          <para>
-            Patches that were only partially applied usually need to be
-            forcefully applied and refreshed.
+            </para>
+            <para>
+              Patches that were only partially applied usually need to be
+              forcefully applied and refreshed.
 <programlisting>
 <command>quilt push</command> <option>-f</option> && <command>quilt refresh</command>
 </programlisting>
-            Review the <filename>*.rej</filename> files to make sure the patch
-            was properly refreshed.
-          </para>
-          <para>
-            ...
-          </para>
+              Review the <filename>*.rej</filename> files to make sure the patch
+              was properly refreshed.
+            </para>
+            <para>
+              If manual merging of upstream changes is required, edit the
+              file(s) and refresh the patch afterwards.
+<programlisting>
+<command>quilt edit</command> <filename><replaceable><file></replaceable></filename>
+<command>quilt refresh</command>
+</programlisting>
+            </para>
+            <para>
+              When all patches have been refreshed, and the
+              <command>quilt</command> series is fully applied, unapply all
+              patches and commit the changes.
+<programlisting>
+<command>quilt pop</command> <option>-a</option>
+<command>rm -rf .pc/</command>
+<command>git commit</command> <option>-m</option> <literal>"Refresh patches"</literal> <option>-a</option>
+</programlisting>
+            </para>
+          </sect5>
         </sect4>
         <sect4 id="git-build-package">
           <title>Building the package</title>

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