[website] 01/01: Use stretch instead of jessie in examples.
Bas Couwenberg
sebastic at debian.org
Fri Jun 23 07:01:13 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository website.
commit fefb4acecff08ad068d2762f86e1e0b06e57aa70
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jun 23 09:01:05 2017 +0200
Use stretch instead of jessie in examples.
---
policy.xml | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/policy.xml b/policy.xml
index d4fe432..bae7896 100644
--- a/policy.xml
+++ b/policy.xml
@@ -447,7 +447,7 @@ pkg-grass/
Changes uploaded to other distributions than Debian
<literal>unstable</literal> can be stored in other branches,
named for instance <literal>experimental</literal>,
- <literal>jessie</literal>, etc.
+ <literal>stretch</literal>, etc.
</para>
<para>
This is useful in case updates to packages in Debian
@@ -1690,16 +1690,16 @@ allowed_distributions = .*
First create a branch from the tag that represents the version
currently in the archive if there is no release specific branch yet:
<programlisting>
-<command>git checkout</command> <option>-b</option> <replaceable>jessie</replaceable> <replaceable>debian/1.2.0-1</replaceable>
+<command>git checkout</command> <option>-b</option> <replaceable>stretch</replaceable> <replaceable>debian/1.2.0-1</replaceable>
</programlisting>
- If the <replaceable>jessie</replaceable> branch already exists,
+ If the <replaceable>stretch</replaceable> branch already exists,
check it out and merge the version currently in the archive:
<programlisting>
-<command>git checkout</command> <replaceable>jessie</replaceable>
+<command>git checkout</command> <replaceable>stretch</replaceable>
<command>git merge</command> <replaceable>debian/1.2.0-1</replaceable>
</programlisting>
From this point on, work normally in the
- <replaceable>jessie</replaceable> branch,
+ <replaceable>stretch</replaceable> branch,
<link linkend="git-build-package">build</link>,
<link linkend="git-tag-release">tag</link> and
<link linkend="git-push-to-alioth">push</link>.
@@ -1714,8 +1714,8 @@ allowed_distributions = .*
Backports are maintained in separate
<link linkend="git-package-branches">branches</link>
named after the distribution in question
- (<literal>wheezy-backports</literal>,
- <literal>jessie-backports</literal>, etc.).
+ (<literal>jessie-backports</literal>,
+ <literal>stretch-backports</literal>, etc.).
</para>
<para>
For UbuntuGIS and OSGeo-Live
@@ -1751,7 +1751,7 @@ allowed_distributions = .*
To create a backport, first create the branch from the release tag
of the version in testing:
<programlisting>
-<command>git checkout</command> <option>-b</option> <replaceable>jessie-backports</replaceable> <replaceable>debian/1.2.3-1</replaceable>
+<command>git checkout</command> <option>-b</option> <replaceable>stretch-backports</replaceable> <replaceable>debian/1.2.3-1</replaceable>
</programlisting>
</para>
<para>
@@ -1760,7 +1760,7 @@ allowed_distributions = .*
to have <command>git-buildpackage</command> use the backports
branch instead of <literal>master</literal>:
<programlisting>
-<command>sed</command> <option>-i</option> <literal>'s/^debian-branch\s*=.*/debian-branch = <replaceable>jessie-backports</replaceable>/g'</literal> <filename>debian/gbp.conf</filename>
+<command>sed</command> <option>-i</option> <literal>'s/^debian-branch\s*=.*/debian-branch = <replaceable>stretch-backports</replaceable>/g'</literal> <filename>debian/gbp.conf</filename>
</programlisting>
</para>
<para>
@@ -1769,7 +1769,7 @@ allowed_distributions = .*
for <command>debcheckout</command> to use the backports branch
instead of the default:
<programlisting>
-<command>sed</command> <option>-i</option> <literal>'s/\(^Vcs-Git: .*\.git\).*/\1 -b <replaceable>jessie-backports</replaceable>/g'</literal> <filename>debian/control</filename>
+<command>sed</command> <option>-i</option> <literal>'s/\(^Vcs-Git: .*\.git\).*/\1 -b <replaceable>stretch-backports</replaceable>/g'</literal> <filename>debian/control</filename>
</programlisting>
</para>
<para>
@@ -1826,7 +1826,7 @@ allowed_distributions = .*
To update an existing backport, checkout the backports branch and
merge the release tag of the version in testing:
<programlisting>
-<command>git checkout</command> <replaceable>jessie-backports</replaceable>
+<command>git checkout</command> <replaceable>stretch-backports</replaceable>
<command>git merge</command> <replaceable>debian/1.3.2-1</replaceable>
</programlisting>
</para>
@@ -1886,14 +1886,14 @@ allowed_distributions = .*
package in the stable release or backports with the
<option>-v</option> option:
<programlisting>
-<command>gbp buildpackage</command> <option>--git-pbuilder</option> <option>--git-dist</option>=<replaceable>jessie</replaceable> <option>-v</option><replaceable>1.2.0-1</replaceable>
+<command>gbp buildpackage</command> <option>--git-pbuilder</option> <option>--git-dist</option>=<replaceable>stretch</replaceable> <option>-v</option><replaceable>1.2.0-1</replaceable>
</programlisting>
</para>
<para>
If the build dependencies cannot be satisfied in the stable release,
use the backports chroot instead:
<programlisting>
-<command>gbp buildpackage</command> <option>--git-pbuilder</option> <option>--git-dist</option>=<replaceable>jessie-backports</replaceable> <option>-v</option><replaceable>1.2.0-1</replaceable>
+<command>gbp buildpackage</command> <option>--git-pbuilder</option> <option>--git-dist</option>=<replaceable>stretch-backports</replaceable> <option>-v</option><replaceable>1.2.0-1</replaceable>
</programlisting>
</para>
<para>
@@ -1957,8 +1957,8 @@ allowed_distributions = .*
<blockquote>
<para>
Make sure that you have a proper build environment that only
- contains the suite for which the backport is for (e.g. jessie
- if you want to upload to jessie-backports) and no unneeded
+ contains the suite for which the backport is for (e.g. stretch
+ if you want to upload to stretch-backports) and no unneeded
backports. [...]
</para>
</blockquote>
@@ -1986,8 +1986,8 @@ allowed_distributions = .*
Plain stable cowbuilder chroots can be created with:
<programlisting>
<command>sudo cowbuilder</command> <option>--create</option> \
- <option>--distribution</option>=<replaceable>jessie</replaceable> \
- <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>jessie</replaceable>.cow \
+ <option>--distribution</option>=<replaceable>stretch</replaceable> \
+ <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>stretch</replaceable>.cow \
<option>--hookdir=/var/cache/pbuilder/hook.d/</option>
</programlisting>
</para>
@@ -1995,8 +1995,8 @@ allowed_distributions = .*
To create a chroot with the backports repository enabled, use:
<programlisting>
<command>sudo cowbuilder</command> <option>--create</option> \
- <option>--distribution</option>=<replaceable>jessie-backports</replaceable> \
- <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>jessie-backports</replaceable>.cow \
+ <option>--distribution</option>=<replaceable>stretch-backports</replaceable> \
+ <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>stretch-backports</replaceable>.cow \
<option>--hookdir=/var/cache/pbuilder/hook.d/</option>
</programlisting>
</para>
@@ -2046,7 +2046,7 @@ allowed_distributions = .*
option needs to be used to track changes from the origin
repository on Alioth:
<programlisting>
-<command>git push</command> origin <replaceable>jessie-backports</replaceable> <option>--set-upstream</option>
+<command>git push</command> origin <replaceable>stretch-backports</replaceable> <option>--set-upstream</option>
</programlisting>
Plain <command>git push</command> is sufficient when the backports
branch was checked out from the origin repository on Alioth:
--
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