[policy] 01/02: Update of the debian science policy
Sylvestre Ledru
sylvestre at alioth.debian.org
Wed Sep 11 17:17:34 UTC 2013
This is an automated email from the git hooks/post-receive script.
sylvestre pushed a commit to branch master
in repository policy.
commit 18c7842f8ed7720454da46761cc5c57df2e2dcf9
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date: Mon Jul 16 10:27:22 2012 +0200
Update of the debian science policy
---
debian-science-policy.xml | 44 +++++++++-----------------------------------
1 file changed, 9 insertions(+), 35 deletions(-)
diff --git a/debian-science-policy.xml b/debian-science-policy.xml
index 0b092e9..6c195bd 100644
--- a/debian-science-policy.xml
+++ b/debian-science-policy.xml
@@ -18,18 +18,15 @@
<email>sylvestre at debian.org</email>
</author>
</authorgroup>
- <releaseinfo>THIS IS AN INITIAL DRAFT!</releaseinfo>
-<!-- Not needed yet; looks quite ugly anyway
<revhistory>
<revision>
- <revnumber>0.2</revnumber>
- <date>2011-05-13</date>
- <authorinitials>mp</authorinitials>
- <revremark>Initial draft</revremark>
+ <revnumber>1.0</revnumber>
+ <date>2012-07-15</date>
+ <authorinitials>SL</authorinitials>
+ <revremark>DM-Upload should not be enabled by default.
+ CDBS is no longer recommended. Debian source package formats 3.0 is now mandatory.</revremark>
</revision>
</revhistory>
--->
-<!-- FIXME We need to set a license -->
</bookinfo>
<preface>
<title>Introduction</title>
@@ -78,11 +75,6 @@
<title><varname>Homepage</varname> Field</title>
<para>If an upstream homepage exists, the <varname>Homepage</varname> field should be set to the upstream homepage URL.</para>
</sect3>
- <sect3>
- <title><varname>DM-Upload-Allowed</varname> Field</title>
- <para>The <varname>DM-Upload-Allowed</varname> should be included and set to "yes".</para>
- <para>This allows Debian Maintainers to upload new versions of the package if their name is listed in the <varname>Uploaders</varname> field.</para>
- </sect3>
</sect2>
<sect2>
<title><filename>debian/copyright</filename></title>
@@ -105,7 +97,6 @@ Priority: extra
Homepage: http://foo.example.org/
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Your Name <your.name at debian.org>
-DM-Upload-Allowed: yes
Vcs-Git: git://git.debian.org/git/debian-science/packages/foo.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/foo.git
</screen>
@@ -171,7 +162,6 @@ debian-science/
+- ...
</screen>
<para>Package Repositories have to be placed in the <filename>packages/</filename> sub-directory. They should follow the guidelines in the Package Repositories section.</para>
- <!-- FIXME add link -->
</sect2>
<sect2>
<title>Package Repositories</title>
@@ -192,7 +182,6 @@ debian-science/
<title>Tags</title>
<para>All imports of source tar-balls or upstream releases (if tracked in the Package Repository) should be tagged as "upstream/${VERSION}". For example, the 1.2.3 release of a package should have a tag "upstream/1.2.3".</para>
<para>Accordingly, all Debian releases of a package should be tagged "debian/${DEB-VERSION}". For example, the second Debian release of the example package in the last paragraph should have a tag "debian/1.2.3-2".</para>
- <!-- FIXME sign tags? -->
</sect3>
<sect3>
<title>Commit Messages</title>
@@ -212,12 +201,11 @@ $ chmod 0775 hooks/post-receive
<sect1>
<title>Build Systems</title>
<para>Package maintainers are free to use any build system for packaging (or none at all).</para>
- <para><ulink url="http://packages.debian.org/cdbs">CDBS</ulink> is preferred if the package has a build system that is well supported by CDBS.</para>
<para><ulink url="http://packages.debian.org/debhelper">Debhelper</ulink> is recommend for more complicated packaging.</para>
</sect1>
<sect1>
<title>Patch Systems</title>
- <para>Package maintainers are free to use any patch system for packaging but <ulink url="http://packages.debian.org/quilt">quilt</ulink> is preferred.</para>
+ <para><ulink url="http://packages.debian.org/quilt">quilt</ulink> and <ulink url="http://wiki.debian.org/Projects/DebSrc3.0">Debian Source Format 3</ulink> must be.</para>
<para>If a package is stored in a Package Repository a patch system is not needed technically but the maintainer is free to use one nevertheless.</para>
</sect1>
<sect1>
@@ -234,7 +222,6 @@ $ chmod 0775 hooks/post-receive
User: debian-science at lists.debian.org
Usertags: field..THE_FIELD_OF_YOUR_PACKAGE
]]></screen>
-XXX FIXME TODO XXX: Maybe we should use user wnpp at packages.debian.org as described by http://wiki.debian.org/WNPPBugsTagging or possibly both? XXX FIXME TODO XXX
</para>
</sect2>
<sect2>
@@ -304,20 +291,16 @@ svn://svn.debian.org/blends/projects/science/trunk/debian-science">Debian Scienc
</sect1>
<sect1>
<title>Wiki</title>
- <para>FIXME</para>
+ <para>A <ulink url="http://wiki.debian.org/DebianScience/">http://wiki.debian.org/DebianScience/</ulink></para>
</sect1>
</chapter>
-<chapter>
- <title>Maintenance of This Document</title>
- <para>FIXME needs discussion</para>
-</chapter>
<appendix>
<title>Help on Packaging</title>
<para>The following sections are not part of the &DebSci; Policy Manual. They should provide useful information for contributors who are not familiar with the tools mentioned in this document.</para>
<sect1>
<title>Packaging with Git</title>
<para>This section will give you guide on packaging Debian packages with Git. Since Git is a very flexible tool, you can (and should!) adopt it to fit your work-flow best. "There is more than one way to do it", as the saying goes, so this document can not show all of them. It's supposed to help you if you are unfamiliar with using Git for packaging work. It is, however, not supposed to be a normative document that everyone has to follow.</para>
-
+
<sect2>
<title>Creating a Repository</title>
<para>Git repositories are nothing more than a directory with a special directory storing meta-data, named <filename>.git/</filename>. Creating and configuring the repository is pretty straight-forward:</para>
@@ -360,10 +343,6 @@ upstream/1.0
]]></screen>
<para>You can use git-import-orig for every new upstream tar-ball. It will extract the sources to the upstream branch and merge them back to the master branch.</para>
</sect3>
- <sect3>
- <title>Importing Upstream VCS Data</title>
- <para>FIXME</para>
- </sect3>
</sect2>
<sect2>
<title>Changes To The Upstream Sources</title>
@@ -378,11 +357,6 @@ upstream/1.0
$ git checkout -b bug-123456 upstream/1.0
]]></screen>
<para>You can now start fixing the bug inside this branch and commit the changes. For every change to the upstream sources, create a new branch and do your fixes in that until you're done. In the last step, it is time to merge the changes back to the integration branch.</para>
- <para>FIXME: long-living or temporary integration branch? separate integration branch or master?</para>
- </sect3>
- <sect3>
- <title>Using A Patch System</title>
- <para>FIXME</para>
</sect3>
</sect2>
<sect2>
@@ -399,7 +373,7 @@ $ git --bare init --shared=all
$ chmod 0775 hooks/post-update
]]></screen>
<note><para>It is not recommended to use Git over HTTP but it may be handy for people behind a firewall.</para></note>
- <para>You should also create a hook to send out commit emails to the commits mailing list. FIXME reference</para>
+ <para>You should also create a hook to send out commit emails to the commits mailing list.</para>
<para>The next step only applies if you do not use the "master" branch for storing you debian work. In this case, the HEAD reference in the repository has to be set to point to the branch you are going to push to the repository, or cloning will fail. Assuming your Debian-specific changes are stored in a branch called "debian", do:</para>
<screen><![CDATA[
$ echo 'ref: refs/heads/debian' > HEAD
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/policy.git
More information about the debian-science-commits
mailing list