The following commit has been merged in the master branch:
commit 5fe7c640635111551ec0b11ce3562cf4844c61cd
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Tue Jan 7 02:05:28 2014 +0100
Use packackage template when starting a new package, and various style
fixes.
diff --git a/policy.xml b/policy.xml
index 53fc8fa..08cbaa5 100644
--- a/policy.xml
+++ b/policy.xml
@@ -138,7 +138,8 @@
</para>
<para>
The Debian GIS team collaboration infrastructure on Alioth originates
- from the initial team effort to maintain the <literal>grass</literal>
+ from the initial team effort to maintain the
+ <ulink url="http://packages.qa.debian.org/g/grass.html";>grass</ulink>
package.
It has since grown to collaboratively maintain most GIS and
OpenStreetMap source packages, but still uses the
@@ -203,7 +204,7 @@
<title>Give me the source!</title>
<para>
To check the sources of a package (referred as
- <emphasis><package></emphasis> below) in our repositories,
+ <replaceable><package></replaceable> below) in our repositories,
use the <command>debcheckout</command> command, from the
<ulink url="http://packages.debian.org/devscripts";>devscripts</ulink>
package.
@@ -212,7 +213,7 @@
<para>
If you are a member of Debian GIS or a Debian Developer,
with account name <emphasis><username></emphasis>,
- you have write permission:
+ you have write permission to our VCS repositories:
<itemizedlist>
<listitem>
<para>
@@ -236,7 +237,17 @@
</listitem>
<listitem>
<para>
- For read-only access, remove the <option>--user</option> option.
+ For read-only access, remove the <option>--user</option> option:
+<programlisting>
+<command>debcheckout</command> <option>--git-track
<replaceable>'*'</replaceable></option>
<replaceable><package></replaceable>
+</programlisting>
+ </para>
+ <para>
+ You can configure Git to use SSH only for <literal>push</literal>
+ actions, by changing the URL:
+<programlisting>
+<command>git remote</command> <option>set-url</option> <option>--push</option>
<literal>origin</literal>
<literal>ssh://<replaceable><username></replaceable>@git.debian.org/git/pkg-grass/<replaceable><package></replaceable>.git</literal>
+</programlisting>
</para>
</listitem>
</itemizedlist>
@@ -359,8 +370,9 @@ pkg-grass/
<literal>jessie</literal>, etc.
</para>
<para>
- This is usefull in case updates to packages in stable are made and
- the master branch already uses a newer upstream release.
+ This is useful in case updates to packages in Debian
+ <literal>stable</literal> are made and the <literal>master</literal>
+ branch already uses a newer upstream release.
Using dedicated branches for the older version in Debian named after
the release codename is recommended.
</para>
@@ -694,7 +706,7 @@ pkg-grass/
<command>qemubuilder</command> can be selected by setting
<literal>BUILDER</literal> to "<literal>qemubuilder</literal>".
</literallayout>
<literallayout>Root privileges are required to run
<command>cowbuilder</command> and <command>pbuilder</command>.
-Use <command>visudo</command> to configure <command>sudo</command> to use the
following settings to allow <replaceable><username></replaceable>
passwordless use of <command>cowbuilder</command> and
<command>pbuilder</command>.
+Configure <command>sudo</command> with <command>visudo</command> to allow
<replaceable><username></replaceable> passwordless execution of
<command>cowbuilder</command> and <command>pbuilder</command> using the
following settings:
</literallayout>
<programlisting>
Defaults! PBUILDERS setenv
@@ -705,18 +717,20 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder,
/usr/sbin/cowbuilder
# User privilege specification
<replaceable><username></replaceable> ALL=(root)
NOPASSWD:PBUILDERS
</programlisting>
- <literallayout>The default path for <command>cowbuilder</command>
chroots is
<filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.cow</filename>.
-And for <command>pbuilder</command> chroots
<filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.tgz</filename>.
-</literallayout>
- <literallayout>Use <command>sudo cowbuilder</command>
<option>--create</option>
<option>--distribution=<replaceable><distribution></replaceable></option>
<option>--basepath=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.cow</option>
to create <command>cowbuilder</command> chroots for specific distributions.
-Use <command>sudo pbuilder</command> <option>--create</option>
<option>--distribution=<replaceable><distribution></replaceable></option>
<option>--basetgz=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.tgz</option>
when using <command>pbuilder</command> instead.
-</literallayout>
- <literallayout>The default path for architecture specific
<command>cowbuilder</command> chroots is
<filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>-<replaceable><architecture></replaceable>.cow</filename>.
-And for <command>pbuilder</command> chroots
<filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>-<replaceable><architecture></replaceable>.tgz</filename>.
-</literallayout>
- <literallayout>Use <command>sudo cowbuilder</command>
<option>--create</option>
<option>--distribution=<replaceable><distribution></replaceable></option>
<option>--architecture=<replaceable><architecture></replaceable></option>
<option>--basepath=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>-<replaceable><architecture></replaceable>.cow</option>
to create <command>cowbuilder</command> distribution and architecture specific
chroots.
-For <command>pbuilder</command> replace <option>--basepath</option> with
<option>--basetgz</option> and <option>.cow</option> with <option>.tgz</option>
in the above commands.
-</literallayout>
+ <para>
+ To create <emphasis>distribution</emphasis> specific
+ <command>cowbuilder</command> chroots, use:
+<programlisting>
+<command>sudo cowbuilder</command> <option>--create</option>
<option>--distribution=<replaceable><distribution></replaceable></option>
<option>--basepath=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.cow</option>
+</programlisting>
+ </para>
+ <para>
+ To create <emphasis>architecture</emphasis>
+ specific <command>cowbuilder</command> chroots, use:
+<programlisting>
+<command>sudo cowbuilder</command> <option>--create</option>
<option>--distribution=<replaceable><distribution></replaceable></option>
<option>--architecture=<replaceable><architecture></replaceable></option>
<option>--basepath=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>-<replaceable><architecture></replaceable>.cow</option>
+</programlisting>
+ </para>
</sect4>
<sect4 id="git-new-package">
<title>Starting a new package</title>
@@ -729,8 +743,10 @@ For <command>pbuilder</command> replace
<option>--basepath</option> with <option
<command>mkdir</command> <replaceable><package></replaceable>
<command>cd</command> <replaceable><package></replaceable>
<command>git init</command>
-<command>git import-orig</command> <option>--pristine-tar</option>
<filename><replaceable>/path/to/package_version.orig.tar.gz</replaceable></filename>
-<command>dh_make</command> <option>-p
<replaceable>package_x.y.z</replaceable></option>
+<command>git import-orig</command> <option>--pristine-tar</option>
<filename><replaceable>../package_version.orig.tar.gz</replaceable></filename>
+<command>git clone</command>
git://git.debian.org/git/pkg-grass/package_template.git
+<command>mv</command> package_template/debian/ .
+<command>rm</command> <option>-rf</option> debian/.git/
</programlisting>
</para>
<para>
@@ -759,7 +775,17 @@ For <command>pbuilder</command> replace
<option>--basepath</option> with <option
</itemizedlist>
</para>
<para>
- ...
+ Additionally the content of the
+ <filename class="directory">debian/</filename> directory
+ is taken from the Debian GIS package template.
+ </para>
+ <para>
+ Change the placeholders in the files under the
+ <filename class="directory">debian/</filename> directory
+ for the package in question following the requirements documented
+ in the <link linkend="policy">Policy</link> section,
+ and you can start
+ <link linkend="git-build-package">building the package</link>.
</para>
</sect4>
<sect4 id="git-existing-package">
@@ -860,7 +886,7 @@ For <command>pbuilder</command> replace
<option>--basepath</option> with <option
<listitem>
<para>
UbuntuGIS branches should be named
- <literal>ubuntu/<codename></literal>,
+
<literal>ubuntu/<replaceable><codename></replaceable></literal>,
for example <literal>ubuntu/precise</literal>,
<literal>ubuntu/quantal</literal>, etc.
</para>
@@ -868,7 +894,7 @@ For <command>pbuilder</command> replace
<option>--basepath</option> with <option
<listitem>
<para>
OSGeo-Live branches should be named
- <literal>osgeo/<version></literal>,
+
<literal>osgeo/<replaceable><version></replaceable></literal>,
for example <literal>osgeo/7.0</literal>,
<literal>osgeo/8.0</literal>, etc.
</para>
@@ -876,7 +902,7 @@ For <command>pbuilder</command> replace
<option>--basepath</option> with <option
<listitem>
<para>
Branches for other derivatives should be named
-
<literal><derivative>/<codename|version></literal>.
+
<literal><replaceable><derivative></replaceable>/<replaceable><codename|version></replaceable></literal>.
</para>
<para>
Using release codenames is preferred over release versions,
@@ -944,13 +970,13 @@ For <command>pbuilder</command> replace
<option>--basepath</option> with <option
</para>
<para>
<programlisting>
-<command>git remote add</command> <literal>origin</literal> <filename
class="directory">git+ssh://git.debian.org/git/pkg-grass/<package>.git</filename>
+<command>git remote add</command> <literal>origin</literal> <filename
class="directory">git+ssh://git.debian.org/git/pkg-grass/<replaceable><package></replaceable>.git</filename>
</programlisting>
</para>
<para>
This is done automatically after cloning a repository, for
instance
with <link linkend="debcheckout-git-track">debcheckout</link>.
- The default remote repository is called <quote>origin</quote>.
+ The default remote repository is called
<literal>origin</literal>.
</para>
</sect5>
<sect5 id="push-package-to-alioth">
@@ -962,42 +988,41 @@ For <command>pbuilder</command> replace
<option>--basepath</option> with <option
<link linkend="git-alioth-remote">added the remote</link>!
</para>
<para>
- Push you're local changes to Alioth:
+ Push all your local changes to Alioth:
<programlisting>
-<command>git push</command> <option>origin master</option>
+<command>git push</command> --all --set-upstream
+<command>git push</command> --tags
</programlisting>
- For the first push, it's necessary to specify
- <option>origin master</option>.
- The next time you will push, a
- <command>git push</command> will suffice.
</para>
+ </sect5>
+ <sect5 id="git-tag-release">
+ <title>To tag a release</title>
<para>
- Or use the <option>--set-upstream</option> option, helps future
use of
- <command>git pull</command>.
<programlisting>
-<command>git push</command> --set-upstream
+<command>git tag</command> <option>debian/x.y-z</option>.
</programlisting>
</para>
- </sect5>
- <sect5 id="git-push-all-tags">
- <title>To push all your work</title>
<para>
- Be sure to also do a run <command>git push</command> with
- <option>--all</option>, and one with <option>--tags</option>
- if you created new tags.
+ You can also easily retroactively make tags:
<programlisting>
-<command>git push</command> --all --set-upstream
-<command>git push</command> --tags
+<command>git tag</command> <option>debian/x.y-z</option>
<option><commit></option>
+</programlisting>
+ Remember to push the new tags.
+<programlisting>
+<command>git push</command> <option>--tags</option>
</programlisting>
</para>
</sect5>
- <sect5 id="git-tag-release">
- <title>To tag a release</title>
+ <sect5 id="">
+ <title></title>
<para>
- <command>git tag</command> <option>debian/x.y-z</option>.
- You can also easily retroactively make tags:
- <command>git tag</command> <option>debian/x.y-z</option>
<option><commit hash></option>.
- Remember to <command>git push --tags</command>.
+ ...
+ </para>
+ </sect5>
+ <sect5 id="">
+ <title></title>
+ <para>
+ ...
</para>
</sect5>
</sect4>
--
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
