From: Manoj Srivastava <srivasta@debian.org>
Date: Thu, 16 Jun 2005 05:05:09 +0000 (+0000)
Subject: various
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=9729bcd641f13043e7f93da6039c8c1a25459a58;p=debian%2Fdebian-policy.git

various

Author: srivasta
Date: 1999/04/27 16:14:55
various

git-archimport-id: srivasta@debian.org--etch/debian-policy--devel--3.0--patch-22
---

diff --git a/debian/changelog b/debian/changelog
index 89258fd..b32780e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+debian-policy (2.5.1.0) unstable; urgency=low
+
+  * Removed double '>' marks from the policy document. closes: Bug#35095
+  * Corrected canonical source for "Csh Programming Considered Harmful"
+    closes: Bug#36286 Bug#32499
+  * Fixed typo in invocation of update-rc.d. closes: Bug#34988 Bug#34543
+  * Fixed misspelling of accessible. Ran ispell over the rest of the
+    document (painful because of the large number of technical terms in
+    there). closes: Bug#34233
+  * Make the binary package contain the version.ent as well. closes: Bug#31033
+  * Fixed typo s/as is/is/. closes: Bug#30302
+  * AMENDMENT 23/04/1999: changed /etc/nntpserver recommendation to
+    /etc/news/server. closes: Bug#21875
+  * Added the current list of policy maintainers. closes: Bug#30148
+
+ -- Manoj Srivastava <srivasta@debian.org>  Tue, 27 Apr 1999 11:10:29 -0500
+
 debian-policy (2.5.0.0) unstable; urgency=low
 
   * AMENDMENT: Added in changes in Bug #25911, which rearranged sections
diff --git a/debian/rules b/debian/rules
index c8db2fb..38d4587 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,9 @@
 ## Created On	    : Thu Oct 29 15:35:55 1998
 ## Created On Node  : tiamat.datasync.com
 ## Last Modified By : Manoj Srivastava
-## Last Modified On : Fri Oct 30 00:53:33 1998
-## Last Machine Used: tiamat.datasync.com
-## Update Count	    : 30
+## Last Modified On : Tue Apr 27 10:38:06 1999
+## Last Machine Used: glaurung.green-gryphon.com
+## Update Count	    : 34
 ## Status	    : Unknown, Use with caution!
 ## HISTORY	    :
 ## Description	    :
@@ -15,7 +15,7 @@
 ###############################################################################
 # The name of the package (for example, `emacs').
 package := $(shell grep Source debian/control | sed 's/^Source: //')
-arch	:=$(shell dpkg --print-architecture)
+arch	:= $(shell dpkg --print-installation-architecture)
 date	:= $(shell date +"%Y-%m-%d")
 version := $(shell LC_ALL=C dpkg-parsechangelog | \
 		   grep ^Version: | sed 's/^Version: *//')
@@ -34,7 +34,7 @@ LIBDIR	  := $(TMPTOP)/usr/share/doc-base
 
 FSSTND_FILES   =FSSTND-FAQ fsstnd-1.2.dvi.gz fsstnd-1.2.ps.gz fsstnd-1.2.txt.gz
 POLICY_FILES   =policy.text.gz policy.sgml virtual-package-names-list.text \
-		upgrading-checklist.text libc6-migration.text
+		upgrading-checklist.text libc6-migration.text version.ent
 BYHAND_FILES   =policy.text.gz libc6-migration.text\
 		virtual-package-names-list.text
 
@@ -51,7 +51,7 @@ stamp-build:
 	debiandoc2html policy.sgml
 	debiandoc2text policy.sgml
 	lynx -dump upgrading-checklist.html > upgrading-checklist.text
-	gzip -9 policy.text
+	gzip -9f policy.text
 	touch stamp-build
 
 configure: stamp-configure
@@ -60,6 +60,7 @@ stamp-configure:
 	echo "<!entity version \"$(version)\">" >> version.ent
 	echo "<!entity date    \"$(date)\">"	    >> version.ent
 	touch stamp-configure
+
 clean:
 # Undoes the effect of `make -f debian/rules build'.
 	$(checkdir)
diff --git a/policy.sgml b/policy.sgml
index 934de0d..fc72f76 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -46,9 +46,27 @@
 	GNU/Linux distribution. This includes the structure and
 	contents of the Debian archive, several design issues of the
 	operating system, as well as technical requirements that each
