Hi, Please find attach my current diff, including the current proposition, with a grammar correction, thanks to bremner (OP on IRC). Note that it may be a bit redundant with the license explanation already stated before [0].
[0] http://www.debian.org/doc/maint-guide/ch-first.en.html#s-choose Osamu, is it OK to apply this patch as is, it also include a s/must/should/ in order to comply with the Policy (about manpages) ? David B. also note that "I think that both devref and maint-guide use the word "section" in a way not completely consistent with policy, but this is less important I guess." I think he is right and that "area" should be better in order to comply with the Policy. Osamu, do you think it worth to be fixed ? If so, I'm willing to give it a try. Cheers David
--- . (révision 7410) +++ . (copie de travail) @@ -442,7 +442,7 @@ <tt>main</tt></strong> for compilation or execution as required by the Debian Policy. This is desired case.</item> <item>For the <tt>contrib</tt> section, it must be compliant - to all the DSFG but it may require a package outside of main for compilation + to all the DSFG but it may require a package outside of <tt>main</tt> for compilation or execution.</item> <item>For the <tt>non-free</tt> section, it may not be compliant to some of the DSFG but it <strong>must be @@ -1079,9 +1079,13 @@ <p>Line 2 is the section of the distribution the source package goes into. - <p>As you may have noticed, Debian is divided in sections: <tt>main</tt> (the free + <p>You can use one of the three following sections: <tt>main</tt> (the free software), <tt>non-free</tt> (the not really free software) and <tt>contrib</tt> (free - software that depends on non-free software). Under those, there are + software that depends on non-free software). The <tt>main</tt> section is + what makes up the official Debian GNU/Linux distribution. The other two + sections do not comply with the + <url name="DFSG" id="http://www.debian.org/social_contract#guidelines";> + so they are not officially part of Debian GNU/Linux. Under those, there are logical subsections that describe in short what packages are in. So we have <tt>admin</tt> for administrator-only programs, <tt>base</tt> for the basic tools, <tt>devel</tt> for programmer tools, <tt>doc</tt> for documentation, @@ -2069,7 +2073,7 @@ BUGS CONFIG-CHANGES CREDITS -ONEWS +NEWS README README.gtkrc TODO @@ -2085,7 +2089,7 @@ <p>If you don't need these, remove them. - <sect id="examples"><file><var>package</var>.examples</file> file + <sect id="examples"><file><var>package</var>.examples</file> files <p>The <manref name="dh_installexamples" section="1"> command installs files and directories listed in this file as example files. @@ -2103,14 +2107,14 @@ the temporary directory by <manref name="dh_installinit" section="1">. <p>The <file><var>package</var>.default</file> file will be installed into - <file>etc/default/<var>package</var></file>. This file + <file>/etc/default/<var>package</var></file>. This file sets defaults that are sourced by the init script. Most times this default file is used to disable running a daemon, set some default flags or timeouts. If your init script has certain <em>settable</em> features you want to install these into the default file, not the init script. <p>If your upstream program has an init file you can either use it or not. - If you don't use their init.d script then create a new one in <file>debian/init</file>. + If you don't use their init.d script then create a new one in <file>debian/<var>package</var>.init</file>. However if the upstream init script looks fine and installs in the right place you still need to setup the <file>rc*</file> symlinks. To do this you will need to override <prgn>dh_installinit</prgn> in the <file>rules</file> file with the following lines: @@ -2181,7 +2185,7 @@ <sect id="manpage"><file>manpage.*</file> files - <p>Your program(s) should have a manual page. If they don't, you must create + <p>Your program(s) should have a manual page. If they don't, you should create them. The <prgn>dh_make</prgn> command creates few template files for a manual page. These need to be copied and edited for each command without its manual page. Please make sure to remove unused templates. @@ -2471,7 +2475,7 @@ clear separation and documentation of your changes are very important to expedite the package review by your sponsor.</footnote> - <p>For <ref id="first">, we created 3 patches in <file>debian/patches</file>. + <p>For <ref id="modify">, we created 3 patches in <file>debian/patches</file>. <p>Since Debian patches are located in <file>debian/patches</file>, please make sure to setup the <prgn>quilt</prgn> command properly as described
signature.asc
Description: OpenPGP digital signature
