[website] 01/08: Set distribution for Ubuntu backports when creating the changelog entry.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository website.

commit 7a576d03f08615ff20f372ea79968c7bcba57066
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Jul 12 17:55:47 2016 +0200

    Set distribution for Ubuntu backports when creating the changelog entry.
---
 policy.xml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/policy.xml b/policy.xml
index 9392d68..fce8787 100644
--- a/policy.xml
+++ b/policy.xml
@@ -1791,9 +1791,10 @@ allowed_distributions = .*
             OSGeo-Live should append the distribution codename with the tilde
             prefix (as documented in the
             <link linkend="ubuntugis-ppa">UbuntuGIS PPA</link> section) to the
-            version used for the last changelog entry:
+            version used for the last changelog entry, and set the distribution
+            explicitly:
 <programlisting>
-<command>dch</command> <option>-v</option> <literal>$(dpkg-parsechangelog -SVersion)~<replaceable>xenial1</replaceable></literal> <option>-m</option> <literal>"Rebuild for <replaceable>xenial</replaceable>."</literal> <option>-b</option>
+<command>dch</command> <option>-v</option> <literal>$(dpkg-parsechangelog -SVersion)~<replaceable>xenial1</replaceable></literal> <option>-D</option> <replaceable>xenial</replaceable> <option>-m</option> <literal>"Rebuild for <replaceable>xenial</replaceable>."</literal> <option>-b</option>
 <command>dch</command> <option>-am</option> <literal>"Update branch in gbp.conf & Vcs-Git URL."</literal>
 </programlisting>
           </para>
@@ -1856,11 +1857,12 @@ allowed_distributions = .*
             bulletpoint needs to be kept in the changelog.
           </para>
           <para>
-            Set the version explicitly if the backport is intended for Ubuntu
-            (e.g. UbuntuGIS or OSGeo-Live), <command>dch</command>
-            <option>--bpo</option> is only appropriate for Debian Backports:
+            Set the version and distribution explicitly if the backport is
+            intended for Ubuntu (e.g. UbuntuGIS or OSGeo-Live),
+            <command>dch</command> <option>--bpo</option>
+            is only appropriate for Debian Backports:
 <programlisting>
-<command>dch</command> <option>-v</option> <literal>$(dpkg-parsechangelog -SVersion)~<replaceable>xenial1</replaceable></literal> <option>-m</option> <literal>"Rebuild for <replaceable>xenial</replaceable>."</literal> <option>-b</option>
+<command>dch</command> <option>-v</option> <literal>$(dpkg-parsechangelog -SVersion)~<replaceable>xenial1</replaceable></literal> <option>-D</option> <replaceable>xenial</replaceable> <option>-m</option> <literal>"Rebuild for <replaceable>xenial</replaceable>."</literal> <option>-b</option>
 </programlisting>
           </para>
           <para>
@@ -1932,15 +1934,6 @@ allowed_distributions = .*
             for more information about building packages for Ubuntu PPAs.
           </para>
           <para>
-            Before the final build of backports intended for Ubuntu, the
-            appropriate distribution needs to be set in
-            <link linkend="debian-changelog"><filename>debian/changelog</filename></link>:
-<programlisting>
-<command>dch</command> <option>-rD</option> <replaceable>xenial</replaceable>
-<command>git commit</command> <option>-m</option> "Set distribution to <replaceable>xenial</replaceable>." <option>-a</option>
-</programlisting>
-          </para>
-          <para>
             If the cowbuilder chroots for the backport are not available yet,
             set those up first as documented in the
             <link linkend="git-build-backport-chroot">next section</link>.

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