X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=dh_installdocs;h=b694d7c0b75a88d4a2449614ca41d28e34ea2ae4;hb=269a2b129ec031f94e54dca7f526b2127aaf599f;hp=7bfe8ff167803eca067f66a3b7c01ddbd53de797;hpb=8ba59bbb27c5caf42ccb9c96c9be803b3310448f;p=debhelper.git

diff --git a/dh_installdocs b/dh_installdocs
index 7bfe8ff..b694d7c 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -39,11 +39,6 @@ debian/package.TODO can be used to specify files for subpackages.
 
 Files named debian/package.docs can list other files to be installed.
 
-This program will automatically generate postinst and prerm commands to
-maintain a compatibility symlink, /usr/doc/package, to the documentation in
-/usr/share/doc/package. See L<dh_installdeb(1)> for an explanation of how
-this works.
-
 Files named debian/package.doc-base, will be installed as doc-base control
 files, and will make this program automatically generate the postinst and
 prerm commands needed to interface with the doc-base package. Note that the
@@ -78,6 +73,17 @@ in all packages if B<-A> is specified).
 
 =back
 
+=head1 EXAMPLES
+
+This is an example of a debian/package.docs file:
+
+  README
+  TODO
+  debian/notes-for-maintainers.txt
+  docs/manual.txt
+  docs/manual.pdf
+  docs/manual-html/
+
 =head1 NOTES
 
 Note that dh_installdocs will happily copy entire directory hierarchies if
@@ -93,6 +99,8 @@ instances of the same text to be added to maintainer scripts.
 init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
+	next if is_udeb($package);
+	
 	my $tmp=tmpdir($package);
 	my $file=pkgfile($package,"docs");
 
@@ -130,7 +138,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				doit("cp","-a",$doc,"$tmp/usr/share/doc/$package");
 			}
 		}
-		doit("chown","-R","0.0","$tmp/usr/share/doc");
+		doit("chown","-R","0:0","$tmp/usr/share/doc");
 		doit("chmod","-R","go=rX","$tmp/usr/share/doc");
 		doit("chmod","-R","u+rw","$tmp/usr/share/doc");
 	}
@@ -174,16 +182,6 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		}
 	}
 
-	# Add in the /usr/doc compatibility symlinks code.
-	if (! $dh{NOSCRIPTS}) {
-		autoscript($package,"postinst","postinst-doc",
-			"s/#PACKAGE#/$package/g",
-		);
-		autoscript($package,"prerm","prerm-doc",
-			"s/#PACKAGE#/$package/g",
-		);
-	}
-
 	# Handle doc-base files. There are two filename formats, the usual
 	# plus an extended format (debian/package.*).
 	my %doc_ids;
@@ -197,6 +195,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		$regexp="(|$regexp)";
 	}
 	foreach my $fn (grep {/^${regexp}doc-base(\..*)?$/} readdir(DEB)) {
+		# .EX are example files, generated by eg, dh-make
+		next if $fn=~/\.EX$/;
 		# Parse the file to get the doc id.
 		open (IN, "debian/$fn") || die "Cannot read debian/$fn.";
 		while (<IN>) {
@@ -230,7 +230,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 
 =head1 SEE ALSO
 
-L<debhelper(1)>
+L<debhelper(7)>
 
 This program is a part of debhelper.