From: Manoj Srivastava <srivasta@debian.org>
Date: Thu, 16 Jun 2005 08:40:16 +0000 (+0000)
Subject: Synchronized with patch 82 from Manojs tree
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1d0d504f863ba415c5f2c780b50f3adc92305cf9;hp=a6e07a856bbe189181a1caaca669c6a3b37bc228;p=debian%2Fdebian-policy.git

Synchronized with patch 82 from Manojs tree

Synchronized with patch 82 from Manojs tree

Patches applied:

 * srivasta@debian.org--etch/debian-policy--devel--3.0--patch-82
   * Add "links" to Build-Depends list


git-archimport-id: debian-policy@lists.debian.org--etch/debian-policy--devel--3.0--patch-82
---

diff --git a/debian/changelog b/debian/changelog
index 0ecd30d..e217fec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,10 @@ debian-policy (3.5.1.0) unstable; urgency=low
   * Add the "main" section of each distribution (got left out by
     accident!)                 (Bug#64304, #75955 from packaging-manual)
   * Clean version numbering string     (Bug#73064 from packaging-manual)
+  * Add "links" to Build-Depends list
+  * Install HTML version of FHS                     closes: Bug#83487
 
- -- Julian Gilbey <jdg@debian.org>  Thu, 15 Feb 2001 10:55:19 +0000
+ -- Julian Gilbey <jdg@debian.org>  Thu, 15 Feb 2001 11:42:31 +0000
 
 debian-policy (3.5.0.0) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 2e32885..a22ba09 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: doc
 Priority: optional
 Maintainer: Debian Policy List <debian-policy@lists.debian.org>
 Standards-Version: ${debian-policy:Version}
-Build-Depends-Indep: links, debiandoc-sgml, sp, liburi-perl, libpaperg, tetex-bin, tetex-extra, latex2html, libi18n-langtags-perl, groff, bsdmainutils, pstoedit, tidy, jade, docbook-xml
+Build-Depends-Indep: links, debiandoc-sgml, sp, liburi-perl, libpaperg, tetex-bin, tetex-extra, latex2html, libi18n-langtags-perl, groff, bsdmainutils, pstoedit, tidy, jade, docbook-xml, links
 
 Package: debian-policy
 Architecture: all
diff --git a/debian/rules b/debian/rules
index f6da869..09745a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,6 +66,7 @@ LIBDIR	  := $(TMPTOP)/usr/share/doc-base
 # And with version 2.1, we have to build the text and dvi versions
 # ourselves :-(
 FHS_ARCHIVE  =fhs-2.1-source.tar.gz
+FHS_HTML     =fhs-2.1.html.tar.gz
 FHS_FILES    =fhs/fhs.ps fhs/fhs.txt fhs/fhs.pdf
 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 \
@@ -111,6 +112,7 @@ stamp-build:
 	GROFF_TMAC_PATH=. cd fhs && $(MAKE) fhs.ps fhs.pdf fhs.txt
 	links -dump fhs-changes-2.1.html | perl -pe 's/[\r\0]//g' > \
                     fhs/fhs-changes-2.1.text
+	cd fhs && tar zfx ../$(FHS_HTML)
 	links -dump upgrading-checklist.html | perl -pe 's/[\r\0]//g' > \
                     upgrading-checklist.text
 	$(MAKE) -C debconf_spec all
diff --git a/fhs-2.1.html.tar.gz b/fhs-2.1.html.tar.gz
new file mode 100644
index 0000000..a5de1ab
Binary files /dev/null and b/fhs-2.1.html.tar.gz differ
diff --git a/policy.sgml b/policy.sgml
index b01eb18..c585df8 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -2323,9 +2323,6 @@
 	  before (a version of) a package is removed and the
 	  <prgn>postrm</prgn> afterwards.
 	</p>
-	<!--
-	next paragraph by Guy Maor to close bug #2481
-	-->
 
 	<p> Programs called from maintainer scripts should not
 	  normally have a path prepended to them. Before installation
@@ -3433,10 +3430,6 @@
 	files itself when building a package.
       </p>
 
-      <!--
-      next Paragraph added to close Bug #5299, Guy Maor
-      -->
-
       <p>
 	Thirdly, the development package should contain a symlink for
 	the shared library without a version number.  For example, the
@@ -3448,10 +3441,6 @@
 	respectively.
       </p>
 
-      <!--
-      next paragraph changed by Christian Schwarz (see policy weekly #6)
-      -->
-
       <p>
 	Any package installing shared libraries in a directory that's listed
 	in <tt>/etc/ld.so.conf</tt> or in one of the default library
@@ -3467,10 +3456,6 @@
 	installation and removes the links!
       </p>
 
-      <!--
-      moved from section 2.2 , DMorris
-      -->
-
       <sect id="shlibs"><heading>The <tt>shlibs</tt> File Format
 	</heading>
 
@@ -3527,12 +3512,6 @@
       <sect><heading>Further Technical information on
 	  <tt>shlibs</tt></heading>
 
-
-	<!--
-	following section mostly provided by Heiko Schlittermann
-	edited by DMorris
-	-->
-
 	<sect1><heading><em>What</em> are the <tt>shlibs</tt> files?
 	  </heading>