-	package must satisfy to be included in the distribution.
+	package must satisfy to be included in the distribution. The
+	policy package itself is maintained by a group of maintainers
+	that have no editorial powers. At the moment, the list of
+	maintainers is:
+	<enumlist>
+	  <item>
+	    <p>Michael Alan Dorman <email>mdorman@debian.org</email></p>
+	  </item>
+	  <item>
+	    <p>Richard Braakman <email>dark@xs4all.nl</email></p>
+	  </item>
+	  <item>
+	    <p>Philip Hands <email>phil@hands.com</email></p>
+	  </item>
+	  <item>
+	    <p>Manoj Srivastava <email>srivasta@debian.org</email></p>
+	  </item>
+	</enumlist>
       </abstract>
 
+
       <copyright>
 	<copyrightsummary>
 	  Copyright &copy;1996,1997,1998 Ian Jackson
@@ -195,10 +213,10 @@
       <sect1>
 	<heading>The Debian Free Software Guidelines</heading>
 	<p>
-	  The Debian Free Software Guidelines (DFSG) as is our
+	  The Debian Free Software Guidelines (DFSG) is our
 	  definition of `free' software.
 	  <taglist>
-	    <tag>>Free Redistribution
+	    <tag>Free Redistribution
 	    </tag>
 	    <item>
 	      <p>
@@ -790,7 +808,7 @@
 	    only ever be asked each question once.  This means that
 	    packages should try to use appropriate shared
 	    configuration files (such as <tt>/etc/papersize</tt> and
-	    <tt>/etc/nntpserver</tt>), rather than each prompting for
+	    <tt>/etc/news/server</tt>), rather than each prompting for
 	    their own list of required pieces of information.</p>
 	    
 	  <p>
@@ -844,7 +862,7 @@
 	    correctly all the packages which supply an instance of the
 	    `shared' command name (or, in general, filename) must use
 	    it.  You can use <tt>Conflicts</tt> to force the
-	    deinstallation of other packages supplying it which do not
+	    De-installation of other packages supplying it which do not
 	    (yet) use <prgn>update-alternatives</prgn>.  It may in
 	    this case be appropriate to specify a conflict on earlier
 	    versions on something--this is an exception to the usual
@@ -1003,15 +1021,15 @@
 	
       
       <sect>
-	<heading>Filesystem hierarchy</heading>
+	<heading>File system hierarchy</heading>
 	  
 	
 	<sect1>
-	  <heading>Linux Filesystem Structure</heading>
+	  <heading>Linux File system Structure</heading>
 	    
 	  <p>
 	    The location of all installed files and directories must
-	    comply fully with the Linux Filesystem Structure (FSSTND).
+	    comply fully with the Linux File system Structure (FSSTND).
 	    The latest version of this document can be found alongside
 	    this manual or on <ftpsite>tsx-11.mit.edu</ftpsite> in
 	    <ftppath>/pub/linux/docs/linux-standards/fsstnd/</ftppath>.
@@ -1027,7 +1045,7 @@
 	  <p>
 	    As mandated by the FSSTND no package should place any
 	    files in <tt>/usr/local</tt>, either by putting them in
-	    the filesystem archive to be unpacked by <prgn>dpkg</prgn>
+	    the file system archive to be unpacked by <prgn>dpkg</prgn>
 	    or by manipulating them in their maintainer scripts.</p>
 	    
 	  <p>
@@ -1356,7 +1374,7 @@
 	    To get the default behaviour for your package, put in your
 	    <tt>postinst</tt> script
 	    <example>
-	      update-rc.d <var>package</var> default &gt;/dev/null
+	      update-rc.d <var>package</var> defaults &gt;/dev/null
 	    </example>
 	    and in your <tt>postrm</tt>
 	    <example>
@@ -1380,12 +1398,12 @@
 	    
 	    
 	<sect1>
-	  <heading>Boot-time initialisation</heading>
+	  <heading>Boot-time initialization</heading>
 	    
 	  <p>
 	    There is another directory, <tt>/etc/rc.boot</tt>, which
 	    contains scripts which are run once per machine boot.
-	    This facility is provided for initialisation of hardware
+	    This facility is provided for initialization of hardware
 	    devices, cleaning up of leftover files, and so forth.</p>
 	    
 	  <p>
