This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository website.
commit 809112068582ae5cf0bd1d89ec0837eca706d1ce Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sat Feb 15 22:56:53 2014 +0100 Use programlisting instead of userinput for quilt example commands. --- policy.xml | 125 +++++++++++++++++++++++++++++-------------------------------- 1 file changed, 59 insertions(+), 66 deletions(-) diff --git a/policy.xml b/policy.xml index 44c1ba5..e4e0bc7 100644 --- a/policy.xml +++ b/policy.xml @@ -1892,13 +1892,11 @@ pristine-tar = True open <filename>.quiltrc</filename> in your home directory (create it if you don't have one), and make sure it looks like this: </para> - <blockquote> <programlisting> QUILT_DIFF_ARGS="--no-timestamps --no-index" QUILT_REFRESH_ARGS="--no-timestamps --no-index" QUILT_PATCHES="debian/patches" </programlisting> - </blockquote> <para> After this, you're ready to start working with quilt. See also the instructions in the @@ -1909,40 +1907,28 @@ QUILT_PATCHES="debian/patches" <para> To create a patch, use the <command>new</command> command. Run: </para> - <blockquote> - <para> - <userinput> - <command>quilt new</command> <filename><patch_name>.patch</filename> - </userinput> - </para> - </blockquote> +<programlisting> +<command>quilt new</command> <replaceable><patch_name>.patch</replaceable> +</programlisting> <para> - This will create (if it doesn't exist yet) a - <filename>debian/patches/series</filename> file, which contains all - the patches to be applied by quilt. Moreover, the new patch is also - the topmost (the currently applied). + This will create a <filename>debian/patches/series</filename> file + (if it doesn't exist yet), which contains all the patches to be + applied by quilt. + Moreover, the new patch is also the topmost (the currently applied). </para> <para> Now start editing files, with: </para> - <blockquote> - <para> - <userinput> - <command>quilt edit</command> <filename><file></filename> - </userinput> - </para> - </blockquote> +<programlisting> +<command>quilt edit</command> <replaceable><file></replaceable> +</programlisting> <para> - and repeat the process for each file the patch is involved with. - At the end, run + And repeat the process for each file the patch is involved with. + At the end, run: </para> - <blockquote> - <para> - <userinput> - <command>quilt refresh</command> - </userinput> - </para> - </blockquote> +<programlisting> +<command>quilt refresh</command> +</programlisting> <para> This will compare the noted state of the edited files with the current state, and will produce a patch in @@ -1954,43 +1940,56 @@ QUILT_PATCHES="debian/patches" <sect4 id="quilt-apply"> <title>Applying and unapplying patches</title> <para> - Just two easy commands to do the job: - </para> - <itemizedlist> - <listitem> - <para> - <command>quilt pop</command> will unapply the topmost patch. - </para> - </listitem> - <listitem> - <para> - <command>quilt push</command> will apply the next patch in - <filename>debian/patches/series</filename>. - </para> - </listitem> - </itemizedlist> - <para> - You can just add a "-a" flag to the commands above, to respectively - apply/unapply all patches in the series. + To apply the next patch in + <filename>debian/patches/series</filename>: +<programlisting> +<command>quilt push</command> +</programlisting> + </para> + <para> + To unapply the topmost patch: +<programlisting> +<command>quilt pop</command> +</programlisting> + </para> + <para> + You can just add the <option>-a</option> option to the commands + above, to respectively apply and unapply all patches in the series. </para> <tip> <para> - You can check which patches are applied/unapplied with, - respectively, <command>quilt applied</command> and - <command>quilt unapplied</command>. + You can check which patches are applied with: +<programlisting> +<command>quilt applied</command> +</programlisting> + </para> + <para> + And which are unapplied: +<programlisting> +<command>quilt unapplied</command> +</programlisting> + </para> + <para> + To check which patch is next in + <filename>debian/patches/series</filename> to be applied: +<programlisting> +<command>quilt next</command> +</programlisting> + </para> + <para> + And which is next to be unapplied: +<programlisting> +<command>quilt prev</command> +</programlisting> </para> </tip> </sect4> <sect4 id="quilt-edit"> <title>Editing patches</title> <para>To edit a patch, first make it the topmost:</para> - <blockquote> - <para> - <userinput> - <command>quilt push</command> <filename><patch_name></filename> - </userinput> - </para> - </blockquote> +<programlisting> +<command>quilt push</command> <replaceable><patch_name></replaceable> +</programlisting> <para> If the patch is already applied, but is not the topmost, run <command>quilt pop</command> until it becomes the currently @@ -2007,13 +2006,9 @@ QUILT_PATCHES="debian/patches" <para> Sometimes it's useful to rename a patch. Without any hassle, do: </para> - <blockquote> - <para> - <userinput> - <command>quilt rename -P</command> <filename><old_name>.patch</filename> <filename><new_name>.patch</filename> - </userinput> - </para> - </blockquote> +<programlisting> +<command>quilt rename -P</command> <replaceable><old_name>.patch</replaceable> <replaceable><new_name>.patch</replaceable> +</programlisting> </sect4> <sect4 id="quilt-other"> <title>Other commands</title> @@ -2071,14 +2066,12 @@ clean: unpatch If you've also patched the build system, using upstream's clean target might fail. This is what you should do: </para> - <blockquote> <programlisting> ... clean: clean-patched unpatch clean-patched: ... </programlisting> - </blockquote> <para> Obviously, you could always use an approach like this, but it's an useless complication if you don't patch the build system, and you -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel