[SCM] Debian Science Policy Manual branch, master, updated. 2dc44cb58f6ae77de426ff440f6f9c1f3d541d18

Sylvestre Ledru sylvestre.ledru at inria.fr
Fri Jul 17 16:52:07 UTC 2009


hu ?

Could you reverse your commit please ?

S


Le vendredi 17 juillet 2009 à 16:51 +0000, أحÙ
د الÙ
Ø­Ù
ودي
(Ahmed El-Mahmoudy) a écrit :
> The following commit has been merged in the master branch:
> commit 2dc44cb58f6ae77de426ff440f6f9c1f3d541d18
> Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
> Date:   Fri Jul 17 18:47:11 2009 +0300
> 
>     First draft of Debian Islamic policy manual, basing it on Debian Science
>     policy manual.
> 
> diff --git a/Makefile b/Makefile
> index 5a96a49..5460311 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1,8 +1,8 @@
>  all: xhtml
>  
> -xhtml: html/debian-science-policy.html
> +xhtml: html/debian-islamic-policy.html
>  
> -html/debian-science-policy.html: debian-science-policy.xml
> +html/debian-islamic-policy.html: debian-islamic-policy.xml
>  	mkdir -p html
>  	xmlto -o html/ xhtml-nochunks $<
>  
> diff --git a/debian-science-policy.xml b/debian-islamic-policy.xml
> similarity index 75%
> rename from debian-science-policy.xml
> rename to debian-islamic-policy.xml
> index acb9a66..c816cf4 100644
> --- a/debian-science-policy.xml
> +++ b/debian-islamic-policy.xml
> @@ -2,13 +2,18 @@
>  <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
>    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
>  <!-- Entities for common use of terms in the document -->
> -<!ENTITY DebSci "Debian Science">
> +<!ENTITY DebIslam "Debian Islamic">
>  <!ENTITY Alioth '<ulink url="http://alioth.debian.org/">Alioth</ulink>'>
>  ]>
>  <book>
>  <bookinfo>
> -  <title>&DebSci; Policy Manual</title>
> -  <authorgroup>
> +  <title>&DebIslam; Policy Manual</title>
> +    <author>
> +      <firstname>Ahmed</firstname><surname>El-Mahmoudy</surname>
> +      <email>aelmahmoudy at users.sourceforge.net</email>
> +    </author>
> +  <othercredit>
> +    <contrib>This document is based on the Debian Science policy manual</contrib>
>      <author>
>        <firstname>Manuel</firstname><surname>Prinz</surname>
>        <email>debian at pinguinkiste.de</email>
> @@ -17,7 +22,7 @@
>        <firstname>Sylvestre</firstname><surname>Ledru</surname>
>        <email>sylvestre.ledru at inria.fr</email>
>      </author>
> -  </authorgroup>
> +  </othercredit>
>    <releaseinfo>THIS IS AN INITIAL DRAFT!</releaseinfo>
>  <!-- Not needed yet; looks quite ugly anyway
>    <revhistory>
> @@ -29,29 +34,28 @@
>      </revision>
>    </revhistory>
>  -->
> -<!-- FIXME We need to set a license -->
> +<!-- FIXME need to set a license -->
>  </bookinfo>
>  <preface>
>    <title>Introduction</title>
>    <sect1>
> -    <title>About &DebSci;</title>
> -    <para>The main goal of the &DebSci; project is to provide a system with all the most important free scientific software in each scientific field.</para>
> -    <para>&DebSci; will also manage the debian-science's metapackages.</para>
> +    <title>About &DebIslam;</title>
> +    <para>The main goal of the &DebIslam; project is to provide a system with all the most important Islamic software in each scientific field.</para>
> +<!--  FIXME Shall there be metapackages ?  -->
>    </sect1>
>    <sect1>
>      <title>How to Contribute</title>
> -    <para>A <ulink url="http://cdd.alioth.debian.org/science/tasks/">list of packages</ulink> has been created using CDD (Custom Debian Distribution). This website contains a long list of software packages in Debian and yet to be packaged. You can help by packaging them in coordination with the &DebSci;.</para>
> -    <para>In the meantime, you can also help us by updating the debian-science's metapackages.</para>
> +    <para>A <ulink url="http://cdd.alioth.debian.org/science/tasks/">list of packages</ulink> has been created using CDD (Custom Debian Distribution). This website contains a long list of software packages in Debian and yet to be packaged. You can help by packaging them in coordination with &DebIslam;.</para>
>    </sect1>
>    <sect1>
>      <title>Becoming a Member</title>
>      <para>Before becoming a member you need to have on account on &Alioth;. If you do not have an account already, you can <ulink url="http://alioth.debian.org/account/register.php">register</ulink> one.</para>
> -    <para>To request membership, login to &Alioth; and use the <ulink url="http://alioth.debian.org/project/request.php?group_id=100159">"Request to join"</ulink> link on our <ulink url="http://alioth.debian.org/projects/debian-science/">&DebSci; Alioth page</ulink>. Your application will be processed quickly.</para>
> +    <para>To request membership, login to &Alioth; and use the <ulink url="http://alioth.debian.org/project/request.php?group_id=100387">"Request to join"</ulink> link on our <ulink url="http://alioth.debian.org/projects/debian-islamic/">&DebIslam; Alioth page</ulink>. Your application will be processed quickly, insh'Allah.</para>
>    </sect1>
>  </preface>
>  <chapter>
>    <title>Packaging Policy</title>
> -  <para>This Packaging Policy describes the packaging rules that packages maintained by the &DebSci; Project should follow. The aim is to define a common set of rules to make maintenance easier for everyone involved in the project.</para>
> +  <para>This Packaging Policy describes the packaging rules that packages maintained by the &DebIslam; Project should follow. The aim is to define a common set of rules to make maintenance easier for everyone involved in the project.</para>
>    <para>It is not normative as the Debian Policy. If rules or suggestions in this document conflict with the Debian Policy it is a bug in this document.</para>
>    <sect1>
>      <title>Debian Control Files</title>
> @@ -59,30 +63,26 @@
>      <sect2>
>        <title><filename>debian/control</filename></title>
>        <sect3>
> -	<title><varname>Section</varname> and <filename>Priority</filename> Fields</title>
> -	<para>The <varname>Section</varname> field of the source package should be set to "science", unless a more specific section such as "math" is applicable.</para>
> -	<para>The <varname>Priority</varname> field should be set to "extra" if this is permitted by the Debian Policy, or set to "optional" otherwise.</para>
> -      </sect3>
> -      <sect3>
>  	<title><varname>Maintainer</varname> and <varname>Uploaders</varname> Fields</title>
> -	<para>The <varname>Maintainer</varname> field should be "Debian Science Maintainers <email>debian-science-maintainers at lists.alioth.debian.org</email>".</para>
> -	<para>You should also add yourself to the <varname>Uploaders</varname> field. Doing so shows your involvement and interest in the package. Developers listed in <varname>Uploaders</varname> will take care of maintenance, bug reports and other QA work, helped by the &DebSci; team.</para>
> +	<para>The <varname>Maintainer</varname> field should be "Debian Islamic Maintainers <email>debian-islamic-maintainers at lists.alioth.debian.org</email>".</para>
> +	<para>You should also add yourself to the <varname>Uploaders</varname> field. Doing so shows your involvement and interest in the package. Developers listed in <varname>Uploaders</varname> will take care of maintenance, bug reports and other QA work, helped by the &DebIslam; team.</para>
>        </sect3>
>        <sect3>
>  	<title><varname>Vcs-Git</varname> and <varname>Vcs-Browser</varname> Fields</title>
> -	<para>If you have your package under version control in the &DebSci; Repository, you must set the <varname>Vcs-Git</varname> and <varname>Vcs-Browser</varname> fields.</para>
> -	<para>The <varname>Vcs-Git</varname> field should contain the package repository URL, namely "git://git.debian.org/git/debian-science/packages/YourPackage.git".</para>
> -	<para>The <varname>Vcs-Browser</varname> field should point to the web view of your package repository, namely "http://git.debian.org/?p=debian-science/packages/YourPackage.git".</para>
> +	<para>If you have your package under version control in the &DebIslam; Repository, you must set the <varname>Vcs-Git</varname> and <varname>Vcs-Browser</varname> fields.</para>
> +	<para>The <varname>Vcs-Git</varname> field should contain the package repository URL, namely "git://git.debian.org/git/debian-islamic/packages/YourPackage.git".</para>
> +	<para>The <varname>Vcs-Browser</varname> field should point to the web view of your package repository, namely "http://git.debian.org/?p=debian-islamic/packages/YourPackage.git".</para>
>        </sect3>
>        <sect3>
>  	<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>
> +<!--	FIXME: will we use DM-Upload-Allowed ?
>        <sect3>
> -	<title><varname>DM-Upload-Allowed</varname> Field</title>
> +  <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>
> +      </sect3> -->
>      </sect2>
>      <sect2>
>        <title><filename>debian/copyright</filename></title>
> @@ -103,11 +103,10 @@ Source: foo
>  Section: science
>  Priority: extra
>  Homepage: http://foo.example.org/
> -Maintainer: Debian Science Maintainers &lt;debian-science-maintainers at lists.alioth.debian.org&gt;
> +Maintainer: Debian Islamic Maintainers &lt;debian-islamic-maintainers at lists.alioth.debian.org&gt;
>  Uploaders: Your Name &lt;your.name at debian.org&gt;
> -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
> +Vcs-Git: git://git.debian.org/git/debian-islamic/packages/foo.git
> +Vcs-Browser: http://git.debian.org/?p=debian-islamic/packages/foo.git
>  </screen>
>        </example>
>        <example>
> @@ -149,17 +148,17 @@ can be found in /usr/share/common-licenses/GPL.
>  
>    <sect1>
>      <title>Version Control</title>
> -    <para>The &DebSci; Project has agreed to use <ulink url="http://git.or.cz/">Git</ulink> as their preferred Version Control System (VCS).</para>
> +    <para>The &DebIslam; Project has agreed to use <ulink url="http://git.or.cz/">Git</ulink> as their preferred Version Control System (VCS).</para>
>      <para>Because of Git's nature, each package exists in its own repository. The term "repository" is also used for the location where all packages are stored. It is used in the following sections as defined below:</para>
>      <para><emphasis>Git Repository</emphasis> means a (bare) Git repository, containing history information.</para>
>      <para><emphasis>Package Repository</emphasis> means a Git Repository that stores packaging information.</para>
> -    <para><emphasis>&DebSci; Repository</emphasis> means the location where all package repositories are stored.</para>
> +    <para><emphasis>&DebIslam; Repository</emphasis> means the location where all package repositories are stored.</para>
>      <sect2>
> -      <title>The &DebSci; Repository</title>
> -      <para>The &DebSci; Repository is located on &Alioth; in the directory <filename>/git/debian-science/</filename>. All group members have write access to the directory.</para>
> -      <para>The &DebSci; Repository is structured by a directory hierarchy containing several Git Repositories and other directories. It is structured like this:</para>
> +      <title>The &DebIslam; Repository</title>
> +      <para>The &DebIslam; Repository is located on &Alioth; in the directory <filename>/git/debian-islamic/</filename>. All group members have write access to the directory.</para>
> +      <para>The &DebIslam; Repository is structured by a directory hierarchy containing several Git Repositories and other directories. It is structured like this:</para>
>  <screen>
> -debian-science/
> +debian-islamic/
>  +- homepage(.git?)
>  +- packages/
>     +- bar.git
> @@ -178,7 +177,7 @@ debian-science/
>        <para>The following sections explain the preferred Package Repository layout.</para>
>        <sect3>
>  	<title>Repository Layout and Structure</title>
> -	<para>Each Package Repository has to be stored as bare Git Repository inside the <filename>packages/</filename> sub-directory of the &DebSci; Repository.</para>
> +	<para>Each Package Repository has to be stored as bare Git Repository inside the <filename>packages/</filename> sub-directory of the &DebIslam; Repository.</para>
>  	<para>The Package Repository name has to be the name of the source package followed by a ".git" extension. A source package named "foo" is therefore stored in a Package Repository named "foo.git".</para>
>        </sect3>
>        <sect3>
> @@ -196,10 +195,10 @@ debian-science/
>        </sect3>
>        <sect3>
>  	<title>Commit Messages</title>
> -	<para>Each Package Repository should add a commit hook that sends commit messages to the <email>debian-science-commits at lists.alioth.debian.org</email> mailing list.</para>
> +	<para>Each Package Repository should add a commit hook that sends commit messages to the <email>debian-islamic-commits at lists.alioth.debian.org</email> mailing list.</para>
>  	<para>The recommended way is to use the <command>git-commit-notice</command> script on Alioth. To setup the hook, login to Alioth and change into your Package Repository directory. There you can execute:</para>
>  	<screen><![CDATA[
> -$ git config --add hooks.mailinglist "debian-science-commits at lists.alioth.debian.org"
> +$ git config --add hooks.mailinglist "debian-islamic-commits at lists.alioth.debian.org"
>  $ cat >hooks/post-receive <<END
>  #!/bin/sh
>  exec /usr/local/bin/git-commit-notice
> @@ -220,18 +219,14 @@ $ chmod 0775 hooks/post-receive
>      <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>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>
> -	<title>Metapackages</title>
> -	<para>Since &DebSci; is also managing the Debian-Science metapackages. Consequently, please update the appropriate metapackage with your new package (more information below).</para>
> -	</sect1>
>    <sect1>
>      <title>ITP/RFP reports</title>
>  	  <sect2>
>  	    <title>Intend To Package (ITP)</title>
> -		    <para>When a Debian Science Maintainer is sending an ITP to the BTS, <email>debian-science-maintainers at lists.alioth.debian.org</email> should one of the receiver of this ITP. Therefore, members of the team will be informed of the on-going work and could provide help.</para>
> +		    <para>When a Debian Islamic Maintainer is sending an ITP to the BTS, <email>debian-islamic-maintainers at lists.alioth.debian.org</email> should one of the receiver of this ITP. Therefore, members of the team will be informed of the on-going work and could provide help.</para>
>  		    <para>Also please include the pseudo-headers:
>  	<screen><![CDATA[
> -User: debian-science at lists.debian.org
> +User: debian-islamic 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
> @@ -239,66 +234,27 @@ XXX FIXME TODO XXX: Maybe we should use user wnpp at packages.debian.org as describ
>  	</sect2>
>  	<sect2>
>  		<title>Request For Packaging (RFP)</title>
> -		<para>If a RFP of a scientific software is sent to the BTS, this one could be assigned to the team and added to the CDD package list.</para>
> +		<para>If a RFP of a scientific software is sent to the BTS, this one could be assigned to the team and added to the our package list.</para>
>  	</sect2>
>    </sect1>
>  </chapter>
>  <chapter>
> -  <title>Management of the Debian-Science metapackages</title>
> -	  <para>&DebSci; is also in charge of the Debian-Science metapackages. These packages provide an easy way for a lambda user to get packages in a specific scientific fields.</para>
> -	<sect1><title>Science related metapackages</title>
> -	<para>The science related metapackages are:
> -	<itemizedlist mark="bullet">
> -		<listitem><para>science-astronomy   packages related to astronomy</para></listitem>
> -		<listitem><para>science-biology   packages related to biology</para></listitem>
> -	  <listitem><para>science-biology     packages related to biology</para></listitem>
> -	  <listitem><para>science-chemistry   packages related to chemistry</para></listitem>
> -	  <listitem><para>science-electronics packages related to electronics</para></listitem>
> -	  <listitem><para>science-geography   packages related to geography</para></listitem>
> -	  <listitem><para>science-linguistics packages related to linguistics</para></listitem>
> -	  <listitem><para>science-mathematics packages related to mathematics</para></listitem>
> -	  <listitem><para>science-physics     packages related to physics</para></listitem>
> -	  <listitem><para>science-robotics    packages related to robotics</para></listitem>
> -	</itemizedlist>
> -
> -	</para>
> -	</sect1>
> -	<sect1><title>Common utilities for all sciences metapackages</title>
> -
> -	<para>Common utilities for all sciences metapackages are:
> -	<itemizedlist mark="bullet">
> -  <listitem><para>science-statistics  packages related to statistics</para></listitem>
> -  <listitem><para>science-typesetting packages related to typesetting</para></listitem>
> -  <listitem><para>science-viewing     packages related to viewing</para></listitem>
> -	</itemizedlist>
> -</para>
> -	</sect1>
> -	<sect1>
> -	<title>How to manage this list</title>
> -	<sect2>
> -		<title>Technically</title>
> -		<para>For technical reasons, these files are stored in the <ulink url="svn://svn.debian.org/cdd/projects/science/trunk/debian-science">CDD's VCS</ulink>.</para>
> -	<para>Checkout the source tree and edit /tasks/* files. These files contain the list of the packages which will be added to the metapackages.</para>
> -	<para>Note that it is also possible to add packages which are not in the Debian archive. These packages will appear on the <ulink url="http://cdd.alioth.debian.org/science/tasks/">CDD task list</ulink>.</para>
> -	</sect2>
> -	</sect1>
> -</chapter>
> -<chapter>
>  <title>Communication vectors</title>
>    <sect1>
>      <title>Mailing Lists</title>
> -    <para>This section briefly explains the purpose of the mailing lists that are under the scope of &DebSci;.</para>
> +    <para>This section briefly explains the purpose of the mailing lists that are under the scope of &DebIslam;.</para>
> +<!-- FIXME: do we need a user list ?
>      <sect2>
>        <title>User List</title>
>        <para>The <email>debian-science at lists.debian.org</email> mailing list should be considered a user (support) list.</para>
> -    </sect2>
> +    </sect2> -->
>      <sect2>
>        <title>Maintainer List</title>
> -      <para>The <email>debian-science-maintainers at lists.alioth.debian.org</email> mailing list should be used for all packaging related issues, such as packaging questions and BTS messages.</para>
> +      <para>The <email>debian-islamic-maintainers at lists.alioth.debian.org</email> mailing list should be used for all packaging related issues, such as packaging questions and BTS messages.</para>
>      </sect2>
>      <sect2>
>        <title>Commit List</title>
> -      <para>The <email>debian-science-commits at lists.alioth.debian.org</email> mailing lists should collect all commit messages from commits to the Package Repositories. All Packages Repositories should have a commit hook that sends commit messages to this list.</para>
> +      <para>The <email>debian-islamic-commits at lists.alioth.debian.org</email> mailing lists should collect all commit messages from commits to the Package Repositories. All Packages Repositories should have a commit hook that sends commit messages to this list.</para>
>      </sect2>
>    </sect1>
>    <sect1>
> @@ -312,7 +268,7 @@ XXX FIXME TODO XXX: Maybe we should use user wnpp at packages.debian.org as describ
>  </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>
> +  <para>The following sections are not part of the &DebIslam; 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>
> @@ -386,7 +342,7 @@ $ git checkout -b bug-123456 upstream/1.0
>      </sect2>
>      <sect2>
>        <title>Publishing Your Repository</title>
> -      <para>This section will explain how to publish a repository in the &DebSci; scope but should be easy to adopt for other teams or locations.</para>
> +      <para>This section will explain how to publish a repository in the &DebIslam; scope but should be easy to adopt for other teams or locations.</para>
>        <para>First, login to &Alioth; and create a new shared bare repository:</para>
>        <screen><![CDATA[
>  $ cd /git/debian-science/packages/
> 




More information about the debian-science-maintainers mailing list