[Git][debian-gis-team/debian-gis-team.pages.debian.net][master] 15 commits: Move content to public directory for GitLab Pages.
Bas Couwenberg
gitlab at salsa.debian.org
Mon Feb 12 15:47:34 UTC 2018
Bas Couwenberg pushed to branch master at Debian GIS Project / debian-gis-team.pages.debian.net
Commits:
3a15263c by Bas Couwenberg at 2018-02-07T12:46:01+01:00
Move content to public directory for GitLab Pages.
- - - - -
ea822d8f by Bas Couwenberg at 2018-02-07T12:49:04+01:00
Add required script option to .gitlab-ci.yml.
- - - - -
afa5e0dd by Bas Couwenberg at 2018-02-07T12:54:56+01:00
Rename HEADER.html to index.html.
- - - - -
e028d05d by Bas Couwenberg at 2018-02-07T12:58:39+01:00
Remove clean target from Makefile, all generated files now checked into repository.
- - - - -
1be922b9 by Bas Couwenberg at 2018-02-07T14:09:41+01:00
Update Membership section for Salsa.
- - - - -
dabd5d7c by Bas Couwenberg at 2018-02-07T14:11:17+01:00
Regenerate policy for recent changes.
- - - - -
3d3a7553 by Bas Couwenberg at 2018-02-07T14:17:08+01:00
Remove .htaccess file, not used by GitLab pages.
- - - - -
258c2982 by Bas Couwenberg at 2018-02-07T14:21:19+01:00
Formatting fixes.
- - - - -
848e1efb by Bas Couwenberg at 2018-02-12T13:50:26+01:00
Remove 'make publish' documentation, no longer used for GitLab pages.
- - - - -
1339a83b by Bas Couwenberg at 2018-02-12T15:50:17+01:00
Update policy for Salsa.
- - - - -
bd66af01 by Bas Couwenberg at 2018-02-12T15:57:49+01:00
Update index for Salsa.
- - - - -
52dc83c4 by Bas Couwenberg at 2018-02-12T16:39:08+01:00
Add test file to trigger CI.
- - - - -
06f360c1 by Bas Couwenberg at 2018-02-12T16:39:26+01:00
Remove test file.
- - - - -
787a7128 by Bas Couwenberg at 2018-02-12T16:43:18+01:00
Limit CI to master branch.
- - - - -
9fec63d2 by Bas Couwenberg at 2018-02-12T16:47:10+01:00
Update team policy URLs.
- - - - -
26 changed files:
- − .gitignore
- − .htaccess
- Makefile
- + debian/.gitlab-ci.yml
- policy.xml
- − policy/img
- announcement.txt → public/announcement.txt
- debian.css → public/debian.css
- favicon.ico → public/favicon.ico
- img/admon-caution.png → public/img/admon-caution.png
- img/admon-important.png → public/img/admon-important.png
- img/admon-note.png → public/img/admon-note.png
- img/admon-tip.png → public/img/admon-tip.png
- img/admon-warning.png → public/img/admon-warning.png
- img/debiangis_mollweide.png → public/img/debiangis_mollweide.png
- img/splash_gis.svg → public/img/splash_gis.svg
- HEADER.html → public/index.html
- + public/policy.html
- + public/policy/img
- + public/policy/index.html
- + public/policy/packaging.html
- policy/policy.css → public/policy/policy.css
- + public/policy/policy.html
- + public/policy/repositories.html
- + public/policy/tasks.html
- readme.txt → public/readme.txt
Changes:
=====================================
.gitignore deleted
=====================================
--- a/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-docbook.css
-policy.html
-policy/*.html
=====================================
.htaccess deleted
=====================================
--- a/.htaccess
+++ /dev/null
@@ -1,34 +0,0 @@
-IndexOptions +SuppressSize +DescriptionWidth=* +SuppressHTMLPreamble +XHTML
-
-HeaderName HEADER.html
-ReadmeName readme.txt
-IndexIgnore HEADER.html readme.txt *.css *.png *.ico img
-
-AddDescription "The DebianGis Manifesto -- first announcement of the DebianGis Project" announcement.txt
-AddDescription "Debian GIS Policy - DocBook Stylesheet" docbook.css
-AddDescription "Debian GIS Policy - Custom Stylesheet" policy.css
-AddDescription "Debian GIS Policy - HTML version" policy.html
-AddDescription "Debian GIS Policy - DocBook XML source" policy.xml
-AddDescription "Debian GIS Policy - Build script" Makefile
-AddDescription "Debian GIS Policy - Multi-page HTML version" policy
-AddDescription "Old website content" attic
-AddDescription "JOSM Redirector for uscan." josmredir.php
-
-Redirect /qgis /attic/qgis
-Redirect /arrow.png /attic/arrow.png
-Redirect /debiangis.css /attic/debiangis.css
-Redirect /debiangis-status.html /attic/debiangis-status.html
-Redirect /debiangis-vs-unstable.html /attic/debiangis-status.html
-Redirect /debpool.txt /attic/debpool.txt
-Redirect /dgis.asc /attic/dgis.asc
-Redirect /dgis-status.pl.txt /attic/dgis-status.pl.txt
-Redirect /foo /attic/foo
-Redirect /icons /attic/icons
-Redirect /officiallogo-50.jpg /attic/officiallogo-50.jpg
-Redirect /openlogo-100.jpg /attic/openlogo-100.jpg
-Redirect /readme.txt /attic/readme.txt
-Redirect /status.html /attic/status.html
-Redirect /tarballs /attic/tarballs
-Redirect /ubuntugis-status.html /attic/ubuntugis-status.html
-Redirect /wiki.css /attic/wiki.css
-
=====================================
Makefile
=====================================
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,3 @@
-PUBLISHHOST=alioth.debian.org
-PUBLISHDIR=/home/groups/pkg-grass/htdocs
-
all: policy
policy: valid spellcheck
@@ -11,13 +8,10 @@ policy: valid spellcheck
--param use.id.as.filename 1 \
--param make.valid.html 1 \
--stringparam html.stylesheet policy.css \
- --stringparam base.dir policy/ \
+ --stringparam base.dir public/policy/ \
/usr/share/xml/docbook/stylesheet/docbook-xsl/xhtml/chunk.xsl \
policy.xml 2>/dev/null
-clean:
- rm -f docbook.css policy/*.html
-
valid:
xmllint --valid --noout policy.xml
@@ -27,6 +21,3 @@ spellcheck:
spellcheck-fix:
codespell -w -s policy.xml
-publish: policy
- rsync -av .gitignore .htaccess * $(PUBLISHHOST):$(PUBLISHDIR) || true
- ssh $(PUBLISHHOST) "chmod -R g+w $(PUBLISHDIR)/*" || true
=====================================
debian/.gitlab-ci.yml
=====================================
--- /dev/null
+++ b/debian/.gitlab-ci.yml
@@ -0,0 +1,8 @@
+pages:
+ script:
+ - echo "No build required"
+ artifacts:
+ paths:
+ - public
+ only:
+ - master
=====================================
policy.xml
=====================================
--- a/policy.xml
+++ b/policy.xml
@@ -3,7 +3,7 @@
href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"?>
<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
"http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
-<article xml:base="https://pkg-grass.alioth.debian.org/">
+<article xml:base="https://salsa.debian.org/debian-gis-team">
<title>Debian GIS Policy</title>
<articleinfo>
<authorgroup>
@@ -34,7 +34,7 @@
</authorgroup>
<releaseinfo>
Source:
- <ulink url="https://anonscm.debian.org/cgit/pkg-grass/website.git/tree/policy.xml">https://anonscm.debian.org/cgit/pkg-grass/website.git/tree/policy.xml</ulink>
+ <ulink url="https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/blob/master/policy.xml">https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/blob/master/policy.xml</ulink>
</releaseinfo>
</articleinfo>
<mediaobject>
@@ -195,27 +195,33 @@
<sect2 id="membership">
<title>Membership</title>
<para>
- To request membership of the Debian GIS team, and access to our collaboration
- infrastructure on Alioth, please go to our
- <ulink url="https://alioth.debian.org/projects/pkg-grass">Alioth page</ulink>
- or directly follow the
- <ulink url="https://alioth.debian.org/project/request.php?group_id=30241">Request to join</ulink>
- link.
+ To request membership of the Debian GIS team, and commit access to our git
+ repositories on Salsa, please go to our
+ <ulink url="https://salsa.debian.org/debian-gis-team">Salsa page</ulink>
+ and click the Request Access button.
</para>
<para>
- You need to register an Alioth account before you can request
- membership of the Debian GIS team, by submitting the
- <ulink url="https://alioth.debian.org/account/register.php">User Account Registration</ulink>
- form.
+ You need to register a Salsa account before you can request
+ membership of the Debian GIS team (if you are not a Debian Developer),
+ by creating a guest account using the
+ <ulink url="https://signup.salsa.debian.org/">Debian GitLab self-service</ulink>
+ interface.
</para>
<para>
- The Debian GIS team collaboration infrastructure on Alioth originates
- from the initial team effort to maintain the
- <ulink url="https://tracker.debian.org/pkg/grass">grass</ulink>
- package.
- It has since grown to collaboratively maintain most GIS and
- OpenStreetMap source packages, but still uses the
- <literal>pkg-grass</literal> group name on Alioth.
+ The Debian GIS team collaboration infrastructure was originally hosted
+ on Alioth which provided VCS hosting, mailinglists and website hosting.
+ </para>
+ <para>
+ The team grew out of the initial effort to collaboratively maintain the
+ <ulink url="https://tracker.debian.org/pkg/grass">grass</ulink>
+ package, and ended up collaboratively maintaining most GIS and
+ OpenStreetMap source packages, while still using the
+ <literal>pkg-grass</literal> group name on Alioth.
+ </para>
+ <para>
+ On Salsa the <literal>debian-gis-team</literal> namespace is used, but
+ the mailinglist for the Maintainer address in packages still uses
+ <literal>pkg-grass</literal> in its name thanks to its origin on Alioth.
</para>
</sect2>
<sect2 id="readings">
@@ -245,7 +251,7 @@
<listitem>
<para>
The
- <ulink url="https://pkg-grass.alioth.debian.org/policy.html">Debian GIS Policy</ulink>
+ <ulink url="https://debian-gis-team.pages.debian.net/policy/">Debian GIS Policy</ulink>
(this document): explains how the work is organized in our team.
</para>
</listitem>
@@ -255,24 +261,14 @@
<sect1 id="repositories">
<title>Repositories</title>
<para>
- We use Git and Subversion (SVN) repositories, hosted by Debian.
- You can have a look at each repository through Alioths web interfaces:
- <ulink url="https://anonscm.debian.org/cgit/pkg-grass/">cgit</ulink> and
- <ulink url="https://anonscm.debian.org/viewvc/pkg-grass/">ViewVC</ulink>.
+ We use Git repositories, hosted by Debian.
+ You can have a look at the repositories through the
+ <ulink url="https://salsa.debian.org/debian-gis-team">web interface</ulink>.
</para>
<para>
The Git repository is the primary location for our source packages these
days.
- However, the Subversion repository is still used for some packages that
- have not migrated to Git yet.
</para>
- <warning id="umask">
- <para>
- For most direct operations on the repositories in Alioth, an
- <command>umask</command> of <literal>002</literal> is necessary to
- avoid problems of missing write permission to the other team members.
- </para>
- </warning>
<sect2 id="source">
<title>Give me the source!</title>
<para>
@@ -284,61 +280,32 @@
<itemizedlist>
<listitem>
<para>
- If you are a member of Debian GIS or a Debian Developer,
- with account name <replaceable><username></replaceable>,
- you have write permission to our VCS repositories:
- <itemizedlist>
- <listitem>
- <para>
- If the package is already in the archive:
-<programlisting>
-<command>debcheckout</command> <option>--user</option> <replaceable><username></replaceable> <option>--git-track <replaceable>'*'</replaceable></option> <replaceable><package></replaceable>
-</programlisting>
- </para>
- </listitem>
- <listitem>
- <para>
- For draft packages that are only on Alioth:
-<programlisting>
-<command>debcheckout</command> <option>--user</option> <replaceable><username></replaceable> git://git.debian.org/pkg-grass/<replaceable><package></replaceable>.git <option>--git-track <replaceable>'*'</replaceable></option>
-<command>debcheckout</command> <option>--user</option> <replaceable><username></replaceable> svn://svn.debian.org/pkg-grass/packages/<replaceable><package></replaceable>/trunk <replaceable><package></replaceable>
-</programlisting>
- </para>
- </listitem>
- </itemizedlist>
- </para>
- </listitem>
- <listitem>
- <para>
- For read-only access, remove the <option>--user</option> option:
+ If the package is already in the archive:
<programlisting>
<command>debcheckout</command> <option>--git-track <replaceable>'*'</replaceable></option> <replaceable><package></replaceable>
</programlisting>
</para>
+ </listitem>
+ <listitem>
<para>
- You can configure Git to use SSH only for <literal>push</literal>
- actions, by changing the URL:
+ For draft packages that are only on Salsa:
<programlisting>
-<command>git remote set-url</command> <option>--push</option> origin ssh://<replaceable><username></replaceable>@git.debian.org/git/pkg-grass/<replaceable><package></replaceable>.git
+<command>debcheckout</command> <option>--git-track <replaceable>'*'</replaceable></option> https://salsa.debian.org/debian-gis-team/<replaceable><package></replaceable>.git
</programlisting>
</para>
</listitem>
</itemizedlist>
</para>
- </sect2>
- <sect2 id="ssh-tips">
- <title>SSH tips</title>
- <para id="ssh-config">
- You can avoid specifying your Alioth user name by setting it in
- <filename>~/.ssh/config</filename> as follows.
- Note that in that case, with <command>debcheckout</command> you can
- replace the <option>--user</option> option by the
- <option>-a</option> option, for less typing.
+ <para>
+ You can configure Git to use SSH only for <literal>push</literal>
+ actions, by changing the URL:
<programlisting>
-Host *.debian.org
- User your-user-name
+<command>git remote set-url</command> <option>--push</option> origin git at salsa.debian.org:debian-gis-team/<replaceable><package></replaceable>.git
</programlisting>
</para>
+ </sect2>
+ <sect2 id="ssh-tips">
+ <title>SSH tips</title>
<para id="ssh-add">
You can avoid typing your SSH password again and again using the
<command>ssh-add</command> command.
@@ -346,17 +313,12 @@ Host *.debian.org
command <command>eval</command>
<option>$(</option><command>ssh-agent</command><option>)</option>.
</para>
- <para id="wiki-alioth">
- In case of trouble getting SSH working it is a good idea to read the
- <ulink url="https://wiki.debian.org/Alioth/SSH">Alioth/SSH</ulink>
- wiki article.
- </para>
</sect2>
<sect2 id="git-repository">
<title>Git repository</title>
<para>
- The area on Alioth that contains the Git repositories
- (<filename class="directory">/git/pkg-grass</filename>)
+ The namespace on Salsa that contains the Git repositories
+ (<filename class="directory">debian-gis-team</filename>)
uses as flat hierarchy for packages and related Debian GIS repositories.
</para>
<para>
@@ -365,7 +327,7 @@ Host *.debian.org
</para>
<para>
<programlisting>
-pkg-grass/
+debian-gis-team/
├ <replaceable><package-A></replaceable>.git
│ ├ master
│ │ ├ <replaceable><upstream sources></replaceable>
@@ -385,14 +347,14 @@ pkg-grass/
│ ├ pristine-tar
│ └ upstream
┆
- └ website.git
+ └ debian-gis-team.pages.debian.net.git
└ master
</programlisting>
</para>
<sect3 id="git-branches">
<title>Common Git branches</title>
<para>
- Most of our packages using Git and stored in Alioth are managed
+ Most of our packages using Git are managed
following the standard layout of the
<command>git-buildpackage</command> helper.
</para>
@@ -431,15 +393,6 @@ pkg-grass/
</para>
</listitem>
</itemizedlist>
- <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
- <literal>tarball-dir</literal> options.
- However those settings should only be in a system-wide or user-wide
- <filename>gbp.conf</filename> file and not the one committed in the
- Git repository.
- </para>
</sect3>
<sect3 id="other-git-branches">
<title>Other Git branches</title>
@@ -505,8 +458,8 @@ pkg-grass/
</itemizedlist>
<para>
Tags for package releases targeting derivative distributions use
- a distribution specific prefix followed by the package version
- separated by a <literal>/</literal> character:
+ 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>
@@ -562,105 +515,12 @@ pkg-grass/
</para>
<para>
When the upstream Git repository is not configured as a remote in the
- Debian GIS Git repository on Alioth, you may not want to push the
+ Debian GIS Git repository on Salsa, you may not want to push the
upstream tags, because the referenced commits only exist in the
upstream Git repository.
</para>
</sect3>
</sect2>
- <sect2 id="svn-repository">
- <title>Subversion repository</title>
- <para>
- The SVN repository is structured as follows:
-<programlisting>
-pkg-grass/
- ├ cvs2svn/
- │ ├ branches/
- │ └ tags/
- ├ packages/
- │ ├ <replaceable><package A></replaceable>/
- │ │ ├ branches/
- │ │ ├ tags/
- │ │ └ trunk/
- │ │ └ debian/
- │ ├ <replaceable><package B></replaceable>/
- │ │ ├ branches/
- │ │ ├ tags/
- │ │ └ trunk/
- │ │ └ debian/
- │ …
- └ scripts/
-</programlisting>
- </para>
- </sect2>
- <sect2 id="subversion-to-git">
- <title>Migration of a source package from Subversion to Git</title>
- <para>
- For packages where we set the <literal>mergeWithUpstream</literal>
- property, which excludes the upstream sources, there is no easy way to
- prepare a Git repository from our Subversion repository that would look
- like the package was always managed in Git.
- Nevertheless, the following recipe will generate a Git repository that
- contains all the history of the debian directory, plus a collection of
- selected upstream source releases.
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Start the conversion as explained in the
- <ulink url="https://wiki.debian.org/Alioth/Git#Convert_a_SVN_Alioth_repository_to_Git">Alioth/Git</ulink>
- page of the Debian wiki.
- To be consistent with a later usage of
- <command>git-buildpackage</command>,
- it is preferable to prefix the tag names <quote>debian</quote>.
- During this conversion, you can take advantage of the file
- <filename>/trunk/community/infrastructure/comitters</filename>
- in the Subversion repository, and expand it if necessary.
- </para>
- </listitem>
- <listitem>
- <para>
- Import of the upstream original tarballs that you find relevant,
- for instance the ones that were part of a stable release).
- When this paragraph was written, it was necessary to follow special
- instruction detailed in
- <ulink url="https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=471560">bug #471560</ulink>.
- </para>
- </listitem>
- <listitem>
- <para>
- Upload to git.debian.org/git/pkg-grass and set up the hooks and
- other meta-data as explained in the
- <ulink url="https://wiki.debian.org/Alioth/Git">Alioth/Git</ulink>
- page of the Debian wiki.
- </para>
- </listitem>
- <listitem>
- <para>
- Document in the Subversion repository that the package has been
- transferred elsewhere, for instance with a file named
- <filename>README.status</filename> containing the new VCS URL.
- </para>
- </listitem>
- <listitem>
- <para>
- Delete the package in the Subversion repository after its VCS URL
- in stable has been updated by the next release.
- </para>
- </listitem>
- </itemizedlist>
- <para>
- It is also possible to prepare a Git repository containing some of the
- package's history using the command
- <command>gbp import-dscs --debsnap</command> from the helper toolkit
- <command>git-buildpackage</command>.
- This will download all the versions of a package available in
- <ulink url="http://snapshot.debian.org">snapshot.debian.org</ulink>
- and create tags for each of them.
- Note that as this paragraph is written, the tool is not aware that
- <literal>backports</literal> should be a different branch.
- </para>
- </sect2>
</sect1>
<sect1 id="packaging">
<title>Packaging</title>
@@ -677,7 +537,7 @@ pkg-grass/
</para>
<para>
See also the
- <ulink url="https://anonscm.debian.org/cgit/pkg-grass/package_template.git">package template</ulink>
+ <ulink url="https://salsa.debian.org/debian-gis-team/package_template">package template</ulink>
in our Git repository.
</para>
</sect2>
@@ -706,7 +566,7 @@ pkg-grass/
<title>Packaging with Git</title>
<para>
This section describes the procedures that Debian GIS contributors use
- to maintain packages in the Git repositories on git.debian.org.
+ to maintain packages in the Git repositories on salsa.debian.org.
</para>
<para>
It covers how to upload an initial package, how to update packages,
@@ -845,21 +705,21 @@ pkg-grass/
</listitem>
<listitem>
<para>
- <link linkend="git-push">Pushing to git.debian.org</link>
+ <link linkend="git-push">Pushing to salsa.debian.org</link>
<itemizedlist spacing="compact" mark="none">
<listitem>
<para>
- <link linkend="git-repository-on-alioth">Create a Git repository on Alioth</link>
+ <link linkend="git-repository-on-salsa">Create a Git repository on Salsa</link>
</para>
</listitem>
<listitem>
<para>
- <link linkend="git-alioth-remote">Configure a Git remote for the repository</link>
+ <link linkend="git-add-remote">Configure a Git remote for the repository</link>
</para>
</listitem>
<listitem>
<para>
- <link linkend="git-push-to-alioth">Push the package</link>
+ <link linkend="git-push-to-salsa">Push the package</link>
</para>
</listitem>
</itemizedlist>
@@ -1033,7 +893,7 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
<command>cd</command> <replaceable><package></replaceable>
<command>git init</command>
<command>gbp 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>git clone</command> https://salsa.debian.org/debian-gis-team/package_template.git
<command>mv</command> package_template/debian/ .
<command>rm</command> <option>-rf</option> debian/.git/ package_template/
</programlisting>
@@ -1093,7 +953,7 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
<command>gbp clone</command> command with its
<option>--all</option> option to achieve the same.
<programlisting>
-<command>gbp clone</command> <option>--all</option> https://anonscm.debian.org/git/pkg-grass/<replaceable><package></replaceable>.git
+<command>gbp clone</command> <option>--all</option> https://salsa.debian.org/debian-gis-team/<replaceable><package></replaceable>.git
</programlisting>
</para>
<para>
@@ -1127,7 +987,7 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
And don't be afraid to
<ulink url="https://git-scm.com/book/en/Git-Branching-Rebasing">rebase</ulink>
your local branches into coherent commits before
- <link linkend="git-push">pushing your changes to git.debian.org</link>.
+ <link linkend="git-push">pushing your changes to salsa.debian.org</link>.
</para>
<para>
Some prefer to update <filename>debian/changelog</filename> with
@@ -1464,25 +1324,25 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
</para>
</sect4>
<sect4 id="git-push">
- <title>Pushing to git.debian.org</title>
+ <title>Pushing to salsa.debian.org</title>
<para>
- Before pushing your packaging changes to git.debian.org for the
+ Before pushing your packaging changes to salsa.debian.org for the
first time, an empty repository needs to be created there.
- And you need to configure a Git remote for the repository on Alioth.
+ And you need to configure a Git remote for the repository on Salsa.
</para>
- <sect5 id="git-repository-on-alioth">
- <title>Create a Git repository on Alioth</title>
+ <sect5 id="git-repository-on-salsa">
+ <title>Create a Git repository on Salsa</title>
<para>
- To create a Git repository on Alioth, connect to
- <literal>git.debian.org</literal>, enter the
- <filename class="directory">/git/pkg-grass</filename> directory,
- and run the <command>./setup-repository</command> script.
+ To create a Git repository on Salsa, use the
+ <command>salsa-create-repository.pl</command> script from the
+ <literal>scripts</literal> repository.
</para>
<para>
<programlisting>
-<command>ssh</command> git.debian.org
-<command>cd</command> /git/pkg-grass
-<command>./setup-repository</command> <replaceable><package></replaceable> 'Packaging of <replaceable><package></replaceable> in Debian'
+<command>git clone</command> https://salsa.debian.org/debian-gis-team/scripts.git
+<command>cd</command> scripts
+<command>apt-get install</command> libjson-perl libwww-perl
+<command>./salsa-create-repository.pl</command> <option>-v</option> <option>-t</option> <replaceable><token></replaceable> <option>-p</option> <replaceable><package></replaceable>
</programlisting>
</para>
<para>
@@ -1491,42 +1351,54 @@ DIST=<replaceable><distribution></replaceable> ARCH=<replaceable><archi
Each package is kept in its own Git repository.
</para>
<para>
- See the <link linkend="ssh-config">SSH tips</link> section for how to configure the default <command>ssh</command> username for <literal>git.debian.org</literal>.
+ The <replaceable>token</replaceable> is generated via the
+ <ulink url="https://salsa.debian.org/profile/personal_access_tokens">Access Tokens</ulink>
+ page, and the scripts require the <literal>api</literal> scope.
+ </para>
+ <para>
+ Instead of specifying the token on the command line,
+ it's recommended to store the token in the file:
+ <literal>$HOME/.salsa-token</literal>
+ </para>
+ <para>
+ Set the appropriate permissions with:
+<programlisting>
+<command>chmod</command> 600 $HOME/.salsa-token
+</programlisting>
</para>
</sect5>
- <sect5 id="git-alioth-remote">
+ <sect5 id="git-add-remote">
<title>Configure a Git remote for the repository</title>
<para>
- On your local machine add the Alioth repository as a remote:
+ On your local machine add the Salsa repository as a remote:
</para>
<para>
<programlisting>
-<command>git remote add</command> origin ssh://git.debian.org/git/pkg-grass/<replaceable><package></replaceable>.git
+<command>git remote add</command> origin https://salsa.debian.org/debian-gis-team/<replaceable><package></replaceable>.git
+<command>git remote set-url</command> <option>--push</option> origin git at salsa.debian.org:debian-gis-team/<replaceable><package></replaceable>.git
</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 <literal>origin</literal>.
</para>
</sect5>
- <sect5 id="git-push-to-alioth">
+ <sect5 id="git-push-to-salsa">
<title>Push the package</title>
<para>
Make sure you've
- <link linkend="git-repository-on-alioth">created the repository on Alioth</link>
+ <link linkend="git-repository-on-salsa">created the repository on Salsa</link>
and that you've
- <link linkend="git-alioth-remote">added the remote</link>!
+ <link linkend="git-add-remote">added the remote</link>!
</para>
<para>
- Push all your locally changed branches to Alioth:
+ Push all your locally changed branches to Salsa:
<programlisting>
<command>git push</command> <option>--all</option> <option>--set-upstream</option>
<command>git push</command> <option>--tags</option>
</programlisting>
The <option>--set-upstream</option> option is required to have
the locally created branches track the changes from the upstream
- repository on Alioth.
+ repository on Salsa.
</para>
</sect5>
</sect4>
@@ -1702,10 +1574,10 @@ allowed_distributions = .*
<replaceable>stretch</replaceable> branch,
<link linkend="git-build-package">build</link>,
<link linkend="git-tag-release">tag</link> and
- <link linkend="git-push-to-alioth">push</link>.
+ <link linkend="git-push-to-salsa">push</link>.
If you created the branch locally, remember to use the
<command>git push</command> <option>--set-upstream</option> option
- to track changes from the shared repository on Alioth.
+ to track changes from the shared repository on Salsa.
</para>
</sect3>
<sect3 id="git-backports">
@@ -2044,12 +1916,12 @@ allowed_distributions = .*
<link linkend="git-create-backport">new backported package</link>,
the <command>git push</command> <option>--set-upstream</option>
option needs to be used to track changes from the origin
- repository on Alioth:
+ repository on Salsa:
<programlisting>
<command>git push</command> origin <replaceable>stretch-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 Alioth:
+ branch was checked out from the origin repository on Salsa:
<programlisting>
<command>git push</command>
</programlisting>
@@ -2058,20 +1930,16 @@ allowed_distributions = .*
Depending on how the local git repository was created, the
protocol for git pushes may need to be changed to
<literal>ssh</literal>, and the host to
- <literal>git.debian.org</literal>, because the
+ <literal>salsa.debian.org</literal>, because the
<literal>anonscm.debian.org</literal> host only provides
read-only services:
<programlisting>
-<command>git remote set-url</command> <option>--push</option> origin ssh://<replaceable><username></replaceable>@git.debian.org/git/pkg-grass/<replaceable><package></replaceable>.git
+<command>git remote set-url</command> <option>--push</option> origin git at salsa.debian.org:debian-gis-team/<replaceable><package></replaceable>.git
</programlisting>
- The <replaceable><username></replaceable> doesn't have to be
- specified if the appropriate username is configured in
- <filename>~/.ssh/config</filename> as documented in the
- <link linkend="ssh-config">SSH tips</link> section.
</para>
<para>
After pushing the changes for the backport to the repostitory on
- Alioth, continue to
+ Salsa, continue to
<link linkend="git-upload-backport">upload</link> the package and
<link linkend="git-tag-backport">tag</link> the release.
</para>
@@ -2121,7 +1989,7 @@ allowed_distributions = .*
<para>
After uploading the changes for the backport don't forget to
<link linkend="git-tag-backport">tag</link> the last commit and
- push the changes to the git repository on Alioth.
+ push the changes to the git repository on Salsa.
</para>
</sect4>
<sect4 id="git-tag-backport">
@@ -2133,7 +2001,7 @@ allowed_distributions = .*
<para>
Use <command>debcommit</command> to create the tag from the version
in <link linkend="debian-changelog"><filename>debian/changelog</filename></link>
- and push the tag to the git repository on Alioth.
+ and push the tag to the git repository on Salsa.
</para>
<para>
<programlisting>
@@ -2294,7 +2162,7 @@ allowed_distributions = .*
removed from the <link linkend="tasks">Blend Tasks</link>.
</para>
<para>
- The git repositories for the packages on Alioth don't need to be
+ The git repositories for the packages on Salsa don't need to be
removed, and can be kept for historic reference.
</para>
</sect3>
@@ -2351,11 +2219,8 @@ allowed_distributions = .*
<title>To change the default branch</title>
<para>
If the Debian work is not on the <literal>master</literal> branch,
- change the default branch by editing the <filename>HEAD</filename>
- file in the bare repository on Alioth, and replace
- <literal>master</literal> by the name of the new default branch.
- For a branch called <literal>debian/unstable</literal> the contents
- of the file will be <literal>refs/heads/debian/unstable</literal>.
+ change the default branch by editing the project settings and
+ select the appropriate <literal>Default Branch</literal>.
</para>
</sect4>
<sect4 id="git-debian-version-from-commit">
@@ -2379,126 +2244,6 @@ get-orig-source:
</sect4>
</sect3>
</sect2>
- <sect2 id="svn-packaging">
- <title>Packaging with Subversion</title>
- <para>
- Subversion was used in the past to maintain the source packages, but
- (almost) all packages have since moved to
- <link linkend="git-packaging">Git</link>.
- Refer to the
- <ulink url="https://wiki.debian.org/DebianGis/Svn2Git#Status_of_migrations">status of migrations</ulink>
- on the Debian Wiki for details.
- </para>
- <para>
- The old Subversion repositories are still available on
- <literal>svn.debian.org</literal>, and can viewed using the
- <ulink url="https://anonscm.debian.org/viewvc/pkg-grass/">ViewVC</ulink>
- web interface.
- </para>
- <sect3 id="subversion-tips">
- <title>Subversion tips</title>
- <para id="svn-buildpackage-aliases">
- Suggested aliases for <command>svn-buildpackage</command>:
-<programlisting>
-alias <command>svn-b</command>='svn-buildpackage -us -uc --svn-ignore'
-alias <command>svn-br</command>='svn-b --svn-dont-purge --svn-reuse'
-alias <command>svn-bt</command>='svn-buildpackage --svn-tag'
-</programlisting>
- </para>
- <para id="svn-mergewithupstream">
- <command>svn-inject <replaceable>-o</replaceable></command> sets up the
- <literal>mergeWithUpstream</literal> property for the SVN directories
- where packages are stored.
- In case <command>svn-inject</command> was not used,
- you can do it by hand with the command:
-<programlisting>
-<command>svn propset</command> mergeWithUpstream 1 debian
-</programlisting>
- </para>
- <para id="download-upstream-source">
- To download the upstream sources
- (if there is a <filename>debian/watch</filename> file):
-<programlisting>
-<command>echo</command> "origDir=.." >> <filename>.svn/deb-layout</filename> && <command>uscan</command> <option>--force-download</option>
-</programlisting>
- Alternatively, you can try:
-<programlisting>
-<command>make</command> <option>-f</option> <filename>debian/rules</filename> get-orig-source
-</programlisting>
- </para>
- <para id="svn-write-access">
- If you're a Debian Developer or a member of the
- <ulink url="https://alioth.debian.org/projects/pkg-grass/">pkg-grass</ulink>
- group on Alioth,
- you can commit your changes: <command>svn commit</command>
- (or <command>svn ci</command>).
- Otherwise, you can ask to be added to the group
- (see the <link linkend="membership">Membership</link> section),
- or send the result of <command>svn diff</command> to the
- <ulink url="mailto:debian-gis at lists.debian.org">mailing list</ulink>
- (<command>gzip</command> <option>-9</option> it, if it's too large).
- </para>
- <para id="svn-tag-release">
- It may happen that a package version has been uploaded to Debian
- repositories, and you forgot to tag the last build with
- <command>svn-buildpackage --svn-tag</command>.
- You can tag this package also retroactively.
- A first step, creating the tags directory,
- can be achieved in two ways: either create it locally as sibling of
- <filename class="directory">trunk/</filename> with
- <command>svn mkdir</command>
- <filename class="directory">tags</filename>, and commit with
- <command>svn commit</command>, or create it remotely with
- <command>svn mkdir</command>
- <filename class="directory">svn+ssh://<user>@svn.debian.org/svn/pkg-grass/packages/<package>/tags</filename>.
- After the tags directory has been created, you're ready to tag the
- package: <command>svn-buildpackage</command>
- <option>--svn-tag-only</option> <option>--svn-no-autodch</option>.
- The <option>--svn-no-autodch</option> avoids
- <filename>debian/changelog</filename> to be marked as
- <literal>UNRELEASED</literal>.
- </para>
- <para id="example-svn-session">
- Here is an example session where a package is prepared manually:
-<programlisting>
-# Check out pkg-grass, cd to pkg-grass/packages
-# Create new project folder with
-svn mkdir projectname
-svn mkdir projectname/trunk
-
-# Put orig.tar.gz in place
-mv some_version.orig.tar.gz projectname
-
-# Inform svn-buildpackage about the location of the orig.tar.gz
-echo "origDir=.." > projectname/trunk/.svn/deb-layout
-
-# Untar source tree for development
-cd projectname
-tar xzvf some_version.orig.tar.gz
-cd some-version # entering the unpackaged source tree
-if [ ! -d debian ]; then dh_make ; fi
-mv debian ../trunk
-ln -s ../trunk/debian .
-
-# continue development
-fakeroot ./debian/rules binary
-
-# until it works, finally
-cd ..
-
-# debian directory is the only thing that is stored in svn, to be merged with upstream svn propset merge with upstream
-svn propset mergeWithUpstream 1 trunk/debian
-
-# See if things can be compiled via svn-buildpackage
-cd trunk
-svn-buildpackage -uc -us
-
-# check build
-lintian ../build-area/*changes
-</programlisting>
- </para>
- </sect3>
- </sect2>
<sect2 id="backports">
<title>Backports</title>
<para>
@@ -2812,7 +2557,7 @@ Uploaders: <replaceable>John Doe <johndoe at example.com></replaceable>,
If no changes are needed, please indicate this fact in the
changelog, and increment the value of the field.
<programlisting>
-Standards-Version: 3.9.8
+Standards-Version: 4.1.3
</programlisting>
</para>
</formalpara>
@@ -2836,13 +2581,8 @@ Homepage: <replaceable>https://www.example.com/</replaceable>
<ulink url="https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-VCS-fields">§ 5.6.26</ulink>
for details:
<programlisting>
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/<replaceable><package></replaceable>.git/
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/<replaceable><package></replaceable>.git
-</programlisting>
- or
-<programlisting>
-Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-grass/packages/<replaceable><package></replaceable>/trunk/
-Vcs-Svn: svn://anonscm.debian.org/pkg-grass/packages/<replaceable><package></replaceable>/trunk/
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/<replaceable><package></replaceable>
+Vcs-Git: https://salsa.debian.org/debian-gis-team/<replaceable><package></replaceable>.git
</programlisting>
</para>
</formalpara>
@@ -2938,7 +2678,7 @@ Vcs-Svn: svn://anonscm.debian.org/pkg-grass/packages/<replaceable><package>
<sect2 id="debian-changelog">
<title><filename>debian/changelog</filename></title>
<para>
- Packages hosted in our Git or Subversion repository,
+ Packages hosted in our Git repository,
that have been modified but not uploaded must use
<literal>UNRELEASED</literal> as a distribution name.
</para>
@@ -3085,23 +2825,18 @@ pristine-tar = True
<sect2 id="vcs">
<title>Version control systems</title>
<para>
- We mostly use Git, but some packages still use Subversion.
+ We use Git repositories these days, in the past Subversion was used.
</para>
<sect3 id="vcs-git">
<title>Source package stored in a Git repository</title>
<para>
Git repositories should be stored in the
- <filename class="directory">/git/pkg-grass</filename> directory on
- Alioth and created with the
- <link linkend="git-repository-on-alioth"><command>setup-repository</command></link>
- script available there.
- On Alioth write access must be given to the
- <literal>pkg-grass</literal> group and all the Debian Developers,
- with appropriate Unix permissions (including SGID bit on directories)
- and ACLs.
- See <filename class="directory">/git/pkg-grass</filename> itself as
- an example.
- <command>setup-repository</command> does this automatically.
+ <filename class="directory">debian-gis-team</filename> namespace on
+ Salsa and created with the
+ <link linkend="git-repository-on-salsa"><command>salsa-create-repository.pl</command></link>
+ script available in the
+ <ulink url="https://salsa.debian.org/debian-gis-team/scripts">scripts</ulink>
+ repository.
</para>
<para>
Git repositories managed with a helper tool should announce it. For
@@ -3110,26 +2845,11 @@ pristine-tar = True
<link linkend="debian-gbp.conf"><filename>debian/gbp.conf</filename></link>.
</para>
</sect3>
- <sect3 id="vcs-svn">
- <title>Source package stored in a Subversion repository</title>
- <para>
- We often use the <literal>mergeWithUpstream</literal> work flow.
- In that case, please keep all the modifications in the
- <filename class="directory">debian</filename> directory,
- and use the <option>-o</option> option of
- <command>svn-buildpackage</command>, as in the following example:
-<programlisting>
-<command>svn-inject</command> <option>-o</option> <replaceable>package.dsc</replaceable> <filename class="directory">svn+ssh://svn.debian.org/svn/pkg-grass/packages/</filename>.
-</programlisting>
- </para>
- </sect3>
<sect3 id="vcs-tags">
<title>Tags</title>
<para>
Tags indicate the revision corresponding to uploaded packages.
- For Subversion, the version number is used, and for Git,
- <literal>debian/</literal> is added before the version number.
- In the Subversion repository, older tags may be deleted to save space.
+ For Git <literal>debian/</literal> is added before the version number.
</para>
</sect3>
</sect2>
@@ -3162,8 +2882,7 @@ pristine-tar = True
We prefer that uploaded packages are built in a chroot,
to provide similar build environment to the whole team.
After upload, please <link linkend="vcs-tags">tag</link> the
- <link linkend="git-tag-release">Git</link> or
- <link linkend="svn-tag-release">Subversion</link> repository.
+ <link linkend="git-tag-release">Git</link> repository.
</para>
</sect2>
<sect2 id="patches">
@@ -3462,7 +3181,7 @@ clean-patched:
The source for the Debian GIS Policy can be downloaded from the same repository
as all the GIS packages:
<programlisting>
-<command>debcheckout</command> <option>--user</option> <replaceable><username></replaceable> git://git.debian.org/pkg-grass/website.git <option>--git-track <replaceable>'*'</replaceable></option>
+<command>debcheckout</command> <option>--git-track <replaceable>'*'</replaceable></option> https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net.git
</programlisting>
</para>
<para>
@@ -3489,19 +3208,11 @@ clean-patched:
<literal>codespell</literal> packages installed for the 'make' command not to fail.
</para>
<para>
- If there are no errors, commit your changes and push them to the Alioth
+ If there are no errors, commit your changes and push them to the Salsa
git repository. Alternatively, create a patch and send it to the
<ulink url="mailto:debian-gis at lists.debian.org">debian-gis at lists.debian.org</ulink>
mailing list for comments.
</para>
- <para>
- Run the <command>git status</command> command to check if there are any stray files.
- If there are none, update the policy online (which is included in pkg-grass website
- on Alioth) using <command>make publish</command>. This will rsync the current working
- directory to the team webspace on Alioth and fix the group permissions. There are
- currently problems with the icons directory on Alioth (which is owned by frankie)
- but this does not cause problems for normal updates.
- </para>
</sect2>
</sect1>
</article>
=====================================
policy/img deleted
=====================================
--- a/policy/img
+++ /dev/null
@@ -1 +0,0 @@
-../img/
\ No newline at end of file
=====================================
announcement.txt → public/announcement.txt
=====================================
=====================================
debian.css → public/debian.css
=====================================
=====================================
favicon.ico → public/favicon.ico
=====================================
Binary files a/favicon.ico and b/public/favicon.ico differ
=====================================
img/admon-caution.png → public/img/admon-caution.png
=====================================
Binary files a/img/admon-caution.png and b/public/img/admon-caution.png differ
=====================================
img/admon-important.png → public/img/admon-important.png
=====================================
Binary files a/img/admon-important.png and b/public/img/admon-important.png differ
=====================================
img/admon-note.png → public/img/admon-note.png
=====================================
Binary files a/img/admon-note.png and b/public/img/admon-note.png differ
=====================================
img/admon-tip.png → public/img/admon-tip.png
=====================================
Binary files a/img/admon-tip.png and b/public/img/admon-tip.png differ
=====================================
img/admon-warning.png → public/img/admon-warning.png
=====================================
Binary files a/img/admon-warning.png and b/public/img/admon-warning.png differ
=====================================
img/debiangis_mollweide.png → public/img/debiangis_mollweide.png
=====================================
Binary files a/img/debiangis_mollweide.png and b/public/img/debiangis_mollweide.png differ
=====================================
img/splash_gis.svg → public/img/splash_gis.svg
=====================================
=====================================
HEADER.html → public/index.html
=====================================
--- a/HEADER.html
+++ b/public/index.html
@@ -21,7 +21,7 @@
<h2>What is Debian GIS?</h2>
- <p>Debian GIS is a “<a href="http://blends.debian.org/blends">Debian Pure Blend</a>” with the aim to develop Debian into the best distribution for <strong>Geographical Information System</strong> applications and users.</p>
+ <p>Debian GIS is a <a href="http://blends.debian.org/blends">Debian Pure Blend</a> with the aim to develop Debian into the best distribution for <strong>Geographical Information System</strong> applications and users.</p>
<p>A good deal of GIS related software and libraries (e.g. GRASS GIS, GDAL, and PROJ.4) are already present in Debian.</p>
@@ -29,18 +29,12 @@
<p>The Debian source packages maintained by the Debian GIS team are also used by efforts to support current GIS software on Debian derivatives such as UbuntuGIS, which provides backports of GIS packages for Ubuntu, and OSGeo-Live for their Ubuntu based distribution.</p>
- <p>The Debian GIS team collaboration infrastructure on Alioth originates from the initial team effort to maintain the <a href="https://tracker.debian.org/pkg/grass">grass</a> package. It has since grown to collaboratively maintain most GIS and OpenStreetMap source packages, but still uses the <em>pkg-grass</em> group name on Alioth.</p>
-
<h2>Contact Information:</h2>
We use:
<dl>
- <dt><a href="https://alioth.debian.org/projects/pkg-grass/">https://alioth.debian.org/projects/pkg-grass/</a></dt>
-
- <dd>for group management, git repositories, and this webspace</dd>
-
- <dt><a href="https://anonscm.debian.org/cgit/pkg-grass/">https://anonscm.debian.org/cgit/pkg-grass/</a></dt>
+ <dt><a href="https://salsa.debian.org/debian-gis-team">https://salsa.debian.org/debian-gis-team</a></dt>
<dd>for storing of and working on our packages</dd>
@@ -82,8 +76,8 @@
<h2>A note on joining:</h2>
- <p>If you want to join the group you need to register an account on <a href="https://alioth.debian.org/account/register.php">alioth</a> and ask for being added to the pkg-grass group, preferrably by sending a short introduction mail to <a href="mailto:debian-gis at lists.debian.org">debian-gis at lists.debian.org</a>.<br />
- Please don't forget to read the documents below! (Specifically the <a href="policy.html">Debian GIS Policy</a>)</p>
+ <p>If you want to join the group you need to register an account on <a href="https://salsa.debian.org/">Salsa</a> and ask for being added to the <a href="https://salsa.debian.org/debian-gis-team">debian-gis-team</a> group, preferrably by sending a short introduction mail to <a href="mailto:debian-gis at lists.debian.org">debian-gis at lists.debian.org</a>.<br />
+ Please don't forget to read the the <a href="policy.html">Debian GIS Policy</a>!</p>
</div>
</body>
</html>
=====================================
public/policy.html
=====================================
--- /dev/null
+++ b/public/policy.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="refresh" content="0; url=policy/index.html">
+ <title>Debian GIS Policy</title>
+</head>
+<body>
+ Please, wait while you are being redirected to the Debian GIS Policy.<br/>
+ If your browser does not automatically redirect to it, click on the link below:<br/>
+ <a href="policy/index.html">Debian GIS Policy</a><br/>
+ <br/>
+ <em>With compliments of your friendly neighbor Debian GIS Team</em>
+</body>
+</html>
=====================================
public/policy/img
=====================================
--- /dev/null
+++ b/public/policy/img
@@ -0,0 +1 @@
+../img/
\ No newline at end of file
=====================================
public/policy/index.html
=====================================
--- /dev/null
+++ b/public/policy/index.html
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Debian GIS Policy</title><link rel="stylesheet" type="text/css" href="policy.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="home" href="index.html" title="Debian GIS Policy" /><link rel="next" href="repositories.html" title="Repositories" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Debian GIS Policy</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="repositories.html">Next</a></td></tr></table><hr /></div><div class="article"><div class="titlepage"><div><div><h2 class="title"><a id="idm1"></a>Debian GIS Policy</h2></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Andreas</span> <span class="surname">Tille</span></h3><span class="contrib">First review (Debian Med version)</span> <code class="email"><<a class="email" href="mailto:tille at debian.org">tille at debian.org</a>></code></div><div class="author"><h3 class="author"><span class="firstname">David</span> <span class="surname">Paleino</span></h3><span class="contrib">Initial writing (Debian Med version)</span> <code class="email"><<a class="email" href="mailto:d.paleino at gmail.com">d.paleino at gmail.com</a>></code></div><div class="author"><h3 class="author"><span class="firstname">Charles</span> <span class="surname">Plessy</span></h3><span class="contrib">Contributions in 2008 and 2011 (Debian Med version)</span> <code class="email"><<a class="email" href="mailto:plessy at debian.org">plessy at debian.org</a>></code></div><div class="author"><h3 class="author"><span class="firstname">Bas</span> <span class="surname">Couwenberg</span></h3><span class="contrib">Changes for Debian GIS version</span> <code class="email"><<a class="email" href="mailto:sebastic at debian.org">sebastic at debian.org</a>></code></div></div></div><div><p class="releaseinfo">
+ Source:
+ <a class="ulink" href="https://salsa.debian.org/debian-gis-team/website/blob/master/policy.xml" target="_top">https://salsa.debian.org/debian-gis-team/website/blob/master/policy.xml</a>
+ </p></div></div><hr /></div><div class="toc"><p><strong>Table of Contents</strong></p><dl class="toc"><dt><span class="sect1"><a href="index.html#introduction">Introduction</a></span></dt><dd><dl><dt><span class="sect2"><a href="index.html#contribute">How to Contribute</a></span></dt><dt><span class="sect2"><a href="index.html#membership">Membership</a></span></dt><dt><span class="sect2"><a href="index.html#readings">Essential readings</a></span></dt></dl></dd><dt><span class="sect1"><a href="repositories.html">Repositories</a></span></dt><dd><dl><dt><span class="sect2"><a href="repositories.html#source">Give me the source!</a></span></dt><dt><span class="sect2"><a href="repositories.html#ssh-tips">SSH tips</a></span></dt><dt><span class="sect2"><a href="repositories.html#git-repository">Git repository</a></span></dt></dl></dd><dt><span class="sect1"><a href="packaging.html">Packaging</a></span></dt><dd><dl><dt><span class="sect2"><a href="packaging.html#packaging-guidelines">Newcomer guidelines for building proper Debian packages</a></span></dt><dt><span class="sect2"><a href="packaging.html#itp">Announcing intent to package</a></span></dt><dt><span class="sect2"><a href="packaging.html#git-packaging">Packaging with Git</a></span></dt><dt><span class="sect2"><a href="packaging.html#backports">Backports</a></span></dt><dt><span class="sect2"><a href="packaging.html#ubuntugis-ppa">PPA for Ubuntu by UbuntuGIS</a></span></dt><dt><span class="sect2"><a href="packaging.html#derivatives">Derivatives working together with Debian GIS</a></span></dt><dt><span class="sect2"><a href="packaging.html#r-packages">R packages</a></span></dt><dt><span class="sect2"><a href="packaging.html#sponsorship">Sponsorship</a></span></dt></dl></dd><dt><span class="sect1"><a href="tasks.html">Blend Tasks</a></span></dt><dd><dl><dt><span class="sect2"><a href="tasks.html#installing-tasks">Installing Debian GIS Blend tasks</a></span></dt></dl></dd><dt><span class="sect1"><a href="policy.html">Policy</a></span></dt><dd><dl><dt><span class="sect2"><a href="policy.html#debian-control"><code class="filename">debian/control</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-copyright"><code class="filename">debian/copyright</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-changelog"><code class="filename">debian/changelog</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-upstream"><code class="filename">debian/upstream</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-gbp.conf"><code class="filename">debian/gbp.conf</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-readme-source"><code class="filename">debian/README.source</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-readme-test"><code class="filename">debian/README.test</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-source-format"><code class="filename">debian/source/format</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-source-option"><code class="filename">debian/source/option</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-compat"><code class="filename">debian/compat</code></a></span></dt><dt><span class="sect2"><a href="policy.html#vcs">Version control systems</a></span></dt><dt><span class="sect2"><a href="policy.html#new-package">New package</a></span></dt><dt><span class="sect2"><a href="policy.html#new-packages-in-tasks">The Debian GIS Blend tasks</a></span></dt><dt><span class="sect2"><a href="policy.html#building-and-tagging">Building and tagging the packages</a></span></dt><dt><span class="sect2"><a href="policy.html#patches">Handling patches</a></span></dt><dt><span class="sect2"><a href="policy.html#contributing">Contributing to the GIS Policy</a></span></dt></dl></dd></dl></div><div class="mediaobject" align="center"><img src="img/debiangis_mollweide.png" align="middle" /></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="introduction"></a>Introduction</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="index.html#contribute">How to Contribute</a></span></dt><dd><dl><dt><span class="sect3"><a href="index.html#translations">Translations</a></span></dt><dt><span class="sect3"><a href="index.html#debtags">Debtags</a></span></dt><dt><span class="sect3"><a href="index.html#screenshots">Screenshots</a></span></dt><dt><span class="sect3"><a href="index.html#bugs">Squashing Bugs</a></span></dt><dt><span class="sect3"><a href="index.html#policy-updates">Policy Updates</a></span></dt></dl></dd><dt><span class="sect2"><a href="index.html#membership">Membership</a></span></dt><dt><span class="sect2"><a href="index.html#readings">Essential readings</a></span></dt></dl></div><p>
+ Debian GIS is a
+ <span class="quote">“<span class="quote"><a class="ulink" href="https://blends.debian.org/blends" target="_top">Debian Pure Blend</a></span>”</span>
+ with the aim to develop Debian into the best distribution for
+ Geographical Information System applications and users.
+ </p><p>
+ A good deal of GIS related software and libraries (e.g. GRASS GIS, GDAL,
+ and PROJ.4) are already present in Debian.
+ </p><p>
+ Thanks to efforts of the Debian GIS team, we currently have many
+ exciting GIS packages in Debian's main archives.
+ Other programs are well along their way to being included in the archive.
+ </p><p>
+ The Debian source packages maintained by the Debian GIS team are also
+ used by efforts to support current GIS software on Debian derivatives
+ such as <a class="ulink" href="https://wiki.ubuntu.com/UbuntuGIS" target="_top">UbuntuGIS</a>,
+ which provides backports of GIS packages for Ubuntu,
+ and <a class="ulink" href="https://live.osgeo.org/" target="_top">OSGeo-Live</a> for their
+ Ubuntu based distribution.
+ </p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="contribute"></a>How to Contribute</h3></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect3"><a href="index.html#translations">Translations</a></span></dt><dt><span class="sect3"><a href="index.html#debtags">Debtags</a></span></dt><dt><span class="sect3"><a href="index.html#screenshots">Screenshots</a></span></dt><dt><span class="sect3"><a href="index.html#bugs">Squashing Bugs</a></span></dt><dt><span class="sect3"><a href="index.html#policy-updates">Policy Updates</a></span></dt></dl></div><p>
+ From the developer to the user, there is a long chain of tasks in which
+ we always welcome participation.
+ First we must keep ourselves informed about the software landscape in
+ GIS and/or OpenStreetMap.
+ So you could help by monitor the GIS landscape for new and updated
+ software and keeping the team informed.
+ Software to be packaged is chosen according to criteria such as users'
+ need and the consistency of the distribution.
+ </p><p>
+ Once in Debian, the software is monitored for its quality and bugs are
+ fixed, if possible in collaboration with the upstream maintainer(s).
+ So you could help out by triaging bugs, searching for patches or
+ creating them, then testing the fixes and letting the team know.
+ </p><p>
+ All this work would not be very useful if it remains confidential or
+ confined to the source packages of Debian and its derivative distributions.
+ We also dedicate some time to advertise it to the world via
+ <a class="ulink" href="https://www.debian.org" target="_top">www.debian.org</a>
+ and to ease the integration of new members.
+ Maybe you could help out by writing articles about Debian GIS or the
+ software we package? This could be for Magazines (online or in proint).
+ Writing "HOWTO" articles is also a good way to help new users find their
+ feet with the Debian GIS software.
+ </p><p>
+ Translating package descriptions (if you speak another language in
+ addition to English), tagging packages with metadata, and uploading
+ screenshots will also help users find the software that fulfills
+ their needs.
+ </p><p>
+ Please contact us on
+ <a class="ulink" href="mailto:debian-gis at lists.debian.org" target="_top">debian-gis at lists.debian.org</a>
+ if you want to help to make GIS and/or OpenStreetMap software available
+ to users of Debian and its derivative distributions such as Ubuntu,
+ OSGeo-Live, Mint, etc.
+ Read the <a class="link" href="index.html#membership" title="Membership">Membership</a>
+ section if you're interested in joining us.
+ </p><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="translations"></a>Translations</h4></div></div></div><p>
+ If you speak a language in addition to English, you can contribute right away
+ with translations of package descriptions at
+ <a class="ulink" href="http://ddtp.debian.net" target="_top">ddtp.debian.net</a>.
+ </p><p>
+ When working on these, you will find immediate targets for improvements
+ of the original English versions, too.
+ For these though, you need access to Debian GIS's source code repository.
+ </p><p>
+ A good route to find the Debian GIS descriptions needing translation is
+ to use one of the Debian GIS task pages (for example the
+ <a class="ulink" href="https://blends.debian.org/gis/tasks/workstation" target="_top">workstation task</a>).
+ If you are using a non-English locale, you should see that untranslated
+ descriptions are in English, and there is a button you can click to
+ contribute a translation.
+ If you use an English locale, there are links at the bottom of the
+ webpage that switch the webpage to other languages.
+ </p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="debtags"></a>Debtags</h4></div></div></div><p>
+ You can also contribute and edit Debtags on the task pages. Debtags
+ are used in Debian so that people can type in keywords and search
+ for packages that they might need. Please help us to make sure a
+ user will find our packages if they are searching for them.
+ On the Debian GIS task pages, if a package is currently not tagged,
+ you should see a "<a class="ulink" href="https://debtags.debian.org/edit/" target="_top">Go tagging</a>"
+ button.
+ By clicking "Edit Tags", you can also double check the packages that
+ have already been tagged.
+ </p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="screenshots"></a>Screenshots</h4></div></div></div><p>
+ A well chosen screenshot can also help to sell each Debian GIS package.
+ Clicking on
+ "<a class="ulink" href="https://screenshots.debian.net/" target="_top">Upload screenshot</a>"
+ on the Debian GIS tasks pages will take you to a page where you can
+ upload a screenshot.
+ Instructions can be found on the page that you are taken to.
+ You can also click on an existing screen shot to send an updated one
+ if you think the current one is out of date.
+ </p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="bugs"></a>Squashing Bugs</h4></div></div></div><p>
+ If confirming bugs and contributing and testing patches are your thing,
+ you can help triage the list of outstanding
+ <a class="ulink" href="https://bugs.debian.org/cgi-bin/pkgreport.cgi?which=maint&data=pkg-grass-devel%40lists.alioth.debian.org&archive=no&raw=yes&bug-rev=yes&pend-exc=fixed&pend-exc=done" target="_top">Debian GIS bugs</a>.
+ </p><p>
+ You will find guidance on how to use the Debian Bug Tracking System (BTS)
+ linked from this page: <a class="ulink" href="https://www.debian.org/Bugs/" target="_top">Debian Bug Tracking System</a>
+ </p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="policy-updates"></a>Policy Updates</h4></div></div></div><p>
+ This policy is a work in progress, and attempts to document best
+ practices which evolve and change over time.
+ Different people tend to do things in different ways.
+ If your way diverges, you may want to document it here
+ so that others can benefit.
+ Please send any comments or ideas to
+ <a class="ulink" href="mailto:debian-gis at lists.debian.org" target="_top">debian-gis at lists.debian.org</a>.
+ For more details on contributing to the policy, see the
+ <a class="link" href="policy.html#contributing" title="Contributing to the GIS Policy">Contributing to the GIS Policy</a>
+ section later in the policy.
+ </p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="membership"></a>Membership</h3></div></div></div><p>
+ To request membership of the Debian GIS team, and commit access to our git
+ repositories on Salsa, please go to our
+ <a class="ulink" href="https://salsa.debian.org/debian-gis-team" target="_top">Salsa page</a>
+ and click the Request Access button.
+ </p><p>
+ You need to register a Salsa account before you can request
+ membership of the Debian GIS team (if you are not a Debian Developer),
+ by creating a guest account using the
+ <a class="ulink" href="https://signup.salsa.debian.org/" target="_top">Debian GitLab self-service</a>
+ interface.
+ </p><p>
+ The Debian GIS team collaboration infrastructure was originally hosted
+ on Alioth which provided VCS hosting, mailinglists and website hosting.
+ </p><p>
+ The team grew out of the initial effort to collaboratively maintain the
+ <a class="ulink" href="https://tracker.debian.org/pkg/grass" target="_top">grass</a>
+ package, and ended up collaboratively maintaining most GIS and
+ OpenStreetMap source packages, while still using the
+ <code class="literal">pkg-grass</code> group name on Alioth.
+ </p><p>
+ On Salsa the <code class="literal">debian-gis-team</code> namespace is used, but
+ the mailinglist for the Maintainer address in packages still uses
+ <code class="literal">pkg-grass</code> in its name thanks to its origin on Alioth.
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="readings"></a>Essential readings</h3></div></div></div><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
+ The
+ <a class="ulink" href="https://www.debian.org/doc/debian-policy/" target="_top">Debian Policy</a>:
+ packages must conform to it.
+ </p></li><li class="listitem"><p>
+ The
+ <a class="ulink" href="https://www.debian.org/doc/developers-reference/" target="_top">Developers Reference</a>:
+ details best packaging practices.
+ </p></li><li class="listitem"><p>
+ The
+ <a class="ulink" href="https://www.debian.org/doc/maint-guide/" target="_top">New Maintainer's Guide</a>:
+ puts a bit of the two above in practice.
+ </p></li><li class="listitem"><p>
+ The
+ <a class="ulink" href="https://debian-gis-team.pages.debian.net/website/policy.html" target="_top">Debian GIS Policy</a>
+ (this document): explains how the work is organized in our team.
+ </p></li></ul></div></div></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="repositories.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"> </td><td width="40%" align="right" valign="top"> Repositories</td></tr></table></div></body></html>
\ No newline at end of file
=====================================
public/policy/packaging.html
=====================================
The diff for this file was not included because it is too large.
=====================================
policy/policy.css → public/policy/policy.css
=====================================
=====================================
public/policy/policy.html
=====================================
--- /dev/null
+++ b/public/policy/policy.html
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Policy</title><link rel="stylesheet" type="text/css" href="policy.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="home" href="index.html" title="Debian GIS Policy" /><link rel="up" href="index.html" title="Debian GIS Policy" /><link rel="prev" href="tasks.html" title="Blend Tasks" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Policy</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="tasks.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> </td></tr></table><hr /></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="policy"></a>Policy</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="policy.html#debian-control"><code class="filename">debian/control</code></a></span></dt><dd><dl><dt><span class="sect3"><a href="policy.html#cme">Config::Model</a></span></dt></dl></dd><dt><span class="sect2"><a href="policy.html#debian-copyright"><code class="filename">debian/copyright</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-changelog"><code class="filename">debian/changelog</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-upstream"><code class="filename">debian/upstream</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-gbp.conf"><code class="filename">debian/gbp.conf</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-readme-source"><code class="filename">debian/README.source</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-readme-test"><code class="filename">debian/README.test</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-source-format"><code class="filename">debian/source/format</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-source-option"><code class="filename">debian/source/option</code></a></span></dt><dt><span class="sect2"><a href="policy.html#debian-compat"><code class="filename">debian/compat</code></a></span></dt><dd><dl><dt><span class="sect3"><a href="policy.html#debhelper">Debhelper</a></span></dt><dt><span class="sect3"><a href="policy.html#cdbs">CDBS</a></span></dt></dl></dd><dt><span class="sect2"><a href="policy.html#vcs">Version control systems</a></span></dt><dd><dl><dt><span class="sect3"><a href="policy.html#vcs-git">Source package stored in a Git repository</a></span></dt><dt><span class="sect3"><a href="policy.html#vcs-tags">Tags</a></span></dt></dl></dd><dt><span class="sect2"><a href="policy.html#new-package">New package</a></span></dt><dt><span class="sect2"><a href="policy.html#new-packages-in-tasks">The Debian GIS Blend tasks</a></span></dt><dt><span class="sect2"><a href="policy.html#building-and-tagging">Building and tagging the packages</a></span></dt><dt><span class="sect2"><a href="policy.html#patches">Handling patches</a></span></dt><dd><dl><dt><span class="sect3"><a href="policy.html#quilt">Using <span class="command"><strong>quilt</strong></span></a></span></dt><dt><span class="sect3"><a href="policy.html#dpatch">Using <span class="command"><strong>dpatch</strong></span></a></span></dt></dl></dd><dt><span class="sect2"><a href="policy.html#contributing">Contributing to the GIS Policy</a></span></dt></dl></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="debian-control"></a><code class="filename">debian/control</code></h3></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect3"><a href="policy.html#cme">Config::Model</a></span></dt></dl></div><div class="orderedlist"><ol class="orderedlist" type="1"><li class="listitem"><p><strong>Section. </strong>
+ Should be <span class="quote">“<span class="quote">science</span>”</span> for the source package.
+</p><pre class="programlisting">
+Section: science
+</pre><p>
+ </p></li><li class="listitem"><p><strong>Priority. </strong>
+ Should be <span class="quote">“<span class="quote">optional</span>”</span> unless forbidden by the Debian
+ policy
+ (<a class="ulink" href="https://www.debian.org/doc/debian-policy/ch-archive.html#s-priorities" target="_top">see §2.5</a>).
+ Packages of priority <span class="quote">“<span class="quote">extra</span>”</span> are excluded from some
+ QA tests.
+</p><pre class="programlisting">
+Priority: optional
+</pre><p>
+ </p></li><li class="listitem"><p><strong>Maintainer. </strong>
+ Maintainer should be
+ <code class="code">Debian GIS Project <code class="email"><<a class="email" href="mailto:pkg-grass-devel at lists.alioth.debian.org">pkg-grass-devel at lists.alioth.debian.org</a>></code></code>.
+ Please subscribe to this list if you list yourself in the
+ <code class="code">Uploaders:</code> field of one of Debian GIS's packages.
+ You can refer to the
+ <a class="ulink" href="https://qa.debian.org/developer.php?login=pkg-grass-devel@lists.alioth.debian.org&comaint=yes&version=oldoldstable" target="_top">QA page</a>
+ corresponding to this email to gather information about the
+ packages.
+</p><pre class="programlisting">
+Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+</pre><p>
+ </p></li><li class="listitem"><p><strong>Uploaders. </strong>
+ Please add yourself as an uploader when you have a significant
+ interest in a package.
+ Being Uploader means that you are expected to answer to the bug
+ reports.
+ For more occasional works, you can do a
+ <a class="ulink" href="https://www.debian.org/doc/developers-reference/pkgs#nmu-team-upload" target="_top">team upload</a>
+ with <span class="command"><strong>dch</strong></span> <code class="option">--team</code>.
+</p><pre class="programlisting">
+Uploaders: <em class="replaceable"><code>John Doe <johndoe at example.com></code></em>,
+ <em class="replaceable"><code>Your Name <yourname at example.com></code></em>
+</pre><p>
+ </p></li><li class="listitem"><p><strong>Standards-Version. </strong>
+ Please always use the latest unless there are concerns for
+ backporting.
+ If no changes are needed, please indicate this fact in the
+ changelog, and increment the value of the field.
+</p><pre class="programlisting">
+Standards-Version: 4.1.3
+</pre><p>
+ </p></li><li class="listitem"><p><strong>Homepage. </strong>
+ Should be documented whenever possible.
+</p><pre class="programlisting">
+Homepage: <em class="replaceable"><code>https://www.example.com/</code></em>
+</pre><p>
+ </p></li><li class="listitem"><p><a id="vcs-url"></a><strong>Vcs-Git and Vcs-Browser. </strong>
+ Please use the following templates, and refer to the Debian Policy
+ <a class="ulink" href="https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-VCS-fields" target="_top">§ 5.6.26</a>
+ for details:
+</p><pre class="programlisting">
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/<em class="replaceable"><code><package></code></em>
+Vcs-Git: https://salsa.debian.org/debian-gis-team/<em class="replaceable"><code><package></code></em>.git
+</pre><p>
+ </p></li></ol></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="cme"></a>Config::Model</h4></div></div></div><p>
+ It is a very good idea to use
+ <a class="ulink" href="https://tracker.debian.org/pkg/libconfig-model-perl" target="_top"><span class="command"><strong>Config::Model</strong></span></a>
+ to unify the formatting of <code class="filename">debian/control</code>.
+ </p><p>
+ To do so make sure you have installed
+ <code class="literal">libconfig-model-perl</code>
+ and <code class="literal">libconfig-model-dpkg-perl</code>
+ and then you can simply call
+ <span class="command"><strong>cme fix</strong></span> <code class="option">dpkg-control</code>
+ to get a properly formatted, sanity checked
+ <code class="filename">debian/control</code> file.
+ </p><p>
+ Please note that sometimes you need to call this more than once.
+ </p><pre class="programlisting">
+<span class="command"><strong>apt-get install</strong></span> <code class="option">libconfig-model-dpkg-perl libconfig-model-perl</code>
+# Install libconfig-model-itself-perl for a graphical model editor
+<span class="command"><strong>apt-get install</strong></span> <code class="option">libconfig-model-itself-perl</code>
+
+<span class="command"><strong>cme check</strong></span> <code class="option">dpkg-control</code>
+<span class="command"><strong>cme fix</strong></span> <code class="option">dpkg-control</code>
+</pre><div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Caution</h3><p>
+ <span class="command"><strong>cme fix</strong></span> will bump the
+ <code class="literal">Standards-Version</code> if it's lower than the
+ built-in default.
+ </p><p>
+ Before bumping the <code class="literal">Standards-Version</code> you should
+ check the
+ <a class="ulink" href="https://www.debian.org/doc/debian-policy/upgrading-checklist.html" target="_top">Policy checklist for upgrading your packages</a>
+ for relevant changes and update the package accordingly.
+ </p></div></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="debian-copyright"></a><code class="filename">debian/copyright</code></h3></div></div></div><p>
+ We use the
+ <a class="ulink" href="https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/" target="_top">machine-readable format</a>
+ for the <code class="filename">debian/copyright</code> file.
+ </p><p>
+ The <code class="literal">Source</code> field does not need to contain the full
+ URL to the particular version that is being packaged,
+ since this can be determined by the <span class="command"><strong>uscan</strong></span> program
+ with the <code class="filename">debian/watch</code> file.
+ </p><p>
+ Please list yourself in the <code class="literal">Files: debian/*</code> section
+ if you think that your contributions are not trivial and therefore
+ subjected to copyright.
+ Please chose a license that is compatible with the program you package.
+ You can also use
+ <span class="quote">“<span class="quote">same as if it were in the public domain</span>”</span> or
+ <span class="quote">“<span class="quote">same as the packaged program itself</span>”</span>.
+ </p><p>
+ To create some reasonable skeleton for a
+ <code class="filename">debian/copyright</code> file you can try the following:
+</p><pre class="programlisting">
+<span class="command"><strong>sudo apt-get install</strong></span> devscripts cdbs
+<span class="command"><strong>licensecheck</strong></span> <code class="option">--copyright</code> <code class="option">-r *</code> | <span class="command"><strong>/usr/lib/cdbs/licensecheck2dep5</strong></span> > <code class="filename">debian/copyright</code>
+</pre><p>
+ </p><p>
+ To verify the correct syntax of the
+ <code class="filename">debian/copyright</code> file you can use:
+</p><pre class="programlisting">
+<span class="command"><strong>cme check</strong></span> <code class="option">dpkg-copyright</code>
+<span class="command"><strong>cme fix</strong></span> <code class="option">dpkg-copyright</code>
+</pre><p>
+ or
+</p><pre class="programlisting">
+<span class="command"><strong>config-edit</strong></span> <code class="option">-application dpkg-copyright</code> <code class="option">-ui none</code>
+</pre><p>
+ from package <code class="filename">libconfig-model-dpkg-perl</code>
+ (see <a class="link" href="policy.html#cme" title="Config::Model">Config::Model</a> above).
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="debian-changelog"></a><code class="filename">debian/changelog</code></h3></div></div></div><p>
+ Packages hosted in our Git repository,
+ that have been modified but not uploaded must use
+ <code class="literal">UNRELEASED</code> as a distribution name.
+ </p><p>
+ This can be done automatically by declaring
+ <code class="literal"><code class="varname">DEBCHANGE_RELEASE_HEURISTIC</code>=<em class="replaceable"><code>changelog</code></em></code>
+ in <code class="filename">~/.devscripts</code> and using
+ <a class="ulink" href="https://manpages.debian.org/dch" target="_top"><span class="command"><strong>dch</strong></span></a>.
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="debian-upstream"></a><code class="filename">debian/upstream</code></h3></div></div></div><p>
+ We use the
+ <a class="ulink" href="https://wiki.debian.org/UpstreamMetadata#Fields" target="_top">bibliographic information</a>
+ which should be stored in the file <code class="filename">debian/upstream</code>.
+ The purpose of specifying this is to enhance the contact to upstream
+ which thus gets an extra reward of their work if their citations show
+ up on pages inside the Debian domain and if users more popularly are
+ asked to cite upstream when working with the program in question.
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="debian-gbp.conf"></a><code class="filename">debian/gbp.conf</code></h3></div></div></div><p>
+ Include this file to document the layout of the repository.
+ Packages managed with <span class="command"><strong>git-buildpackage</strong></span>
+ may omit default values.
+</p><pre class="programlisting">
+[DEFAULT]
+
+# The default name for the upstream branch is "upstream".
+# Change it if the name is different (for instance, "master").
+upstream-branch = upstream
+
+# The default name for the Debian branch is "master".
+# Change it if the name is different (for instance, "debian/unstable").
+debian-branch = master
+
+# gbp import-orig uses the following names for the upstream tags.
+# Change the value if you are not using gbp import-orig
+upstream-tag = upstream/%(version)s
+
+# Always use pristine-tar.
+pristine-tar = True
+</pre><p>
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="debian-readme-source"></a><code class="filename">debian/README.source</code></h3></div></div></div><p>
+ This file is recommended by the Policy
+ (<a class="ulink" href="https://www.debian.org/doc/debian-policy/ch-source.html#s-readmesource" target="_top">§ 4.14</a>)
+ from version 3.8.0 for documenting source package handling.
+ Please follow the recommendation.
+ For instance, this file is needed when we use a patch system,
+ when the upstream sources are in another format than gzipped
+ tar archive, when we repack the sources,…
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="debian-readme-test"></a><code class="filename">debian/README.test</code></h3></div></div></div><p>
+ This file was
+ (<a class="ulink" href="https://lists.debian.org/debian-devel-announce/2011/01/msg00006.html" target="_top">recommended by the Security team</a>)
+ for describing to others than the regular maintainer how the package
+ functionality can properly be tested.
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="debian-source-format"></a><code class="filename">debian/source/format</code></h3></div></div></div><p>
+ This file should contain <span class="quote">“<span class="quote"><code class="literal">3.0 (quilt)</code></span>”</span>.
+ Other formats should be avoided unless they bring a specific advantage.
+ </p><pre class="programlisting">
+3.0 (quilt)
+</pre></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="debian-source-option"></a><code class="filename">debian/source/option</code></h3></div></div></div><p>
+ For packages not using <a class="link" href="policy.html#quilt" title="Using quilt">quilt</a> patches, for
+ example when committing changes directly to the Debian branch, this file
+ should contain <span class="quote">“<span class="quote"><code class="literal">single-debian-patch</code></span>”</span> in
+ order to emulate the <code class="literal">1.0</code> format.
+ This is better than using the <code class="literal">1.0</code> format directly
+ because the <code class="literal">3.0 (quilt)</code> format brings other
+ advantages, in particular the conservation of file permissions in the
+ <code class="filename">debian</code> directory.
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="debian-compat"></a><code class="filename">debian/compat</code></h3></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect3"><a href="policy.html#debhelper">Debhelper</a></span></dt><dt><span class="sect3"><a href="policy.html#cdbs">CDBS</a></span></dt></dl></div><p>
+ Should normally contain <code class="literal">9</code>.
+ This debhelper compatibility level is recommended for its improved
+ support of
+ <a class="ulink" href="https://wiki.debian.org/Hardening" target="_top">hardening buildflags</a>
+ and
+ <a class="ulink" href="https://wiki.debian.org/Multiarch" target="_top">Multi-Arch</a>.
+</p><pre class="programlisting">
+9
+</pre><p>
+ </p><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="debhelper"></a>Debhelper</h4></div></div></div><p>
+ Debhelper uses compatibility levels to control the behavior of its
+ commands.
+ We currently recommend to use the level <code class="literal">9</code> which
+ is available in current <code class="literal">stable</code> (Wheezy) and
+ backported to <code class="literal">oldstable</code>.
+ However, there is no urgent need to touch packages only because it
+ has an older Debhelper version.
+ </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
+ factorization very simple and easy to understand the packaging for
+ other members of the team.
+ Even complex packaging becomes quite transparent this way.
+ </p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="cdbs"></a>CDBS</h4></div></div></div><p>
+ Before the short <span class="command"><strong>dh</strong></span> notation of debhelper existed
+ CDBS was the only way to factorize code in
+ <code class="filename">debian/rules</code> files.
+ We would like to standardize on <span class="command"><strong>dh</strong></span> when both
+ provide similar comfort. Please give it priority for new packages.
+ It is also possible to switch to <span class="command"><strong>dh</strong></span> for existing
+ packages, but this is entirely at the packagers discretion.
+ </p><p>
+ It is technically possible to build CDBS packages using Debhelper
+ without the <code class="filename">debian/compat</code> file.
+ Please do not, and always include such a file according to the above
+ <a class="link" href="policy.html#debhelper" title="Debhelper">Debhelper</a> guidelines.
+ </p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="vcs"></a>Version control systems</h3></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect3"><a href="policy.html#vcs-git">Source package stored in a Git repository</a></span></dt><dt><span class="sect3"><a href="policy.html#vcs-tags">Tags</a></span></dt></dl></div><p>
+ We use Git repositories these days, in the past Subversion was used.
+ </p><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="vcs-git"></a>Source package stored in a Git repository</h4></div></div></div><p>
+ Git repositories should be stored in the
+ <code class="filename">debian-gis-team</code> namespace on
+ Salsa and created with the
+ <a class="link" href="packaging.html#git-repository-on-salsa" title="Create a Git repository on Salsa"><span class="command"><strong>salsa-create-repository.pl</strong></span></a>
+ script available in the
+ <a class="ulink" href="https://salsa.debian.org/debian-gis-team/scripts" target="_top">scripts</a>
+ repository.
+ </p><p>
+ Git repositories managed with a helper tool should announce it. For
+ instance, to show that <span class="command"><strong>git-buildpackage</strong></span> is used,
+ the package can contain a configuration file in
+ <a class="link" href="policy.html#debian-gbp.conf" title="debian/gbp.conf"><code class="filename">debian/gbp.conf</code></a>.
+ </p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="vcs-tags"></a>Tags</h4></div></div></div><p>
+ Tags indicate the revision corresponding to uploaded packages.
+ For Git <code class="literal">debian/</code> is added before the version number.
+ </p></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="new-package"></a>New package</h3></div></div></div><p>
+ Try to inject a new package only after successfully building it with
+ <span class="command"><strong>dpkg-buildpackage</strong></span> (or any wrapper around it).
+ Use a file like <code class="filename">debian/DRAFT</code> to mention when
+ the package is a draft.
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="new-packages-in-tasks"></a>The Debian GIS Blend tasks</h3></div></div></div><p>
+ Once you injected a new package please make sure that it is mentioned
+ in the appropriate <a class="link" href="tasks.html" title="Blend Tasks">tasks</a> file in the
+ <a class="ulink" href="https://anonscm.debian.org/cgit/blends/projects/gis.git" target="_top">source</a>
+ of the
+ <a class="ulink" href="https://tracker.debian.org/pkg/debian-gis" target="_top"><span class="package">debian-gis</span></a>
+ Blend package.
+ Some team members watch the changes in the Debian GIS packaging pool
+ but it helps if the maintainer of a new package verifies that everything
+ is in the right place.
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="building-and-tagging"></a>Building and tagging the packages</h3></div></div></div><p>
+ We prefer that uploaded packages are built in a chroot,
+ to provide similar build environment to the whole team.
+ After upload, please <a class="link" href="policy.html#vcs-tags" title="Tags">tag</a> the
+ <a class="link" href="packaging.html#git-tag-release" title="Tag a release">Git</a> repository.
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="patches"></a>Handling patches</h3></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect3"><a href="policy.html#quilt">Using <span class="command"><strong>quilt</strong></span></a></span></dt><dt><span class="sect3"><a href="policy.html#dpatch">Using <span class="command"><strong>dpatch</strong></span></a></span></dt></dl></div><p>
+ Often happens that the upstream code doesn't fit well into the Debian
+ distribution: be this wrong paths, missing features, anything that
+ implies editing the source files.
+ When you directly edit upstreams source files, your changes will be put
+ into a .diff.gz file if you use the <code class="literal">1.0</code> source format
+ and in a monolithic patch if you use the <code class="literal">3.0 (quilt)</code>
+ format.
+ To better organize the patches and group the by function, please use a
+ patch handling system which keeps patches under the
+ <code class="filename">debian/patches/</code> directory.
+ </p><p>
+ The <code class="literal">3.0 (quilt)</code> dpkg source format provides its own
+ patch system.
+ Apart from this, the most popular is <span class="command"><strong>quilt</strong></span>.
+ <code class="literal">simple-patchsys</code>, from the <span class="package">CDBS</span>
+ package, is deprecated since version <code class="literal">0.4.85</code>.
+ <span class="command"><strong>dpatch</strong></span> has been popular as well,
+ but is not compatible with the <code class="literal">3.0 (quilt)</code>
+ source format and is
+ <a class="ulink" href="https://lists.debian.org/878vqt6was.fsf@luthien.mhp" target="_top">planned to be removed 2017</a>.
+ Please don't use any other patch system in Debian GIS,
+ unless absolutely necessary.
+ </p><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="quilt"></a>Using <span class="command"><strong>quilt</strong></span></h4></div></div></div><p>
+ Using quilt is rather easy.
+ </p><p>
+ First, make sure you have correctly setup quilt:
+ open <code class="filename">.quiltrc</code> in your home directory
+ (create it if you don't have one), and make sure it looks like this:
+</p><pre class="programlisting">
+QUILT_DIFF_ARGS="--no-timestamps --no-index"
+QUILT_REFRESH_ARGS="--no-timestamps --no-index"
+QUILT_PATCHES="debian/patches"
+</pre><p>
+ </p><p>
+ After this, you're ready to start working with quilt.
+ See also the instructions in the
+ <a class="ulink" href="https://www.debian.org/doc/manuals/maint-guide/modify#quiltrc" target="_top">New Maintainer's Guide</a>.
+ </p><div class="sect4"><div class="titlepage"><div><div><h5 class="title"><a id="quilt-create"></a>Creating a patch</h5></div></div></div><p>
+ To create a patch, use the <span class="command"><strong>new</strong></span> command. Run:
+</p><pre class="programlisting">
+<span class="command"><strong>quilt new</strong></span> <em class="replaceable"><code><patch_name>.patch</code></em>
+</pre><p>
+ </p><p>
+ This will create a <code class="filename">debian/patches/series</code> file
+ (if it doesn't exist yet), which contains all the patches to be
+ applied by quilt.
+ Moreover, the new patch is also the topmost (the currently applied).
+ </p><p>
+ Now start editing files, with:
+</p><pre class="programlisting">
+<span class="command"><strong>quilt edit</strong></span> <em class="replaceable"><code><file></code></em>
+</pre><p>
+ </p><p>
+ And repeat the process for each file the patch is involved with.
+ At the end, run:
+</p><pre class="programlisting">
+<span class="command"><strong>quilt refresh</strong></span>
+</pre><p>
+ This will compare the noted state of the edited files with the
+ current state, and will produce a patch in
+ <code class="filename">debian/patches</code>.
+ Remember: the patch is currently applied
+ (you can check this with <span class="command"><strong>quilt applied</strong></span>).
+ </p></div><div class="sect4"><div class="titlepage"><div><div><h5 class="title"><a id="quilt-apply"></a>Applying and unapplying patches</h5></div></div></div><p>
+ To apply the next patch in
+ <code class="filename">debian/patches/series</code>:
+</p><pre class="programlisting">
+<span class="command"><strong>quilt push</strong></span>
+</pre><p>
+ </p><p>
+ To unapply the topmost patch:
+</p><pre class="programlisting">
+<span class="command"><strong>quilt pop</strong></span>
+</pre><p>
+ </p><p>
+ You can just add the <code class="option">-a</code> option to the commands
+ above, to respectively apply and unapply all patches in the series.
+ </p><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Tip</h3><p>
+ You can check which patches are applied with:
+</p><pre class="programlisting">
+<span class="command"><strong>quilt applied</strong></span>
+</pre><p>
+ </p><p>
+ And which are unapplied:
+</p><pre class="programlisting">
+<span class="command"><strong>quilt unapplied</strong></span>
+</pre><p>
+ </p><p>
+ To check which patch is next in
+ <code class="filename">debian/patches/series</code> to be applied:
+</p><pre class="programlisting">
+<span class="command"><strong>quilt next</strong></span>
+</pre><p>
+ </p><p>
+ And which is next to be unapplied:
+</p><pre class="programlisting">
+<span class="command"><strong>quilt prev</strong></span>
+</pre><p>
+ </p></div></div><div class="sect4"><div class="titlepage"><div><div><h5 class="title"><a id="quilt-edit"></a>Editing patches</h5></div></div></div><p>To edit a patch, first make it the topmost:</p><pre class="programlisting">
+<span class="command"><strong>quilt push</strong></span> <em class="replaceable"><code><patch_name></code></em>
+</pre><p>
+ If the patch is already applied, but is not the topmost, run
+</p><pre class="programlisting">
+<span class="command"><strong>quilt pop</strong></span>
+</pre><p>
+ until it becomes the currently applied one.
+ </p><p>
+ You can now run
+</p><pre class="programlisting">
+<span class="command"><strong>quilt edit</strong></span>
+</pre><p>
+ on the files you want to change, and, when you're done:
+</p><pre class="programlisting">
+<span class="command"><strong>quilt refresh</strong></span>
+</pre><p>
+ to update the patch with your changes.
+ </p></div><div class="sect4"><div class="titlepage"><div><div><h5 class="title"><a id="quilt-rename"></a>Renaming patches</h5></div></div></div><p>
+ Sometimes it's useful to rename a patch.
+ Without any hassle, do:
+</p><pre class="programlisting">
+<span class="command"><strong>quilt rename</strong></span> <code class="option">-P</code> <em class="replaceable"><code><old_name>.patch</code></em> <em class="replaceable"><code><new_name>.patch</code></em>
+</pre><p>
+ </p></div><div class="sect4"><div class="titlepage"><div><div><h5 class="title"><a id="quilt-other"></a>Other commands</h5></div></div></div><p>
+ Please see
+ <a class="ulink" href="https://manpages.debian.org/quilt" target="_top"><span class="command"><strong>man</strong></span> <code class="literal">1</code> <code class="literal">quilt</code></a>
+ to have a comprehensive list of commands.
+ </p></div><div class="sect4"><div class="titlepage"><div><div><h5 class="title"><a id="quilt-integration"></a>Integration in the build process</h5></div></div></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Note</h3><p>
+ Please note that the <code class="literal">3.0 (quilt)</code> source version
+ uses quilt automatically, the following instructions are
+ deprecated but can be encountered in <code class="literal">oldstable</code>
+ packages.
+ </p></div><p>
+ Add in the very first part of <code class="filename">debian/rules</code>
+ (i.e. before the targets), the line:
+</p><pre class="programlisting">
+include <code class="filename">/usr/share/quilt/quilt.make</code>
+</pre><p>
+ </p><p>
+ Please use this to import patch and unpatch rules instead of
+ writing them, and remember to add the needed dependencies to
+ its targets:
+</p><pre class="programlisting">
+...
+build:patch build-stamp
+build-stamp: configure
+...
+</pre><p>
+ </p><p>
+ This kind of dependency will ensure that if you also patch the
+ build system, you get a working patched build process.
+ </p><div class="caution" style="margin-left: 0.5in; margin-right: 0.5in;"><h3 class="title">Caution</h3><p>
+ Don't also put configure as a dependency of build (leave it in
+ build-stamp): that may cause problems during parallel buildings
+ (i.e. the <code class="option">-j</code> option of make).
+ </p></div><p>
+ Now add a dependency to the clean target:
+</p><pre class="programlisting">
+...
+clean: unpatch
+...
+</pre><p>
+ </p><p>
+ If you've also patched the build system, using upstreams clean
+ target might fail. This is what you should do:
+</p><pre class="programlisting">
+...
+clean: clean-patched unpatch
+clean-patched:
+...
+</pre><p>
+ </p><p>
+ Obviously, you could always use an approach like this, but it's an
+ useless complication if you don't patch the build system, and you
+ should keep <code class="filename">debian/rules</code> the simplest you can.
+ </p></div></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="dpatch"></a>Using <span class="command"><strong>dpatch</strong></span></h4></div></div></div><p>
+ <span class="emphasis"><em>
+ Removal of <span class="command"><strong>dpatch</strong></span> is
+ <a class="ulink" href="https://lists.debian.org/878vqt6was.fsf@luthien.mhp" target="_top">planned for 2017</a>.
+ The commands below are for reference, but the use of
+ <span class="command"><strong>dpatch</strong></span> in Debian GIS is discouraged.
+ The quilt package contains a conversion script,
+ <code class="filename">/usr/share/doc/quilt/examples/dpatch2quilt.sh</code>.
+ </em></span>
+ </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p><a id="dpatch-create-patch"></a>
+ Creating a patch: <span class="command"><strong>dpatch-edit-patch</strong></span>
+ </p></li><li class="listitem"><p><a id="dpatch-apply-unapply"></a>
+ Applying and unapplying patches:
+ <span class="command"><strong>apply(-all), unapply(-all), status</strong></span>
+ </p></li><li class="listitem"><p><a id="dpatch-edit-patch"></a>
+ Editing patches: <span class="command"><strong>dpatch-edit-patch</strong></span>
+ </p></li><li class="listitem"><p><a id="dpatch-rename-patch"></a>
+ Renaming patches: is this possible?
+ </p></li><li class="listitem"><p><a id="dpatch-other"></a>
+ Other commands: please see
+ <a class="ulink" href="https://manpages.debian.org/dpatch" target="_top"><span class="command"><strong>man</strong></span> <code class="literal">1</code> <code class="literal">dpatch</code></a>
+ for a comprehensive list of commands.
+ </p></li><li class="listitem"><p><a id="dpatch-integration"></a>
+ Integration in the build process: follow the instructions for
+ quilt and adapt the path of inclusion to
+ <code class="filename">/usr/share/dpatch/dpatch.make</code>
+ </p></li></ul></div></div></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="contributing"></a>Contributing to the GIS Policy</h3></div></div></div><p>
+ As a member of the Debian GIS Team you will be able to commit modifications
+ to this policy. It would be wise to state your intentions on <a class="ulink" href="mailto:debian-gis at lists.debian.org" target="_top">debian-gis at lists.debian.org</a>
+ first, and make sure there is general agreement on the proposed changes.
+ </p><p>
+ The source for the Debian GIS Policy can be downloaded from the same repository
+ as all the GIS packages:
+</p><pre class="programlisting">
+<span class="command"><strong>debcheckout</strong></span> <code class="option">--git-track <em class="replaceable"><code>'*'</code></em></code> https://salsa.debian.org/debian-gis-team/website.git
+</pre><p>
+ </p><p>
+ To update the policy, you need to edit the <code class="filename">policy.xml</code>
+ file. The website uses the Docbook XML syntax. If you copy the style
+ used in the rest of the document, you will probably have no problems.
+ Further information about the Docbook XML syntax can be found documented
+ on the <a class="ulink" href="http://www.docbook.org/tdg/en/html/" target="_top">Docbook</a>
+ website.
+ </p><p>
+ The policy in particular makes use of <programlisting>, <command>,
+ <option> tags, and lists package names using <literal> tags.
+ </p><p>
+ The maximum length of paragraph content is 80 characters, and XML children are
+ indented with 2 spaces.
+ </p><p>
+ After making changes to the <code class="filename">policy.xml</code>
+ file it's highly recommended to run <span class="command"><strong>make</strong></span> which will validate
+ the XML syntax using xmllint before generating the HTML. Make sure you have the
+ <code class="literal">xsltproc</code>, <code class="literal">docbook-xsl</code> &
+ <code class="literal">codespell</code> packages installed for the 'make' command not to fail.
+ </p><p>
+ If there are no errors, commit your changes and push them to the Salsa
+ git repository. Alternatively, create a patch and send it to the
+ <a class="ulink" href="mailto:debian-gis at lists.debian.org" target="_top">debian-gis at lists.debian.org</a>
+ mailing list for comments.
+ </p></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="tasks.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">Blend Tasks </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div></body></html>
\ No newline at end of file
=====================================
public/policy/repositories.html
=====================================
--- /dev/null
+++ b/public/policy/repositories.html
@@ -0,0 +1,184 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Repositories</title><link rel="stylesheet" type="text/css" href="policy.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="home" href="index.html" title="Debian GIS Policy" /><link rel="up" href="index.html" title="Debian GIS Policy" /><link rel="prev" href="index.html" title="Debian GIS Policy" /><link rel="next" href="packaging.html" title="Packaging" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Repositories</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="packaging.html">Next</a></td></tr></table><hr /></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="repositories"></a>Repositories</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="repositories.html#source">Give me the source!</a></span></dt><dt><span class="sect2"><a href="repositories.html#ssh-tips">SSH tips</a></span></dt><dt><span class="sect2"><a href="repositories.html#git-repository">Git repository</a></span></dt><dd><dl><dt><span class="sect3"><a href="repositories.html#git-branches">Common Git branches</a></span></dt><dt><span class="sect3"><a href="repositories.html#other-git-branches">Other Git branches</a></span></dt><dt><span class="sect3"><a href="repositories.html#git-tags">Tags for upstream and package releases</a></span></dt><dt><span class="sect3"><a href="repositories.html#git-upstream-repositories">Upstream Git repositories</a></span></dt></dl></dd></dl></div><p>
+ We use Git repositories, hosted by Debian.
+ You can have a look at the repositories through the
+ <a class="ulink" href="https://salsa.debian.org/debian-gis-team" target="_top">web interface</a>.
+ </p><p>
+ The Git repository is the primary location for our source packages these
+ days.
+ </p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="source"></a>Give me the source!</h3></div></div></div><p>
+ To check the sources of a package (referred as
+ <em class="replaceable"><code><package></code></em> below) in our repositories,
+ use the <span class="command"><strong>debcheckout</strong></span> command, from the
+ <a class="ulink" href="https://tracker.debian.org/pkg/devscripts" target="_top">devscripts</a>
+ package.
+ </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
+ If the package is already in the archive:
+</p><pre class="programlisting">
+<span class="command"><strong>debcheckout</strong></span> <code class="option">--git-track <em class="replaceable"><code>'*'</code></em></code> <em class="replaceable"><code><package></code></em>
+</pre><p>
+ </p></li><li class="listitem"><p>
+ For draft packages that are only on Salsa:
+</p><pre class="programlisting">
+<span class="command"><strong>debcheckout</strong></span> <code class="option">--git-track <em class="replaceable"><code>'*'</code></em></code> https://salsa.debian.org/debian-gis-team/<em class="replaceable"><code><package></code></em>.git
+</pre><p>
+ </p></li></ul></div><p>
+ </p><p>
+ You can configure Git to use SSH only for <code class="literal">push</code>
+ actions, by changing the URL:
+</p><pre class="programlisting">
+<span class="command"><strong>git remote set-url</strong></span> <code class="option">--push</code> origin git at salsa.debian.org:debian-gis-team/<em class="replaceable"><code><package></code></em>.git
+</pre><p>
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="ssh-tips"></a>SSH tips</h3></div></div></div><p><a id="ssh-add"></a>
+ You can avoid typing your SSH password again and again using the
+ <span class="command"><strong>ssh-add</strong></span> command.
+ On remote connections the SSH agent needs to be enabled with the
+ command <span class="command"><strong>eval</strong></span>
+ <code class="option">$(</code><span class="command"><strong>ssh-agent</strong></span><code class="option">)</code>.
+ </p></div><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="git-repository"></a>Git repository</h3></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect3"><a href="repositories.html#git-branches">Common Git branches</a></span></dt><dt><span class="sect3"><a href="repositories.html#other-git-branches">Other Git branches</a></span></dt><dt><span class="sect3"><a href="repositories.html#git-tags">Tags for upstream and package releases</a></span></dt><dt><span class="sect3"><a href="repositories.html#git-upstream-repositories">Upstream Git repositories</a></span></dt></dl></div><p>
+ The namespace on Salsa that contains the Git repositories
+ (<code class="filename">debian-gis-team</code>)
+ uses as flat hierarchy for packages and related Debian GIS repositories.
+ </p><p>
+ There is no mandated layout for the package repositories, the following
+ layout is recommended though.
+ </p><p>
+</p><pre class="programlisting">
+debian-gis-team/
+ ├ <em class="replaceable"><code><package-A></code></em>.git
+ │ ├ master
+ │ │ ├ <em class="replaceable"><code><upstream sources></code></em>
+ │ │ └ debian/
+ │ ├ pristine-tar
+ │ └ upstream
+ ├ <em class="replaceable"><code><package-B></code></em>.git
+ │ ├ master
+ │ │ ├ <em class="replaceable"><code><upstream sources></code></em>
+ │ │ └ debian/
+ │ ├ wheezy
+ │ │ ├ <em class="replaceable"><code><upstream sources></code></em>
+ │ │ └ debian/
+ │ ├ ubuntu/quantal
+ │ │ ├ <em class="replaceable"><code><upstream sources></code></em>
+ │ │ └ debian/
+ │ ├ pristine-tar
+ │ └ upstream
+ ┆
+ └ website.git
+ └ master
+</pre><p>
+ </p><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="git-branches"></a>Common Git branches</h4></div></div></div><p>
+ Most of our packages using Git are managed
+ following the standard layout of the
+ <span class="command"><strong>git-buildpackage</strong></span> helper.
+ </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
+ The <code class="literal">master</code> branch contains the full source package.
+ </p><p>
+ Upstream sources are merged with Debian-specific changes in the
+ <code class="literal">master</code> branch, which is the usual place to work in.
+ </p></li><li class="listitem"><p>
+ The <code class="literal">pristine-tar</code> branch contains the data necessary
+ to recreate an original tarball from the repository with a
+ reproducible checksum.
+ </p><p>
+ The data needed to regenerate original source tarballs from the
+ <code class="literal">upstream</code> branch are kept with the help of the
+ <span class="command"><strong>pristine-tar</strong></span> tool in the
+ <code class="literal">pristine-tar</code> branch.
+ </p></li><li class="listitem"><p>
+ The <code class="literal">upstream</code> branch contains the upstream source,
+ after repacking when necessary (non-free files, large convenience code
+ copies, …).
+ </p><p>
+ Upstream sources are kept (in plain, uncompressed form) in the
+ <code class="literal">upstream</code> branch.
+ </p></li></ul></div></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="other-git-branches"></a>Other Git branches</h4></div></div></div><p>
+ 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">stretch</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>
+ branch already uses a newer upstream release.
+ Using dedicated branches for the older version in Debian named after
+ the release codename is recommended.
+ </p><p>
+ 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.
+ </p><p>
+ Likewise packaging for
+ <a class="link" href="packaging.html#derivatives" title="Derivatives working together with Debian GIS">other derivatives</a>
+ can be maintained in the Debian GIS git repository in derivative
+ specific branches.
+ OSGeo-Live for example can use branches such as
+ <code class="literal">osgeo/9.5</code>,
+ <code class="literal">osgeo/10.0</code>, etc.
+ </p><p>
+ Using UbuntuGIS and derivative release specific branches assist
+ collaboration between Debian GIS and the UbuntuGIS and derivative
+ teams.
+ Changes from Debian or Ubuntu can be merged or cherry picked from
+ their respective branches without needing to obtain the source
+ packages to manually merge the changes from.
+ </p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="git-tags"></a>Tags for upstream and package releases</h4></div></div></div><p>
+ The tagging convention used for upstream and package releases
+ follows the defaults of <span class="command"><strong>git-buildpackage</strong></span>.
+ </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
+ <code class="literal">upstream/<em class="replaceable"><code><upstreamversion></code></em></code>
+ for upstream releases, e.g.
+ <code class="literal">upstream/1.2.0</code>
+ </p></li><li class="listitem"><p>
+ <code class="literal">debian/<em class="replaceable"><code><debianversion></code></em></code>
+ for Debian releases, e.g.
+ <code class="literal">debian/1.2.0-1</code>
+ </p></li></ul></div><p>
+ Tags for package releases targeting derivative distributions use
+ a distribution specific prefix followed by the package version
+ separated by a <code class="literal">/</code> character:
+ </p><p>
+ <code class="literal"><em class="replaceable"><code><distribution></code></em>/<em class="replaceable"><code><package_version></code></em></code>
+ </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>
+ for UbuntuGIS backports based on the Debian GIS packaging, e.g.
+ <code class="literal">ubuntu/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.
+ <code class="literal">osgeo/1.2.0-1~xenial1</code>
+ </p></li></ul></div><p>
+ </p></div><div class="sect3"><div class="titlepage"><div><div><h4 class="title"><a id="git-upstream-repositories"></a>Upstream Git repositories</h4></div></div></div><p>
+ For some projects, like the ones hosted on
+ <a class="ulink" href="https://github.com" target="_top">GitHub</a> or
+ <a class="ulink" href="https://gitlab.com" target="_top">GitLab</a>,
+ it may be easier to forward changes made in the Debian package
+ if this one is itself mirrored on the same platform, as a clone.
+ In that case, the layouts may vary from package to package,
+ and the branch that contains the Debian work will probably not be
+ the master one. If it is not the
+ <a class="link" href="packaging.html#git-change-default-branch" title="To change the default branch">default branch</a>,
+ it must be indicated in the <a class="link" href="policy.html#vcs-url" title="Vcs-Git and Vcs-Browser">VCS URL</a>
+ with the <code class="option">-b</code> option.
+ </p><p>
+ Even when you are not using <span class="command"><strong>git-buildpackage</strong></span>,
+ please include a
+ <a class="link" href="policy.html#debian-gbp.conf" title="debian/gbp.conf"><code class="filename">debian/gbp.conf</code></a>,
+ to document the layout of the repository.
+ </p><p>
+ When working with upstream Git repositories, it's convenient to have
+ the upstream repository configured as a Git remote called
+ <code class="literal">upstream</code>.
+ Fetching the upstream commit history into the package repository
+ allows among others per commit reviews of new upstream releases,
+ and reading extended commit messages.
+ </p><p>
+ When the upstream Git repository is not configured as a remote in the
+ Debian GIS Git repository on Salsa, you may not want to push the
+ upstream tags, because the referenced commits only exist in the
+ upstream Git repository.
+ </p></div></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="packaging.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Debian GIS Policy </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Packaging</td></tr></table></div></body></html>
\ No newline at end of file
=====================================
public/policy/tasks.html
=====================================
--- /dev/null
+++ b/public/policy/tasks.html
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Blend Tasks</title><link rel="stylesheet" type="text/css" href="policy.css" /><meta name="generator" content="DocBook XSL Stylesheets V1.79.1" /><link rel="home" href="index.html" title="Debian GIS Policy" /><link rel="up" href="index.html" title="Debian GIS Policy" /><link rel="prev" href="packaging.html" title="Packaging" /><link rel="next" href="policy.html" title="Policy" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Blend Tasks</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="packaging.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="policy.html">Next</a></td></tr></table><hr /></div><div class="sect1"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="tasks"></a>Blend Tasks</h2></div></div></div><div class="toc"><dl class="toc"><dt><span class="sect2"><a href="tasks.html#installing-tasks">Installing Debian GIS Blend tasks</a></span></dt></dl></div><p>
+ The Debian GIS
+ <a class="ulink" href="https://blends.debian.org/blends" target="_top">Debian Pure Blend</a>
+ is organized by
+ <a class="ulink" href="https://blends.debian.org/gis/tasks/index" target="_top">tasks</a>,
+ that group packages around broad themes such as
+ <a class="ulink" href="https://blends.debian.org/gis/tasks/web" target="_top">web services</a>
+ and
+ <a class="ulink" href="https://blends.debian.org/gis/tasks/workstation" target="_top">workstation</a>.
+ The tasks list programs that are already packaged in Debian as well as
+ packages in preparation.
+ </p><p>
+ The tasks files are not hosted in the Debian GIS repositories, but in the
+ <a class="ulink" href="https://anonscm.debian.org/cgit/blends/projects/gis.git" target="_top">Debian Blends repository</a>.
+ Interested members of the Debian GIS project on Alioth can
+ <a class="ulink" href="https://alioth.debian.org/project/request.php?group_id=100278" target="_top">request commit access</a>
+ to the Blends repository.
+ You can easily check out its sources with the command:
+</p><pre class="programlisting">
+<span class="command"><strong>debcheckout</strong></span> <code class="option">-a</code> debian-gis
+</pre><p>
+ </p><p>
+ The syntax of the tasks files is very similar to Debian control files,
+ and described on the
+ <a class="ulink" href="https://blends.debian.org/blends/ch08.html" target="_top">Debian Blends website</a>.
+ </p><div class="sect2"><div class="titlepage"><div><div><h3 class="title"><a id="installing-tasks"></a>Installing Debian GIS Blend tasks</h3></div></div></div><p>
+ The Debian GIS Blend metapackages can be installed on a normal Debian
+ installation. How this can be achieved depends on which version of
+ Debian you are running. On Debian Wheezy, there is the
+ <code class="literal">gis-tasks</code> package which adds the Debian GIS package
+ groups to <span class="command"><strong>tasksel</strong></span>. After installing the
+ <code class="literal">gis-tasks</code> package you can run
+ <span class="command"><strong>tasksel</strong></span> and select the package groups to install.
+ Run as root:
+</p><pre class="programlisting">
+<span class="command"><strong>apt-get install</strong></span> gis-tasks
+<span class="command"><strong>tasksel</strong></span>
+</pre><p>
+ On Debian Jessie, you can do the same. Or, you can also install one of
+ the metapackages directly. Again, as root:
+</p><pre class="programlisting">
+<span class="command"><strong>apt-get install</strong></span> <em class="replaceable"><code><metapackage></code></em>
+</pre><p>
+ </p><p>
+ These are the metapackages/tasks can that be installed using this method,
+ and the links to information about the included packages:
+ </p><div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "><li class="listitem"><p>
+ gis-data - <a class="ulink" href="https://blends.debian.org/gis/tasks/data" target="_top">Debian GIS data</a>
+ </p></li><li class="listitem"><p>
+ gis-gps - <a class="ulink" href="https://blends.debian.org/gis/tasks/gps" target="_top">GPS related programs</a>
+ </p></li><li class="listitem"><p>
+ gis-osm - <a class="ulink" href="https://blends.debian.org/gis/tasks/osm" target="_top">OpenStreetMap related programs</a>
+ </p></li><li class="listitem"><p>
+ gis-remotesensing - <a class="ulink" href="https://blends.debian.org/gis/tasks/remotesensing" target="_top">Remote sensing and earth observation</a>
+ </p></li><li class="listitem"><p>
+ gis-statistics - <a class="ulink" href="https://blends.debian.org/gis/tasks/statistics" target="_top">Statistics with geographic data</a>
+ </p></li><li class="listitem"><p>
+ gis-web - <a class="ulink" href="https://blends.debian.org/gis/tasks/web" target="_top">Present geographic information via web mapserver</a>
+ </p></li><li class="listitem"><p>
+ gis-workstation - <a class="ulink" href="https://blends.debian.org/gis/tasks/workstation" target="_top">Geographic Information Systems (GIS) workstation</a>
+ </p></li><li class="listitem"><p>
+ gis-devel - <a class="ulink" href="https://blends.debian.org/gis/tasks/devel" target="_top">GIS development packages</a>
+ </p></li></ul></div><p>
+ On a normal computer desktop, you will most likely want to install at least
+ the workstation task which contains most commonly used GIS applications.
+ </p></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="packaging.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="policy.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Packaging </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Policy</td></tr></table></div></body></html>
\ No newline at end of file
=====================================
readme.txt → public/readme.txt
=====================================
View it on GitLab: https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/compare/025a5a3a5d3b2e12aea636a82e7d0477db8a4995...9fec63d2ccca3eb8f952a18973db7af8330a9d6d
---
View it on GitLab: https://salsa.debian.org/debian-gis-team/debian-gis-team.pages.debian.net/compare/025a5a3a5d3b2e12aea636a82e7d0477db8a4995...9fec63d2ccca3eb8f952a18973db7af8330a9d6d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-grass-devel/attachments/20180212/5f84c349/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list