[website] 04/06: Add patch removal examples + typo fixes.
Bas Couwenberg
sebastic at xs4all.nl
Fri May 9 15:08:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository website.
commit 320a399535e98172cd99ea43c3ae191697966050
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri May 9 13:51:28 2014 +0200
Add patch removal examples + typo fixes.
---
policy.xml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/policy.xml b/policy.xml
index 039012b..1292b84 100644
--- a/policy.xml
+++ b/policy.xml
@@ -1009,7 +1009,7 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
</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 remove, or need to be refreshed.
+ 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
@@ -1022,9 +1022,13 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
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
+ 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>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.git
More information about the Pkg-grass-devel
mailing list