Synchronized with patch 83 from Manojs tree

Synchronized with patch 83 from Manojs tree

Patches applied:

 * srivasta@debian.org--etch/debian-policy--devel--3.0--patch-83
   * Undo Build-Depends change

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

diff --git a/debian/changelog b/debian/changelog
index e217fec07c01d15f9de32fd5b447b12d12ed383d..76184e306f23bcc89b93af11348cc629b619766b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,10 +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
+  * Removed bashism from debian/rules
 
- -- Julian Gilbey <jdg@debian.org>  Thu, 15 Feb 2001 11:42:31 +0000
+ -- Julian Gilbey <jdg@debian.org>  Thu, 15 Feb 2001 12:13:00 +0000
 
 debian-policy (3.5.0.0) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index a22ba09837bbb1aaceba12c8c1c8d001865ecc5f..2e32885b5d425601e4a8e987bf4bb2a07ac0316a 100644 (file)
--- 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, links
+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
 
 Package: debian-policy
 Architecture: all

diff --git a/debian/rules b/debian/rules
index 09745a89901be177a156af470edac0171814d731..4a2d973a39cb945d8939aaaf3310ba8bf6c25a38 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -174,7 +174,8 @@ stamp-policy:  build
        (tar cf -           policy-process.html) |   (cd $(DOCDIR);   tar xf -)
        sed -e 's/#PACKAGE#/$(package)/g' debian/postinst.in > debian/postinst
        sed -e 's/#PACKAGE#/$(package)/g' debian/prerm.in > debian/prerm
-       $(install_program)  debian/{postinst,prerm}  debian/tmp/DEBIAN/
+       $(install_program)  debian/postinst          debian/tmp/DEBIAN/
+       $(install_program)  debian/prerm             debian/tmp/DEBIAN/
        dpkg-gencontrol     -pdebian-policy -Pdebian/tmp -isp
        chown               -R root.root debian/tmp
        chmod               -R go=rX debian/tmp