[Pkg-doc-linux-devel] r188 - trunk/doc-linux/debian

[Frank Lichtenheld]

Author: djpig
Date: 2005-09-01 14:12:55 +0000 (Thu, 01 Sep 2005)
New Revision: 188

Removed:
   trunk/doc-linux/debian/doc-linux-html.postrm
Modified:
   trunk/doc-linux/debian/doc-linux-html.postinst
   trunk/doc-linux/debian/doc-linux-html.prerm
   trunk/doc-linux/debian/doc-linux.changelog
   trunk/doc-linux/debian/rules
Log:
Clean up our maintainer scripts a bit:
 - let produce the install-doc calls by dh_installdocs again, it
   currently does what we want. This also finally uses the doc-base
   file added in 2005.04-1, D'oh!
 - remove error-unwind support for pre-woody version


Modified: trunk/doc-linux/debian/doc-linux-html.postinst
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.postinst	2005-09-01 14:00:10 UTC (rev 187)
+++ trunk/doc-linux/debian/doc-linux-html.postinst	2005-09-01 14:12:55 UTC (rev 188)
@@ -1,9 +1,5 @@
 #!/bin/sh -e
 
-if [ "$1" = configure ] && command -v install-docs >/dev/null 2>&1; then
-	install-docs -i /usr/share/doc-base/linux-faq
-fi
-
 # At the moment, dh_dhelp is too broken to do this properly.
 if [ "$1" = configure ] && [ -x /usr/sbin/dhelp_parse ]; then
 	/usr/sbin/dhelp_parse -a /usr/share/doc/HOWTO/en-html

Deleted: trunk/doc-linux/debian/doc-linux-html.postrm
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.postrm	2005-09-01 14:00:10 UTC (rev 187)
+++ trunk/doc-linux/debian/doc-linux-html.postrm	2005-09-01 14:12:55 UTC (rev 188)
@@ -1,17 +0,0 @@
-#! /bin/sh -e
-
-if [ "$1" = abort-upgrade ] && dpkg --compare-versions "$2" lt-nl 2001.11-1
-then
-    # Error unwind from the case where the preinst has reversed the sense of
-    # the former /usr/share/doc/FAQ symlink.
-    if [ ! -h /usr/share/doc/FAQ -a -d /usr/share/doc/FAQ \
-	 -a -h /usr/share/doc/doc-linux-html/FAQ ]; then
-	rm -f /usr/share/doc/doc-linux-html/FAQ
-	mv /usr/share/doc/FAQ /usr/share/doc/doc-linux-html/FAQ
-	ln -s doc-linux-html/FAQ /usr/share/doc/FAQ
-    fi
-fi
-
-#DEBHELPER#
-
-exit 0

Modified: trunk/doc-linux/debian/doc-linux-html.prerm
===================================================================
--- trunk/doc-linux/debian/doc-linux-html.prerm	2005-09-01 14:00:10 UTC (rev 187)
+++ trunk/doc-linux/debian/doc-linux-html.prerm	2005-09-01 14:12:55 UTC (rev 188)
@@ -2,11 +2,6 @@
 
 #DEBHELPER#
 
-if [ "$1" = remove -o "$1" = upgrade ] && \
-   command -v install-docs >/dev/null 2>&1; then
-	install-docs -r linux-faq
-fi
-
 if [ "$1" = remove -o "$1" = upgrade ] && [ -x /usr/sbin/dhelp_parse ]; then
 	/usr/sbin/dhelp_parse -d /usr/share/doc/HOWTO/en-html
 fi

Modified: trunk/doc-linux/debian/doc-linux.changelog
===================================================================
--- trunk/doc-linux/debian/doc-linux.changelog	2005-09-01 14:00:10 UTC (rev 187)
+++ trunk/doc-linux/debian/doc-linux.changelog	2005-09-01 14:12:55 UTC (rev 188)
@@ -21,6 +21,11 @@
     (BootPrompt-HOWTO) or contain program code under a different
     license than that of the HOWTO itself (Clone-HOWTO,
     Kodak-Digitalcam-HOWTO). This also closes: #322877
+  * Clean up our maintainer scripts a bit:
+    - let produce the install-doc calls by dh_installdocs again, it
+      currently does what we want. This also finally uses the doc-base
+      file added in 2005.04-1, D'oh!
+    - remove error-unwind support for pre-woody versions
 
  -- Frank Lichtenheld <djpig at debian.org>  Thu,  1 Sep 2005 15:41:09 +0200
 

Modified: trunk/doc-linux/debian/rules
===================================================================
--- trunk/doc-linux/debian/rules	2005-09-01 14:00:10 UTC (rev 187)
+++ trunk/doc-linux/debian/rules	2005-09-01 14:12:55 UTC (rev 188)
@@ -156,7 +156,7 @@
 		$(R)/usr/share/doc-base/linux-howtos
 endif
 
-	dh_installdocs -n
+	dh_installdocs
 	dh_installchangelogs
 	gzip -9 $(R)/usr/share/doc/$(SOURCE)-html/changelog.Debian
 	ln -s ../HOWTO/en-html $(R)/usr/share/doc/$(SOURCE)-html/HOWTO
@@ -198,7 +198,7 @@
 	find $(TEXT_BUILD) -type f | xargs gzip -9
 endif
 
-	dh_installdocs -n
+	dh_installdocs
 	dh_installchangelogs
 	gzip -9 $(R2)/usr/share/doc/$(SOURCE)-text/changelog.Debian
 	ln -s ../HOWTO/en-txt $(R2)/usr/share/doc/$(SOURCE)-text/HOWTO