[Git][debian-gis-team/debian-gis-team.pages.debian.net][master] Update for bookworm.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sun Jun 11 15:23:50 BST 2023
Bas Couwenberg pushed to branch master at Debian GIS Project / debian-gis-team.pages.debian.net
Commits:
f3fcb4d0 by Bas Couwenberg at 2023-06-11T16:22:44+02:00
Update for bookworm.
- - - - -
4 changed files:
- policy.xml
- public/policy/packaging.html
- public/policy/policy.html
- public/policy/repositories.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>bullseye</literal>, etc.
+ <literal>bookworm</literal>, etc.
</para>
<para>
This is useful in case updates to packages in Debian
@@ -1197,7 +1197,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>bullseye-backports</literal>, use the
+ <literal>bookworm-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>
@@ -1268,9 +1268,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>bullseye</literal> distribution and
- the <literal>bullseye-backports</literal> branch to build a backport.
- Or using both the <literal>bullseye</literal> distribution and branch
+ For example, use the <literal>bookworm</literal> distribution and
+ the <literal>bookworm-backports</literal> branch to build a backport.
+ Or using both the <literal>bookworm</literal> distribution and branch
to build the package for <literal>stable-proposed-updates</literal>.
</para>
<para>
@@ -1553,16 +1553,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>bullseye</replaceable> <replaceable>debian/1.2.0-1</replaceable>
+<command>git checkout</command> <option>-b</option> <replaceable>bookworm</replaceable> <replaceable>debian/1.2.0-1</replaceable>
</programlisting>
- If the <replaceable>bullseye</replaceable> branch already exists,
+ If the <replaceable>bookworm</replaceable> branch already exists,
check it out and merge the version currently in the archive:
<programlisting>
-<command>git checkout</command> <replaceable>bullseye</replaceable>
+<command>git checkout</command> <replaceable>bookworm</replaceable>
<command>git merge</command> <replaceable>debian/1.2.0-1</replaceable>
</programlisting>
From this point on, work normally in the
- <replaceable>bullseye</replaceable> branch,
+ <replaceable>bookworm</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>.
@@ -1577,8 +1577,8 @@ allowed_distributions = .*
Backports are maintained in separate
<link linkend="git-package-branches">branches</link>
named after the distribution in question
- (<literal>buster-backports</literal>,
- <literal>bullseye-backports</literal>, etc.).
+ (<literal>bullseye-backports</literal>,
+ <literal>bookworm-backports</literal>, etc.).
</para>
<para>
For UbuntuGIS and OSGeo-Live
@@ -1614,7 +1614,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>bullseye-backports</replaceable> <replaceable>debian/1.2.3-1</replaceable>
+<command>git checkout</command> <option>-b</option> <replaceable>bookworm-backports</replaceable> <replaceable>debian/1.2.3-1</replaceable>
</programlisting>
</para>
<para>
@@ -1623,7 +1623,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>bullseye-backports</replaceable>/g'</literal> <filename>debian/gbp.conf</filename>
+<command>sed</command> <option>-i</option> <literal>'s/^debian-branch\s*=.*/debian-branch = <replaceable>bookworm-backports</replaceable>/g'</literal> <filename>debian/gbp.conf</filename>
</programlisting>
</para>
<para>
@@ -1632,7 +1632,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>bullseye-backports</replaceable>/g'</literal> <filename>debian/control</filename>
+<command>sed</command> <option>-i</option> <literal>'s/\(^Vcs-Git: .*\.git\).*/\1 -b <replaceable>bookworm-backports</replaceable>/g'</literal> <filename>debian/control</filename>
</programlisting>
</para>
<para>
@@ -1689,7 +1689,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>bullseye-backports</replaceable>
+<command>git checkout</command> <replaceable>bookworm-backports</replaceable>
<command>git merge</command> <replaceable>debian/1.3.2-1</replaceable>
</programlisting>
</para>
@@ -1749,14 +1749,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>bullseye</replaceable> <option>-v</option><replaceable>1.2.0-1</replaceable>
+<command>gbp buildpackage</command> <option>--git-pbuilder</option> <option>--git-dist</option>=<replaceable>bookworm</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>bullseye-backports</replaceable> <option>-v</option><replaceable>1.2.0-1</replaceable>
+<command>gbp buildpackage</command> <option>--git-pbuilder</option> <option>--git-dist</option>=<replaceable>bookworm-backports</replaceable> <option>-v</option><replaceable>1.2.0-1</replaceable>
</programlisting>
</para>
<para>
@@ -1821,7 +1821,7 @@ allowed_distributions = .*
<para>
Make sure that you have a proper build environment that only
contains the suite for which the backport is for (e.g.
- bullseye if you want to upload to bullseye-backports) and no
+ bookworm if you want to upload to bookworm-backports) and no
unneeded backports. [...]
</para>
</blockquote>
@@ -1849,8 +1849,8 @@ allowed_distributions = .*
Plain stable cowbuilder chroots can be created with:
<programlisting>
<command>sudo cowbuilder</command> <option>--create</option> \
- <option>--distribution</option>=<replaceable>bullseye</replaceable> \
- <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>bullseye</replaceable>.cow \
+ <option>--distribution</option>=<replaceable>bookworm</replaceable> \
+ <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>bookworm</replaceable>.cow \
<option>--hookdir=/var/cache/pbuilder/hook.d/</option>
</programlisting>
</para>
@@ -1858,8 +1858,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>bullseye-backports</replaceable> \
- <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>bullseye-backports</replaceable>.cow \
+ <option>--distribution</option>=<replaceable>bookworm-backports</replaceable> \
+ <option>--basepath</option>=/var/cache/pbuilder/base-<replaceable>bookworm-backports</replaceable>.cow \
<option>--hookdir=/var/cache/pbuilder/hook.d/</option>
</programlisting>
</para>
@@ -1909,7 +1909,7 @@ allowed_distributions = .*
option needs to be used to track changes from the origin
repository on Salsa:
<programlisting>
-<command>git push</command> origin <replaceable>bullseye-backports</replaceable> <option>--set-upstream</option>
+<command>git push</command> origin <replaceable>bookworm-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:
@@ -2245,8 +2245,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>buster-backports</literal>,
- <literal>bullseye-backports</literal>, etc.).
+ <literal>bullseye-backports</literal>,
+ <literal>bookworm-backports</literal>, etc.).
</para>
<para>
To upload backports DDs (and DMs for their packages) need to be added
@@ -2778,12 +2778,9 @@ pbuilder-options = --source-only-changes
Debhelper uses
<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>12</literal> which
- is available in current <literal>stable</literal> (bullseye).
- It is also backported to <literal>Ubuntu bionic</literal>.
- If support for these is not required version 13 can be used.
- However, there is no urgent need to touch packages only because it
- has an older Debhelper version.
+ We currently recommend to use the level <literal>13</literal> which
+ is available in current <literal>stable</literal> (bookworm).
+ It is also backported to <literal>Ubuntu focal</literal>.
</para>
<para>
It is strongly recommended to use the short <literal>dh</literal>
=====================================
public/policy/packaging.html
=====================================
@@ -482,7 +482,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">bullseye-backports</code>, use the
+ <code class="literal">bookworm-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>
@@ -546,9 +546,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">bullseye</code> distribution and
- the <code class="literal">bullseye-backports</code> branch to build a backport.
- Or using both the <code class="literal">bullseye</code> distribution and branch
+ For example, use the <code class="literal">bookworm</code> distribution and
+ the <code class="literal">bookworm-backports</code> branch to build a backport.
+ Or using both the <code class="literal">bookworm</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>
@@ -757,16 +757,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>bullseye</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>bookworm</code></em> <em class="replaceable"><code>debian/1.2.0-1</code></em>
</pre><p>
- If the <em class="replaceable"><code>bullseye</code></em> branch already exists,
+ If the <em class="replaceable"><code>bookworm</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>bullseye</code></em>
+<span class="command"><strong>git checkout</strong></span> <em class="replaceable"><code>bookworm</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>bullseye</code></em> branch,
+ <em class="replaceable"><code>bookworm</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>.
@@ -777,8 +777,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">buster-backports</code>,
- <code class="literal">bullseye-backports</code>, etc.).
+ (<code class="literal">bullseye-backports</code>,
+ <code class="literal">bookworm-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>
@@ -807,7 +807,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>bullseye-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>bookworm-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
@@ -815,7 +815,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>bullseye-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>bookworm-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
@@ -823,7 +823,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>bullseye-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>bookworm-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
@@ -870,7 +870,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>bullseye-backports</code></em>
+<span class="command"><strong>git checkout</strong></span> <em class="replaceable"><code>bookworm-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>
@@ -921,13 +921,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>bullseye</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>bookworm</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>bullseye-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>bookworm-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
@@ -983,7 +983,7 @@ allowed_distributions = .*
</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.
- bullseye if you want to upload to bullseye-backports) and no
+ bookworm if you want to upload to bookworm-backports) and no
unneeded backports. [...]
</p></blockquote></div><p>
</p><p>
@@ -1006,16 +1006,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>bullseye</code></em> \
- <code class="option">--basepath</code>=/var/cache/pbuilder/base-<em class="replaceable"><code>bullseye</code></em>.cow \
+ <code class="option">--distribution</code>=<em class="replaceable"><code>bookworm</code></em> \
+ <code class="option">--basepath</code>=/var/cache/pbuilder/base-<em class="replaceable"><code>bookworm</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>bullseye-backports</code></em> \
- <code class="option">--basepath</code>=/var/cache/pbuilder/base-<em class="replaceable"><code>bullseye-backports</code></em>.cow \
+ <code class="option">--distribution</code>=<em class="replaceable"><code>bookworm-backports</code></em> \
+ <code class="option">--basepath</code>=/var/cache/pbuilder/base-<em class="replaceable"><code>bookworm-backports</code></em>.cow \
<code class="option">--hookdir=/var/cache/pbuilder/hook.d/</code>
</pre><p>
</p><p>
@@ -1057,7 +1057,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>bullseye-backports</code></em> <code class="option">--set-upstream</code>
+<span class="command"><strong>git push</strong></span> origin <em class="replaceable"><code>bookworm-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:
@@ -1300,8 +1300,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">buster-backports</code>,
- <code class="literal">bullseye-backports</code>, etc.).
+ <code class="literal">bullseye-backports</code>,
+ <code class="literal">bookworm-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
=====================================
@@ -202,12 +202,9 @@ pbuilder-options = --source-only-changes
Debhelper uses
<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">12</code> which
- is available in current <code class="literal">stable</code> (bullseye).
- It is also backported to <code class="literal">Ubuntu bionic</code>.
- If support for these is not required version 13 can be used.
- However, there is no urgent need to touch packages only because it
- has an older Debhelper version.
+ We currently recommend to use the level <code class="literal">13</code> which
+ is available in current <code class="literal">stable</code> (bookworm).
+ It is also backported to <code class="literal">Ubuntu focal</code>.
</p><p>
It is strongly recommended to use the short <code class="literal">dh</code>
notation in <code class="filename">debian/rules</code> files which makes code
=====================================
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">bullseye</code>, etc.
+ <code class="literal">bookworm</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>
View it on GitLab: https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/-/commit/f3fcb4d08ad4376a962c865003d85bf42dde5748
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/-/commit/f3fcb4d08ad4376a962c865003d85bf42dde5748
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/20230611/c73ba75a/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list