The following commit has been merged in the master branch:
commit 7a494efb6f76d83349473b87814e1aa1952f48d6
Author: Bas Couwenberg sebas...@xs4all.nl
Date: Sat Jan 4 02:35:22 2014 +0100
Move 'Other branches' section below 'Common Git repository structures'.
Include examples for OSGeo-Live and other derivatives.
diff --git a/policy.xml b/policy.xml
index 399fb5d..294baab 100644
--- a/policy.xml
+++ b/policy.xml
@@ -289,6 +289,31 @@ pkg-grass/
In case you use commandgit-dch/command for the changelog entries,
don't forget to use it when you stop working on the package.
/para
+ sect3 id=git-branches
+titleOther branches/title
+para
+ Changes uploaded to other distributions than
+ literalunstable/literal can be stored in other branches,
+ named for instance literalexperimental/literal,
+ literaljessie/literal, etc.
+/para
+para
+ Packaging for the
+ link linkend=ubuntugis-ppaUbuntuGIS PPA/link is encouraged to
+ be stored in Ubuntu release specific branches such as
+ literalubuntu/raring/literal,
+ literalubuntu/quantal/literal, etc.
+/para
+para
+ Likewise packaging for
+ link linkend=derivativesother derivatives/link
+ can be maintained in the Debian GIS git repository in derivative
+ specific branches.
+ OSGeo-Live for example can use branches such as
+ literalosgeo/7.0/literal,
+ literalosgeo/8.0/literal, etc.
+/para
+ /sect3
sect3 id=git-buildpackage
titlecommandgit-buildpackage/command/title
para
@@ -340,22 +365,6 @@ pkg-grass/
to document the layout of the repository.
/para
/sect3
- sect3 id=git-branches
-titleOther branches/title
-para
- Changes uploaded to other distributions than
- literalunstable/literal can be stored in other branches,
- named for instance literalexperimental/literal,
- literaljessie/literal, etc.
-/para
-para
- Packaging for the
- link linkend=ubuntugis-ppaUbuntuGIS PPA/link is encouraged to
- be stored in Ubuntu release specific branches such as
- literalubuntu/raring/literal,
- literalubuntu/quantal/literal, etc.
-/para
- /sect3
/sect2
sect2 id=git-tips
titleGit tips/title
@@ -820,6 +829,11 @@ lintian ../build-area/*changes
source packages. The right way to build Debian packages is described in
ulink url=http://www.debian.org/doc/manuals/maint-guide/;Debian New
Maintainers' Guide/ulink.
/para
+ para
+See also the
+ulink
url=http://anonscm.debian.org/gitweb/?p=pkg-grass/package_template.git;package
template/ulink
+in our Git repository.
+ /para
/sect2
sect2 id=itp
titleAnnouncing intent to package/title
@@ -853,7 +867,7 @@ lintian ../build-area/*changes
/para
/sect2
sect2 id=ubuntugis-ppa
- titlePPA for Ubuntu/title
+ titlePPA for Ubuntu by UbuntuGIS/title
para
The ulink url=https://launchpad.net/~ubuntugis;UbuntuGIS/ulink
team maintains Personal Package Archives (PPA) on Launchpad, where
@@ -897,6 +911,10 @@ lintian ../build-area/*changes
codelt;upstreamversiongt;-0lt;derivativenamegt;lt;derivativerevisiongt;/code
(which is the versioning scheme usually used by Ubuntu).
/para
+ para
+Packages for derivatives may be kept as
+link linkend=git-branchesbranches/link in our repositories.
+ /para
/sect2
sect2 id=r-packages
titleR packages/title
--
pkg-grass website
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
