[Git][debian-gis-team/debian-gis-team.pages.debian.net][master] Update gbp.conf example to use --source-only-changes by default & fix spelling errors.
Bas Couwenberg
gitlab at salsa.debian.org
Sun Jul 7 06:41:35 BST 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / debian-gis-team.pages.debian.net
Commits:
76816012 by Bas Couwenberg at 2019-07-07T05:41:22Z
Update gbp.conf example to use --source-only-changes by default & fix spelling errors.
- - - - -
3 changed files:
- policy.xml
- public/policy/packaging.html
- public/policy/policy.html
Changes:
=====================================
policy.xml
=====================================
@@ -1224,14 +1224,14 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
<command>git-buildpackage</command> uses the configuration in
<link linkend="debian-gbp.conf"><filename>debian/gbp.conf</filename></link>
to override its default settings, and commandline parameters to
- overide both the built-in defaults and those loaded from
+ override both the built-in defaults and those loaded from
<filename>debian/gbp.conf</filename>.
</para>
<para>
It's not recommended to set the <literal>git-builder</literal>
option in <filename>debian/gbp.conf</filename> to use
<literal>git-pbuilder</literal> by default, because this setting
- cannot by overriden using a commandline parameter.
+ cannot by overridden using a commandline parameter.
</para>
<para>
The use of <command>pristine-tar</command> to recreate a byte-identical
@@ -1707,7 +1707,7 @@ allowed_distributions = .*
</para>
<para>
Resolve the merge conflict with a 3-way merge and keep the
- changelog entry for the previous backport above its releated
+ changelog entry for the previous backport above its related
release.
</para>
<para>
@@ -1955,7 +1955,7 @@ allowed_distributions = .*
archive.
</para>
<para>
- Folllow the instructions on the
+ Follow the instructions on the
<ulink url="https://backports.debian.org/Contribute/#index2h2">Debian Backports</ulink>
website to request addition to the backports ACL, or
<link linkend="sponsorship">request sponsorship</link> from a DD
@@ -2059,7 +2059,7 @@ allowed_distributions = .*
</para>
<para>
Change the current working directory to the package git repository
- and ensure the approriate branch is checked out and up-to-date.
+ and ensure the appropriate branch is checked out and up-to-date.
<programlisting>
<command>cd</command> <replaceable><path/to/git/repository></replaceable>
<command>git checkout</command> <replaceable><branch></replaceable>
@@ -2727,6 +2727,9 @@ upstream-tag = upstream/%(version)s
# Always use pristine-tar.
pristine-tar = True
+
+[buildpackage]
+pbuilder-options = --source-only-changes
</programlisting>
</para>
</sect2>
=====================================
public/policy/packaging.html
=====================================
@@ -508,13 +508,13 @@ DIST=<em class="replaceable"><code><distribution></code></em> ARCH=<em cla
<span class="command"><strong>git-buildpackage</strong></span> uses the configuration in
<a class="link" href="policy.html#debian-gbp.conf" title="debian/gbp.conf"><code class="filename">debian/gbp.conf</code></a>
to override its default settings, and commandline parameters to
- overide both the built-in defaults and those loaded from
+ override both the built-in defaults and those loaded from
<code class="filename">debian/gbp.conf</code>.
</p><p>
It's not recommended to set the <code class="literal">git-builder</code>
option in <code class="filename">debian/gbp.conf</code> to use
<code class="literal">git-pbuilder</code> by default, because this setting
- cannot by overriden using a commandline parameter.
+ cannot by overridden using a commandline parameter.
</p><p>
The use of <span class="command"><strong>pristine-tar</strong></span> to recreate a byte-identical
<code class="filename">orig.tar.gz</code> from the <code class="literal">upstream</code>
@@ -887,7 +887,7 @@ allowed_distributions = .*
</pre><p>
</p><p>
Resolve the merge conflict with a 3-way merge and keep the
- changelog entry for the previous backport above its releated
+ changelog entry for the previous backport above its related
release.
</p><p>
Commit the changes after resolving the conflicts and
@@ -1096,7 +1096,7 @@ allowed_distributions = .*
to the backports ACL can upload backported packages to the Debian
archive.
</p><p>
- Folllow the instructions on the
+ Follow the instructions on the
<a class="ulink" href="https://backports.debian.org/Contribute/#index2h2" target="_top">Debian Backports</a>
website to request addition to the backports ACL, or
<a class="link" href="packaging.html#sponsorship" title="Sponsorship">request sponsorship</a> from a DD
@@ -1181,7 +1181,7 @@ allowed_distributions = .*
package files, and not extract them as well.
</p><p>
Change the current working directory to the package git repository
- and ensure the approriate branch is checked out and up-to-date.
+ and ensure the appropriate branch is checked out and up-to-date.
</p><pre class="programlisting">
<span class="command"><strong>cd</strong></span> <em class="replaceable"><code><path/to/git/repository></code></em>
<span class="command"><strong>git checkout</strong></span> <em class="replaceable"><code><branch></code></em>
=====================================
public/policy/policy.html
=====================================
@@ -163,6 +163,9 @@ upstream-tag = upstream/%(version)s
# Always use pristine-tar.
pristine-tar = True
+
+[buildpackage]
+pbuilder-options = --source-only-changes
</pre><p>
</p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="debian-readme-source"></a><code class="filename">debian/README.source</code></h3></div></div></div><p>
This file is recommended by the Policy
View it on GitLab: https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/commit/7681601286cded29926eb3089127987e1dca1cd1
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/commit/7681601286cded29926eb3089127987e1dca1cd1
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20190707/c7c3bf18/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list