[Git][debian-gis-team/debian-gis-team.pages.debian.net][master] Use ubuntugis/ prefix for UbuntuGIS, ubuntu/ should be used for official SRUs.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Wed Sep 18 13:03:56 BST 2024
Bas Couwenberg pushed to branch master at Debian GIS Project / debian-gis-team.pages.debian.net
Commits:
afefdd74 by Bas Couwenberg at 2024-09-18T14:03:47+02:00
Use ubuntugis/ prefix for UbuntuGIS, ubuntu/ should be used for official SRUs.
- - - - -
3 changed files:
- policy.xml
- public/policy/packaging.html
- public/policy/repositories.html
Changes:
=====================================
policy.xml
=====================================
@@ -344,7 +344,7 @@ debian-gis-team/
│ ├ wheezy
│ │ ├ <replaceable><upstream sources></replaceable>
│ │ └ debian/
- │ ├ ubuntu/quantal
+ │ ├ ubuntugis/quantal
│ │ ├ <replaceable><upstream sources></replaceable>
│ │ └ debian/
│ ├ pristine-tar
@@ -416,8 +416,8 @@ debian-gis-team/
Packaging for the
<link linkend="ubuntugis-ppa">UbuntuGIS PPA</link> is encouraged to
be stored in Ubuntu release specific branches such as
- <literal>ubuntu/trusty</literal>,
- <literal>ubuntu/xenial</literal>, etc.
+ <literal>ubuntugis/trusty</literal>,
+ <literal>ubuntugis/xenial</literal>, etc.
</para>
<para>
Likewise packaging for
@@ -472,9 +472,9 @@ debian-gis-team/
<itemizedlist>
<listitem>
<para>
- <literal>ubuntu/<replaceable><debian_version></replaceable>~<replaceable><ubuntu_codename><revision_number></replaceable></literal>
+ <literal>ubuntugis/<replaceable><debian_version></replaceable>~<replaceable><ubuntu_codename><revision_number></replaceable></literal>
for UbuntuGIS backports based on the Debian GIS packaging, e.g.
- <literal>ubuntu/1.2.0-1~trusty1</literal>
+ <literal>ubuntugis/1.2.0-1~trusty1</literal>
</para>
</listitem>
<listitem>
@@ -958,7 +958,7 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
<para>
Updating <link linkend="other-git-branches">other branches</link>
like <literal>experimental</literal> or
- <literal>ubuntu/precise</literal> can be done with
+ <literal>ubuntugis/precise</literal> can be done with
<command>git</command>.
<programlisting>
<command>git fetch</command> <literal>origin</literal>
@@ -1282,9 +1282,9 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
<listitem>
<para>
UbuntuGIS branches should be named
- <literal>ubuntu/<replaceable><codename></replaceable></literal>,
- for example <literal>ubuntu/precise</literal>,
- <literal>ubuntu/quantal</literal>, etc.
+ <literal>ubuntugis/<replaceable><codename></replaceable></literal>,
+ for example <literal>ubuntugis/precise</literal>,
+ <literal>ubuntugis/quantal</literal>, etc.
</para>
</listitem>
<listitem>
@@ -1584,7 +1584,7 @@ allowed_distributions = .*
For UbuntuGIS and OSGeo-Live
<link linkend="other-git-branches">their respective branches</link>
are used for the Ubuntu specific backports
- (<literal>ubuntu/xenial</literal>,
+ (<literal>ubuntugis/xenial</literal>,
<literal>osgeo/10.0</literal>, etc.).
</para>
<para>
@@ -2007,7 +2007,7 @@ allowed_distributions = .*
tag prefixes instead:
<programlisting>
# UbuntuGIS
-<command>git tag</command> ubuntu/$(dpkg-parsechangelog -SVersion | sed 's/~/./g; s/^[0-9]*://')
+<command>git tag</command> ubuntugis/$(dpkg-parsechangelog -SVersion | sed 's/~/./g; s/^[0-9]*://')
<command>git push</command> <option>--tags</option>
# OSGeo-Live
@@ -2075,18 +2075,18 @@ allowed_distributions = .*
Create the branch by checking out the <literal>debian/</literal> tag
on which the UbuntuGIS or OSGeo-Live package is based:
<programlisting>
-<command>git checkout</command> <option>-b</option> ubuntu/<replaceable>xenial</replaceable> debian/<replaceable>1.2.3-1</replaceable>
+<command>git checkout</command> <option>-b</option> ubuntugis/<replaceable>xenial</replaceable> debian/<replaceable>1.2.3-1</replaceable>
<command>git checkout</command> <option>-b</option> osgeo/<replaceable>10.0</replaceable> debian/<replaceable>1.2.3-1</replaceable>
</programlisting>
</para>
<para>
Because the
<link linkend="debian-gbp.conf"><filename>debian/gbp.conf</filename></link>
- file may not have the appropriate configuration yet, the Ubuntu or
+ file may not have the appropriate configuration yet, the UbuntuGIS or
OSGeo-Live specific branches and tags need to be specified
explicitly:
<programlisting>
-<command>gbp import-dsc</command> <option>--debian-branch=ubuntu/<replaceable>xenial</replaceable></option> <option>--debian-tag="ubuntu/%(version)s"</option> <filename>/tmp/<replaceable><package>_<revision></replaceable>.dsc</filename>
+<command>gbp import-dsc</command> <option>--debian-branch=ubuntugis/<replaceable>xenial</replaceable></option> <option>--debian-tag="ubuntugis/%(version)s"</option> <filename>/tmp/<replaceable><package>_<revision></replaceable>.dsc</filename>
<command>gbp import-dsc</command> <option>--debian-branch=osgeo/<replaceable>10.0</replaceable></option> <option>--debian-tag="osgeo/%(version)s"</option> /tmp/<replaceable><package>_<revision></replaceable>.dsc
</programlisting>
</para>
=====================================
public/policy/packaging.html
=====================================
@@ -286,7 +286,7 @@ DIST=<em class="replaceable"><code><distribution></code></em> ARCH=<em cla
</p><p>
Updating <a class="link" href="repositories.html#other-git-branches" title="Other Git branches">other branches</a>
like <code class="literal">experimental</code> or
- <code class="literal">ubuntu/precise</code> can be done with
+ <code class="literal">ubuntugis/precise</code> can be done with
<span class="command"><strong>git</strong></span>.
</p><pre class="programlisting">
<span class="command"><strong>git fetch</strong></span> <code class="literal">origin</code>
@@ -557,9 +557,9 @@ DIST=<em class="replaceable"><code><distribution></code></em> ARCH=<em cla
built from their distribution specific branches.
</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
UbuntuGIS branches should be named
- <code class="literal">ubuntu/<em class="replaceable"><code><codename></code></em></code>,
- for example <code class="literal">ubuntu/precise</code>,
- <code class="literal">ubuntu/quantal</code>, etc.
+ <code class="literal">ubuntugis/<em class="replaceable"><code><codename></code></em></code>,
+ for example <code class="literal">ubuntugis/precise</code>,
+ <code class="literal">ubuntugis/quantal</code>, etc.
</p></li><li class="listitem"><p>
OSGeo-Live branches should be named
<code class="literal">osgeo/<em class="replaceable"><code><version></code></em></code>,
@@ -783,7 +783,7 @@ allowed_distributions = .*
For UbuntuGIS and OSGeo-Live
<a class="link" href="repositories.html#other-git-branches" title="Other Git branches">their respective branches</a>
are used for the Ubuntu specific backports
- (<code class="literal">ubuntu/xenial</code>,
+ (<code class="literal">ubuntugis/xenial</code>,
<code class="literal">osgeo/10.0</code>, etc.).
</p><p>
The following sections document the workflow for
@@ -1137,7 +1137,7 @@ allowed_distributions = .*
tag prefixes instead:
</p><pre class="programlisting">
# UbuntuGIS
-<span class="command"><strong>git tag</strong></span> ubuntu/$(dpkg-parsechangelog -SVersion | sed 's/~/./g; s/^[0-9]*://')
+<span class="command"><strong>git tag</strong></span> ubuntugis/$(dpkg-parsechangelog -SVersion | sed 's/~/./g; s/^[0-9]*://')
<span class="command"><strong>git push</strong></span> <code class="option">--tags</code>
# OSGeo-Live
@@ -1193,17 +1193,17 @@ allowed_distributions = .*
Create the branch by checking out the <code class="literal">debian/</code> tag
on which the UbuntuGIS or OSGeo-Live package is based:
</p><pre class="programlisting">
-<span class="command"><strong>git checkout</strong></span> <code class="option">-b</code> ubuntu/<em class="replaceable"><code>xenial</code></em> debian/<em class="replaceable"><code>1.2.3-1</code></em>
+<span class="command"><strong>git checkout</strong></span> <code class="option">-b</code> ubuntugis/<em class="replaceable"><code>xenial</code></em> debian/<em class="replaceable"><code>1.2.3-1</code></em>
<span class="command"><strong>git checkout</strong></span> <code class="option">-b</code> osgeo/<em class="replaceable"><code>10.0</code></em> debian/<em class="replaceable"><code>1.2.3-1</code></em>
</pre><p>
</p><p>
Because the
<a class="link" href="policy.html#debian-gbp.conf" title="debian/gbp.conf"><code class="filename">debian/gbp.conf</code></a>
- file may not have the appropriate configuration yet, the Ubuntu or
+ file may not have the appropriate configuration yet, the UbuntuGIS or
OSGeo-Live specific branches and tags need to be specified
explicitly:
</p><pre class="programlisting">
-<span class="command"><strong>gbp import-dsc</strong></span> <code class="option">--debian-branch=ubuntu/<em class="replaceable"><code>xenial</code></em></code> <code class="option">--debian-tag="ubuntu/%(version)s"</code> <code class="filename">/tmp/<em class="replaceable"><code><package>_<revision></code></em>.dsc</code>
+<span class="command"><strong>gbp import-dsc</strong></span> <code class="option">--debian-branch=ubuntugis/<em class="replaceable"><code>xenial</code></em></code> <code class="option">--debian-tag="ubuntugis/%(version)s"</code> <code class="filename">/tmp/<em class="replaceable"><code><package>_<revision></code></em>.dsc</code>
<span class="command"><strong>gbp import-dsc</strong></span> <code class="option">--debian-branch=osgeo/<em class="replaceable"><code>10.0</code></em></code> <code class="option">--debian-tag="osgeo/%(version)s"</code> /tmp/<em class="replaceable"><code><package>_<revision></code></em>.dsc
</pre><p>
</p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="git-patches"></a>Patches</h4></div></div></div><p>
=====================================
public/policy/repositories.html
=====================================
@@ -58,7 +58,7 @@ debian-gis-team/
│ ├ wheezy
│ │ ├ <em class="replaceable"><code><upstream sources></code></em>
│ │ └ debian/
- │ ├ ubuntu/quantal
+ │ ├ ubuntugis/quantal
│ │ ├ <em class="replaceable"><code><upstream sources></code></em>
│ │ └ debian/
│ ├ pristine-tar
@@ -107,8 +107,8 @@ debian-gis-team/
Packaging for the
<a class="link" href="packaging.html#ubuntugis-ppa" title="PPA for Ubuntu by UbuntuGIS">UbuntuGIS PPA</a> is encouraged to
be stored in Ubuntu release specific branches such as
- <code class="literal">ubuntu/trusty</code>,
- <code class="literal">ubuntu/xenial</code>, etc.
+ <code class="literal">ubuntugis/trusty</code>,
+ <code class="literal">ubuntugis/xenial</code>, etc.
</p><p>
Likewise packaging for
<a class="link" href="packaging.html#derivatives" title="Derivatives working together with Debian GIS">other derivatives</a>
@@ -144,9 +144,9 @@ debian-gis-team/
</p><p>
Examples of the tagging convention for known derivatives:
</p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
- <code class="literal">ubuntu/<em class="replaceable"><code><debian_version></code></em>~<em class="replaceable"><code><ubuntu_codename><revision_number></code></em></code>
+ <code class="literal">ubuntugis/<em class="replaceable"><code><debian_version></code></em>~<em class="replaceable"><code><ubuntu_codename><revision_number></code></em></code>
for UbuntuGIS backports based on the Debian GIS packaging, e.g.
- <code class="literal">ubuntu/1.2.0-1~trusty1</code>
+ <code class="literal">ubuntugis/1.2.0-1~trusty1</code>
</p></li><li class="listitem"><p>
<code class="literal">osgeo/<em class="replaceable"><code><debian_version></code></em>~<em class="replaceable"><code><ubuntu_codename><revision_number></code></em></code>
for OSGeo-Live releases and backports based on the Debian GIS packaging, e.g.
View it on GitLab: https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/-/commit/afefdd745c37d4575dc9603ca13d82c1c982e6a4
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/-/commit/afefdd745c37d4575dc9603ca13d82c1c982e6a4
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/20240918/5a8dff3b/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list