[Git][debian-gis-team/debian-gis-team.pages.debian.net][master] Update for buster.
Bas Couwenberg
gitlab at salsa.debian.org
Tue Jul 9 20:02:08 BST 2019
Bas Couwenberg pushed to branch master at Debian GIS Project / debian-gis-team.pages.debian.net
Commits:
1e381c16 by Bas Couwenberg at 2019-07-09T19:01:52Z
Update for buster.
- - - - -
5 changed files:
- policy.xml
- public/policy/packaging.html
- public/policy/policy.html
- public/policy/repositories.html
- public/policy/tasks.html
Changes:
=====================================
policy.xml
=====================================
@@ -403,7 +403,7 @@ debian-gis-team/
Changes uploaded to other distributions than Debian
<literal>unstable</literal> can be stored in other branches,
named for instance <literal>experimental</literal>,
- <literal>stretch</literal>, etc.
+ <literal>buster</literal>, etc.
</para>
<para>
This is useful in case updates to packages in Debian
@@ -1209,7 +1209,7 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
<para>
To build the package for a different distribution than the default
<literal>sid</literal> such as <literal>experimental</literal> or
- <literal>wheezy-backports</literal>, use the
+ <literal>buster-backports</literal>, use the
<option>--git-dist</option> option.
<programlisting>
<command>gbp buildpackage</command> <option>--git-pbuilder</option> <option>--git-dist=<replaceable><distribution></replaceable></option>
@@ -1280,9 +1280,9 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
<programlisting>
<command>gbp buildpackage</command> <option>--git-pbuilder</option> <option>--git-dist=<replaceable><distribution></replaceable></option> <option>--git-debian-branch=<replaceable><branch></replaceable></option>
</programlisting>
- For example, use the <literal>wheezy</literal> distribution and
- the <literal>wheezy-backports</literal> branch to build a backport.
- Or using both the <literal>wheezy</literal> distribution and branch
+ For example, use the <literal>buster</literal> distribution and
+ the <literal>buster-backports</literal> branch to build a backport.
+ Or using both the <literal>buster</literal> distribution and branch
to build the package for <literal>stable-proposed-updates</literal>.
</para>
<para>
@@ -1565,16 +1565,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>stretch</replaceable> <replaceable>debian/1.2.0-1</replaceable>
+<command>git checkout</command> <option>-b</option> <replaceable>buster</replaceable> <replaceable>debian/1.2.0-1</replaceable>
</programlisting>
- If the <replaceable>stretch</replaceable> branch already exists,
+ If the <replaceable>buster</replaceable> branch already exists,
check it out and merge the version currently in the archive:
<programlisting>
-<command>git checkout</command> <replaceable>stretch</replaceable>
+<command>git checkout</command> <replaceable>buster</replaceable>
<command>git merge</command> <replaceable>debian/1.2.0-1</replaceable>
</programlisting>
From this point on, work normally in the
- <replaceable>stretch</replaceable> branch,
+ <replaceable>buster</replaceable> branch,
<link linkend="git-build-package">build</link>,
<link linkend="git-tag-release">tag</link> and
<link linkend="git-push-to-salsa">push</link>.
@@ -1589,8 +1589,8 @@ allowed_distributions = .*
Backports are maintained in separate
<link linkend="git-package-branches">branches</link>
named after the distribution in question
- (<literal>jessie-backports</literal>,
- <literal>stretch-backports</literal>, etc.).
+ (<literal>stretch-backports</literal>,
+ <literal>buster-backports</literal>, etc.).
</para>
<para>
For UbuntuGIS and OSGeo-Live
@@ -1626,7 +1626,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>stretch-backports</replaceable> <replaceable>debian/1.2.3-1</replaceable>
+<command>git checkout</command> <option>-b</option> <replaceable>buster-backports</replaceable> <replaceable>debian/1.2.3-1</replaceable>
</programlisting>
</para>
<para>
@@ -1635,7 +1635,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>stretch-backports</replaceable>/g'</literal> <filename>debian/gbp.conf</filename>
+<command>sed</command> <option>-i</option> <literal>'s/^debian-branch\s*=.*/debian-branch = <replaceable>buster-backports</replaceable>/g'</literal> <filename>debian/gbp.conf</filename>
</programlisting>
</para>
<para>
@@ -1644,7 +1644,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>stretch-backports</replaceable>/g'</literal> <filename>debian/control</filename>
+<command>sed</command> <option>-i</option> <literal>'s/\(^Vcs-Git: .*\.git\).*/\1 -b <replaceable>buster-backports</replaceable>/g'</literal> <filename>debian/control</filename>
</programlisting>
</para>
<para>
@@ -1701,7 +1701,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>stretch-backports</replaceable>
+<command>git checkout</command> <replaceable>buster-backports</replaceable>
<command>git merge</command> <replaceable>debian/1.3.2-1</replaceable>
</programlisting>
</para>
@@ -1761,14 +1761,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>stretch</replaceable> <option>-v</option><replaceable>1.2.0-1</replaceable>
+<command>gbp buildpackage</command> <option>--git-pbuilder</option> <option>--git-dist</option>=<replaceable>buster</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>stretch-backports</replaceable> <option>-v</option><replaceable>1.2.0-1</replaceable>
+<command>gbp buildpackage</command> <option>--git-pbuilder</option> <option>--git-dist</option>=<replaceable>buster-backports</replaceable> <option>-v</option><replaceable>1.2.0-1</replaceable>
</programlisting>
</para>
<para>
@@ -1832,8 +1832,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. stretch
- if you want to upload to stretch-backports) and no unneeded
+ contains the suite for which the backport is for (e.g. buster
+ if you want to upload to buster-backports) and no unneeded
backports. [...]
</para>
</blockquote>
@@ -1861,8 +1861,8 @@ allowed_distributions = .*
Plain stable cowbuilder chroots can be created with:
<programlisting>
<command>sudo cowbuilder</command> <option>--create</option> \
- <option>--distribution</option>=<replaceable>stretch</replaceable> \
- <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>stretch</replaceable>.cow \
+ <option>--distribution</option>=<replaceable>buster</replaceable> \
+ <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>buster</replaceable>.cow \
<option>--hookdir=/var/cache/pbuilder/hook.d/</option>
</programlisting>
</para>
@@ -1870,8 +1870,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>stretch-backports</replaceable> \
- <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>stretch-backports</replaceable>.cow \
+ <option>--distribution</option>=<replaceable>buster-backports</replaceable> \
+ <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>buster-backports</replaceable>.cow \
<option>--hookdir=/var/cache/pbuilder/hook.d/</option>
</programlisting>
</para>
@@ -1921,7 +1921,7 @@ allowed_distributions = .*
option needs to be used to track changes from the origin
repository on Salsa:
<programlisting>
-<command>git push</command> origin <replaceable>stretch-backports</replaceable> <option>--set-upstream</option>
+<command>git push</command> origin <replaceable>buster-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 Salsa:
@@ -2257,8 +2257,8 @@ get-orig-source:
<para>
Backports of Debian GIS packages should be kept as branches in the
package <link linkend="git-repository">Git repository</link> (e.g.
- <literal>wheezy-backports</literal>,
- <literal>jessie-backports</literal>, etc.).
+ <literal>stretch-backports</literal>,
+ <literal>buster-backports</literal>, etc.).
</para>
<para>
To upload backports DDs (and DMs for their packages) need to be added
@@ -2426,7 +2426,7 @@ get-orig-source:
<command>apt-get install</command> gis-tasks
<command>tasksel</command>
</programlisting>
- On Debian jessie, you can do the same. Or, you can also install one of
+ On Debian jessie (or later), you can do the same. Or, you can also install one of
the metapackages directly. Again, as root:
<programlisting>
<command>apt-get install</command> <replaceable><metapackage></replaceable>
@@ -2797,7 +2797,7 @@ pbuilder-options = --source-only-changes
<ulink url="https://manpages.debian.org/unstable/debhelper/debhelper.7.en.html#COMPATIBILITY_LEVELS">compatibility levels</ulink>
to control the behavior of its commands.
We currently recommend to use the level <literal>9</literal> which
- is available in current <literal>stable</literal> (stretch) and
+ is available in current <literal>oldstable</literal> (stretch) and
backported to <literal>oldoldstable</literal> (wheezy). It is also
the version supported in <literal>Ubuntu trusty</literal> and
<literal>Ubuntu xenial</literal>. If support for these is not
=====================================
public/policy/packaging.html
=====================================
@@ -494,7 +494,7 @@ DIST=<em class="replaceable"><code><distribution></code></em> ARCH=<em cla
</p><p>
To build the package for a different distribution than the default
<code class="literal">sid</code> such as <code class="literal">experimental</code> or
- <code class="literal">wheezy-backports</code>, use the
+ <code class="literal">buster-backports</code>, use the
<code class="option">--git-dist</code> option.
</p><pre class="programlisting">
<span class="command"><strong>gbp buildpackage</strong></span> <code class="option">--git-pbuilder</code> <code class="option">--git-dist=<em class="replaceable"><code><distribution></code></em></code>
@@ -558,9 +558,9 @@ DIST=<em class="replaceable"><code><distribution></code></em> ARCH=<em cla
</p><pre class="programlisting">
<span class="command"><strong>gbp buildpackage</strong></span> <code class="option">--git-pbuilder</code> <code class="option">--git-dist=<em class="replaceable"><code><distribution></code></em></code> <code class="option">--git-debian-branch=<em class="replaceable"><code><branch></code></em></code>
</pre><p>
- For example, use the <code class="literal">wheezy</code> distribution and
- the <code class="literal">wheezy-backports</code> branch to build a backport.
- Or using both the <code class="literal">wheezy</code> distribution and branch
+ For example, use the <code class="literal">buster</code> distribution and
+ the <code class="literal">buster-backports</code> branch to build a backport.
+ Or using both the <code class="literal">buster</code> distribution and branch
to build the package for <code class="literal">stable-proposed-updates</code>.
</p><p>
Packages targeting <a class="link" href="packaging.html#ubuntugis-ppa" title="PPA for Ubuntu by UbuntuGIS">UbuntuGIS</a>
@@ -769,16 +769,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:
</p><pre class="programlisting">
-<span class="command"><strong>git checkout</strong></span> <code class="option">-b</code> <em class="replaceable"><code>stretch</code></em> <em class="replaceable"><code>debian/1.2.0-1</code></em>
+<span class="command"><strong>git checkout</strong></span> <code class="option">-b</code> <em class="replaceable"><code>buster</code></em> <em class="replaceable"><code>debian/1.2.0-1</code></em>
</pre><p>
- If the <em class="replaceable"><code>stretch</code></em> branch already exists,
+ If the <em class="replaceable"><code>buster</code></em> branch already exists,
check it out and merge the version currently in the archive:
</p><pre class="programlisting">
-<span class="command"><strong>git checkout</strong></span> <em class="replaceable"><code>stretch</code></em>
+<span class="command"><strong>git checkout</strong></span> <em class="replaceable"><code>buster</code></em>
<span class="command"><strong>git merge</strong></span> <em class="replaceable"><code>debian/1.2.0-1</code></em>
</pre><p>
From this point on, work normally in the
- <em class="replaceable"><code>stretch</code></em> branch,
+ <em class="replaceable"><code>buster</code></em> branch,
<a class="link" href="packaging.html#git-build-package" title="Building the package">build</a>,
<a class="link" href="packaging.html#git-tag-release" title="Tag a release">tag</a> and
<a class="link" href="packaging.html#git-push-to-salsa" title="Push the package">push</a>.
@@ -789,8 +789,8 @@ allowed_distributions = .*
Backports are maintained in separate
<a class="link" href="packaging.html#git-package-branches" title="Branches">branches</a>
named after the distribution in question
- (<code class="literal">jessie-backports</code>,
- <code class="literal">stretch-backports</code>, etc.).
+ (<code class="literal">stretch-backports</code>,
+ <code class="literal">buster-backports</code>, etc.).
</p><p>
For UbuntuGIS and OSGeo-Live
<a class="link" href="repositories.html#other-git-branches" title="Other Git branches">their respective branches</a>
@@ -819,7 +819,7 @@ allowed_distributions = .*
To create a backport, first create the branch from the release tag
of the version in testing:
</p><pre class="programlisting">
-<span class="command"><strong>git checkout</strong></span> <code class="option">-b</code> <em class="replaceable"><code>stretch-backports</code></em> <em class="replaceable"><code>debian/1.2.3-1</code></em>
+<span class="command"><strong>git checkout</strong></span> <code class="option">-b</code> <em class="replaceable"><code>buster-backports</code></em> <em class="replaceable"><code>debian/1.2.3-1</code></em>
</pre><p>
</p><p>
Update the <code class="literal">debian-branch</code> option in
@@ -827,7 +827,7 @@ allowed_distributions = .*
to have <span class="command"><strong>git-buildpackage</strong></span> use the backports
branch instead of <code class="literal">master</code>:
</p><pre class="programlisting">
-<span class="command"><strong>sed</strong></span> <code class="option">-i</code> <code class="literal">'s/^debian-branch\s*=.*/debian-branch = <em class="replaceable"><code>stretch-backports</code></em>/g'</code> <code class="filename">debian/gbp.conf</code>
+<span class="command"><strong>sed</strong></span> <code class="option">-i</code> <code class="literal">'s/^debian-branch\s*=.*/debian-branch = <em class="replaceable"><code>buster-backports</code></em>/g'</code> <code class="filename">debian/gbp.conf</code>
</pre><p>
</p><p>
Also update the <code class="literal">Vcs-Git</code> URL in
@@ -835,7 +835,7 @@ allowed_distributions = .*
for <span class="command"><strong>debcheckout</strong></span> to use the backports branch
instead of the default:
</p><pre class="programlisting">
-<span class="command"><strong>sed</strong></span> <code class="option">-i</code> <code class="literal">'s/\(^Vcs-Git: .*\.git\).*/\1 -b <em class="replaceable"><code>stretch-backports</code></em>/g'</code> <code class="filename">debian/control</code>
+<span class="command"><strong>sed</strong></span> <code class="option">-i</code> <code class="literal">'s/\(^Vcs-Git: .*\.git\).*/\1 -b <em class="replaceable"><code>buster-backports</code></em>/g'</code> <code class="filename">debian/control</code>
</pre><p>
</p><p>
Ensure that the proper version and distribution for the backport
@@ -882,7 +882,7 @@ allowed_distributions = .*
To update an existing backport, checkout the backports branch and
merge the release tag of the version in testing:
</p><pre class="programlisting">
-<span class="command"><strong>git checkout</strong></span> <em class="replaceable"><code>stretch-backports</code></em>
+<span class="command"><strong>git checkout</strong></span> <em class="replaceable"><code>buster-backports</code></em>
<span class="command"><strong>git merge</strong></span> <em class="replaceable"><code>debian/1.3.2-1</code></em>
</pre><p>
</p><p>
@@ -933,13 +933,13 @@ allowed_distributions = .*
package in the stable release or backports with the
<code class="option">-v</code> option:
</p><pre class="programlisting">
-<span class="command"><strong>gbp buildpackage</strong></span> <code class="option">--git-pbuilder</code> <code class="option">--git-dist</code>=<em class="replaceable"><code>stretch</code></em> <code class="option">-v</code><em class="replaceable"><code>1.2.0-1</code></em>
+<span class="command"><strong>gbp buildpackage</strong></span> <code class="option">--git-pbuilder</code> <code class="option">--git-dist</code>=<em class="replaceable"><code>buster</code></em> <code class="option">-v</code><em class="replaceable"><code>1.2.0-1</code></em>
</pre><p>
</p><p>
If the build dependencies cannot be satisfied in the stable release,
use the backports chroot instead:
</p><pre class="programlisting">
-<span class="command"><strong>gbp buildpackage</strong></span> <code class="option">--git-pbuilder</code> <code class="option">--git-dist</code>=<em class="replaceable"><code>stretch-backports</code></em> <code class="option">-v</code><em class="replaceable"><code>1.2.0-1</code></em>
+<span class="command"><strong>gbp buildpackage</strong></span> <code class="option">--git-pbuilder</code> <code class="option">--git-dist</code>=<em class="replaceable"><code>buster-backports</code></em> <code class="option">-v</code><em class="replaceable"><code>1.2.0-1</code></em>
</pre><p>
</p><p>
Specifying the version is one of the
@@ -994,8 +994,8 @@ allowed_distributions = .*
from the Debian Backports documentation:
</p><div class="blockquote"><blockquote class="blockquote"><p>
Make sure that you have a proper build environment that only
- contains the suite for which the backport is for (e.g. stretch
- if you want to upload to stretch-backports) and no unneeded
+ contains the suite for which the backport is for (e.g. buster
+ if you want to upload to buster-backports) and no unneeded
backports. [...]
</p></blockquote></div><p>
</p><p>
@@ -1018,16 +1018,16 @@ allowed_distributions = .*
Plain stable cowbuilder chroots can be created with:
</p><pre class="programlisting">
<span class="command"><strong>sudo cowbuilder</strong></span> <code class="option">--create</code> \
- <code class="option">--distribution</code>=<em class="replaceable"><code>stretch</code></em> \
- <code class="option">--basepath</code>=/var/cache/pbuilder/base-<em class="replaceable"><code>stretch</code></em>.cow \
+ <code class="option">--distribution</code>=<em class="replaceable"><code>buster</code></em> \
+ <code class="option">--basepath</code>=/var/cache/pbuilder/base-<em class="replaceable"><code>buster</code></em>.cow \
<code class="option">--hookdir=/var/cache/pbuilder/hook.d/</code>
</pre><p>
</p><p>
To create a chroot with the backports repository enabled, use:
</p><pre class="programlisting">
<span class="command"><strong>sudo cowbuilder</strong></span> <code class="option">--create</code> \
- <code class="option">--distribution</code>=<em class="replaceable"><code>stretch-backports</code></em> \
- <code class="option">--basepath</code>=/var/cache/pbuilder/base-<em class="replaceable"><code>stretch-backports</code></em>.cow \
+ <code class="option">--distribution</code>=<em class="replaceable"><code>buster-backports</code></em> \
+ <code class="option">--basepath</code>=/var/cache/pbuilder/base-<em class="replaceable"><code>buster-backports</code></em>.cow \
<code class="option">--hookdir=/var/cache/pbuilder/hook.d/</code>
</pre><p>
</p><p>
@@ -1069,7 +1069,7 @@ allowed_distributions = .*
option needs to be used to track changes from the origin
repository on Salsa:
</p><pre class="programlisting">
-<span class="command"><strong>git push</strong></span> origin <em class="replaceable"><code>stretch-backports</code></em> <code class="option">--set-upstream</code>
+<span class="command"><strong>git push</strong></span> origin <em class="replaceable"><code>buster-backports</code></em> <code class="option">--set-upstream</code>
</pre><p>
Plain <span class="command"><strong>git push</strong></span> is sufficient when the backports
branch was checked out from the origin repository on Salsa:
@@ -1312,8 +1312,8 @@ get-orig-source:
</p><p>
Backports of Debian GIS packages should be kept as branches in the
package <a class="link" href="repositories.html#git-repository" title="Git repository">Git repository</a> (e.g.
- <code class="literal">wheezy-backports</code>,
- <code class="literal">jessie-backports</code>, etc.).
+ <code class="literal">stretch-backports</code>,
+ <code class="literal">buster-backports</code>, etc.).
</p><p>
To upload backports DDs (and DMs for their packages) need to be added
to the backports ACL, and follow the Basic Rules as documented in
=====================================
public/policy/policy.html
=====================================
@@ -209,7 +209,7 @@ pbuilder-options = --source-only-changes
<a class="ulink" href="https://manpages.debian.org/unstable/debhelper/debhelper.7.en.html#COMPATIBILITY_LEVELS" target="_top">compatibility levels</a>
to control the behavior of its commands.
We currently recommend to use the level <code class="literal">9</code> which
- is available in current <code class="literal">stable</code> (stretch) and
+ is available in current <code class="literal">oldstable</code> (stretch) and
backported to <code class="literal">oldoldstable</code> (wheezy). It is also
the version supported in <code class="literal">Ubuntu trusty</code> and
<code class="literal">Ubuntu xenial</code>. If support for these is not
=====================================
public/policy/repositories.html
=====================================
@@ -96,7 +96,7 @@ debian-gis-team/
Changes uploaded to other distributions than Debian
<code class="literal">unstable</code> can be stored in other branches,
named for instance <code class="literal">experimental</code>,
- <code class="literal">stretch</code>, etc.
+ <code class="literal">buster</code>, etc.
</p><p>
This is useful in case updates to packages in Debian
<code class="literal">stable</code> are made and the <code class="literal">master</code>
=====================================
public/policy/tasks.html
=====================================
@@ -37,7 +37,7 @@
<span class="command"><strong>apt-get install</strong></span> gis-tasks
<span class="command"><strong>tasksel</strong></span>
</pre><p>
- On Debian jessie, you can do the same. Or, you can also install one of
+ On Debian jessie (or later), you can do the same. Or, you can also install one of
the metapackages directly. Again, as root:
</p><pre class="programlisting">
<span class="command"><strong>apt-get install</strong></span> <em class="replaceable"><code><metapackage></code></em>
View it on GitLab: https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/commit/1e381c161a1e4b309b95308767bfd10d232815cd
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/commit/1e381c161a1e4b309b95308767bfd10d232815cd
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/20190709/12d59012/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list