@@ -1413,7 +1431,7 @@
 	  <p>
 	    <em>Do not</em> include the
 	    <tt>/etc/rc<var>n</var>.d/*</tt> symbolic links in the
-	    <tt>.deb</tt> filesystem archive!  <em>This will cause
+	    <tt>.deb</tt> file system archive!  <em>This will cause
 	    problems!</em> You should create them with
 	    <prgn>update-rc.d</prgn>, as above.</p>
 	    
@@ -1425,7 +1443,7 @@
 	    conffiles.  (This is important since we want to give the
 	    local system administrator the chance to adapt the scripts
 	    to the local system--e.g., to disable a service without
-	    deinstalling the package, or to specify some special
+	    De-installing the package, or to specify some special
 	    command line options when starting a service--while making
 	    sure her changes aren't lost during the next package
 	    upgrade.)</p></sect1>
@@ -1498,7 +1516,7 @@
 	    and having named running in all runlevels, it can say in
 	    its <tt>postinst</tt>:
 	    <example>
-	      update-rc.d bind default >/dev/null
+	      update-rc.d bind defaults >/dev/null
 	    </example>
 	    And in its <tt>postrm</tt>, to remove the links when the
 	    package is purged: 
@@ -1646,7 +1664,7 @@
 		in the script. If you have more than one daemon to
 		start, you should do the following:
 		<example>
-		  echo -n "Starting remote filesystem services:"
+		  echo -n "Starting remote file system services:"
 		  echo -n " nfsd"; start-stop-daemon --start --quiet nfsd
 		  echo -n " mountd"; start-stop-daemon --start --quiet mountd
 		  echo -n " ugidd"; start-stop-daemon --start --quiet ugidd
@@ -2148,13 +2166,15 @@
 	    <prgn>csh</prgn> and <prgn>tcsh</prgn> should be avoided
 	    as scripting languages.  See <em>Csh Programming
 	    Considered Harmful</em>, one of the <tt>comp.unix.*</tt>
-	    FAQs.  It can be found on <ftpsite>rtfm.mit.edu</ftpsite>
-	    in
-	    <ftppath>/pub/usenet-by-group/comp.unix.programmer/Csh_Programming_Considered_Harmful</ftppath>.
-	    If an upstream package comes with <prgn>csh</prgn> scripts
-	    then you must make sure that they start with
-	    <tt>#!/bin/csh</tt> and make your package depend on the
-	    <prgn>c-shell</prgn> virtual package.</p>
+	  FAQs.  It can be found on 
+	  <url id="http://language.perl.com/versus/csh.whynot">, or
+	  <url id="http://www.cpan.org/doc/FMTEYEWTK/versus/csh.whynot">
+	  or even on <ftpsite>ftp.cpan.org</ftpsite> 
+	  <ftppath>/pub/perl/CPAN/doc/FMTEYEWTK/versus/csh.whynot</ftppath>.
+	  If an upstream package comes with <prgn>csh</prgn> scripts
+	  then you must make sure that they start with
+	  <tt>#!/bin/csh</tt> and make your package depend on the
+	  <prgn>c-shell</prgn> virtual package.</p>
 	    
 	  <p>
 	    Any scripts which create files in world-writable
@@ -2249,7 +2269,7 @@
 	    
 	  <p>
 	    It is almost certain that any file in <tt>/etc</tt> that
-	    is in your package's filesystem archive should be listed
+	    is in your package's file system archive should be listed
 	    in <prgn>dpkg</prgn>'s <tt>conffiles</tt> control area
 	    file.  (See the <em>Debian Packaging
             Manual</em>).</p>
@@ -2447,7 +2467,7 @@
 	    
 	  <p>
 	    Note that changing the numeric value of an id associated with a name
-	    is very difficult, and involves searching the filesystem for all
+	    is very difficult, and involves searching the file system for all
 	    appropriate files.  You need to think carefully whether a static or
 	    dynamic id is required, since changing your mind later will cause
 	    problems.</p>
@@ -2964,7 +2984,7 @@
 	
 	<p>
 	  If your package comes with extensive documentation in a
-	  markup format that can be converted to various other formats
+	  mark up format that can be converted to various other formats
 	  you should if possible ship HTML versions in a binary
 	  package, in the directory
 	  <tt>/usr/doc/<var>appropriate package</var></tt> or its
@@ -3041,10 +3061,10 @@
 	  The debian/changelog file should be installed in
 	  <tt>/usr/doc/<var>package</var></tt> as
 	  <tt>changelog.Debian.gz</tt>.  If the upstream changelog
-	  file is text formatted, it must be accessable as
+	  file is text formatted, it must be accessible as
 	  <tt>/usr/doc/<var>package</var>/changelog.gz</tt>.  If the
 	  upstream changelog file is HTML formatted, it must be
-	  accessable as <tt>/usr/doc/<var>package</var>/changelog.html.gz</tt>.
+	  accessible as <tt>/usr/doc/<var>package</var>/changelog.html.gz</tt>.
 	  If the upstream changelog files do not already conform to
 	  this naming convention, then this may be achieved by either
 	  renaming the files or adding a symbolic link at the