[SCM] website branch, master, updated. 6ef4fa345fddb71ff036b624aaa6f9e2ad54493b

[Bas Couwenberg]

The following commit has been merged in the master branch:
commit 6ef4fa345fddb71ff036b624aaa6f9e2ad54493b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 5 21:18:36 2014 +0100

    Move git tags to its own section.

diff --git a/policy.xml b/policy.xml
index 468a86c..9fa4381 100644
--- a/policy.xml
+++ b/policy.xml
@@ -336,35 +336,6 @@ pkg-grass/
           </listitem>
         </itemizedlist>
         <para>
-          The standard tagging convention used by the Debian GIS team is:
-          <itemizedlist>
-            <listitem>
-              <para>
-                <literal>upstream/<replaceable><upstreamversion></replaceable></literal>
-                for upstream releases
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <literal>debian/<replaceable><debianversion></replaceable></literal>
-                for Debian releases
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <literal>ubuntu/<replaceable><ubuntuversion></replaceable></literal>
-                for UbuntuGIS releases
-              </para>
-            </listitem>
-            <listitem>
-              <para>
-                <literal>osgeo/<replaceable><osgeoversion></replaceable></literal>
-                for OSGeo-Live releases
-              </para>
-            </listitem>
-          </itemizedlist>
-        </para>
-        <para>
           <command>git-buildpackage</command> can be set to a directory layout
           similar to the one we use with <command>svn-buildpackage</command>
           by using the <literal>export-dir</literal> and
@@ -412,6 +383,55 @@ pkg-grass/
           packages to manually merge the changes from.
         </para>
       </sect3>
+      <sect3 id="git-tags">
+        <title>Tags for upstream and package releases</title>
+        <para>
+          The tagging convention used for upstream and package releases
+          follows the defaults of <command>git-buildpackage</command>.
+        </para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <literal>upstream/<replaceable><upstreamversion></replaceable></literal>
+              for upstream releases
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>debian/<replaceable><debianversion></replaceable></literal>
+              for Debian releases
+            </para>
+          </listitem>
+        </itemizedlist>
+        <para>
+          Tags for package releases targetting derivative distributions use
+           a distribution specific prefix followed by the package version
+           separated by a <literal>/</literal> character:
+        </para>
+        <para>
+          <literal><replaceable><distribution></replaceable>/<replaceable><package_version></replaceable></literal>
+        </para>
+        <itemizedlist>
+          <listitem>
+            <para>
+              <literal>ubuntu/<replaceable><debianversion></replaceable>~ubuntu<replaceable><ubuntuversion></replaceable></literal>
+              for UbuntuGIS backports based on the Debian GIS packaging
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>osgeo/<replaceable><debianversion></replaceable>~osgeo<replaceable><osgeoversion></replaceable></literal>
+              for OSGeo-Live releases based on the Debian GIS packaging, or
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>osgeo/<replaceable><debianversion></replaceable>~ubuntu<replaceable><ubuntuversion></replaceable>-osgeo<replaceable><osgeoversion></replaceable></literal>
+              for OSGeo-Live releases with changes on top of the UbuntuGIS packaging
+            </para>
+          </listitem>
+        </itemizedlist>
+      </sect3>
       <sect3 id="git-upstream-repositories">
         <title>Upstream Git repositories</title>
         <para>

-- 
pkg-grass website