Synchronized with patch 113 from Manojs tree

Synchronized with patch 113 from Manojs tree

Patches applied:

 * srivasta@debian.org--etch/debian-policy--devel--3.0--patch-113
   * Add FHS to doc-base

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

diff --git a/debian/postinst.in b/debian/postinst.in
index 807be4934568ea39197532b5f68f30c157d5b8d7..93e2141078d28540dbad9a4da841108d0fb8c5aa 100644 (file)
--- a/debian/postinst.in
+++ b/debian/postinst.in
@@ -134,6 +134,7 @@ EOF
        /usr/sbin/install-docs -i /usr/share/doc-base/debian-perl-policy
        /usr/sbin/install-docs -i /usr/share/doc-base/debian-policy-process
        /usr/sbin/install-docs -i /usr/share/doc-base/debconf-spec
+       /usr/sbin/install-docs -i /usr/share/doc-base/fhs
     fi
 
     # There are three sub-cases:

diff --git a/debian/prerm.in b/debian/prerm.in
index b4d5ddb8e21c7c3a339ce55d82b0f23ccbd432a0..f4df05206ef45c46eac7b4358ec817ab246d4947 100644 (file)
--- a/debian/prerm.in
+++ b/debian/prerm.in
@@ -87,6 +87,7 @@ if [ -x /usr/sbin/install-docs ]; then
     /usr/sbin/install-docs -r debian-perl-policy
     /usr/sbin/install-docs -r debian-policy-process
     /usr/sbin/install-docs -r debconf-spec
+    /usr/sbin/install-docs -r fhs
 fi
 
 exit 0

diff --git a/debian/rules b/debian/rules
index ed9270e8175b3f91f1d59cac079f47cd12e044b2..c7d699df46d475ddf139176f049de54df0ebaace 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,8 @@ LIBDIR          := $(TMPTOP)/usr/share/doc-base
 
 SGML_FILES      = policy menu-policy mime-policy policy-process perl-policy
 DESC_FILES      = debian-policy debian-menu-policy debian-perl-policy \
-                  debian-mime-policy debian-policy-process debconf-spec
+                  debian-mime-policy debian-policy-process debconf-spec \
+                 fhs
 
 # While we have two versions of the FHS installed in the source package,
 # we need to modify this to handle it.  This is the easiest way to do it.