r72: Initial Import

diff --git a/debian/changelog b/debian/changelog
index db3a28fa3dcd553cf6a7ec589216c886fc7c22d9..11a5e95d1b15e080878fe301ca8184a0da589015 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+debhelper (0.74) unstable; urgency=low
+
+  * dh_installmanpages: convert .so links to symlinks at last (#19829).
+  * dh_installmanpages.1: documented that no, dh_installmanpages never
+    installs symlink man pages from the source package (#19831).
+  * dh_installmanpages: minor speedups
+  * PROGRAMMING: numerous spelling fixes, thanks to Christian T. Steigies.
+    Life is too short for me to spell check my technical documentation, but
+    I always welcome corrections!
+
+ -- Joey Hess <joeyh@master.debian.org>  Tue, 17 Mar 1998 22:09:07 -0800
+
 debhelper (0.73) unstable; urgency=low
 
   * Fixed typo in dh_suidregister.1

diff --git a/dh_installmanpages b/dh_installmanpages
index fe611389de4ecb76bd9b8c2f77bb0266b6262487..d5e9198acb31ddbaaed3405e60b9e133f447cad2 100755 (executable)
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -2,7 +2,9 @@
 #
 # Automatically find and install man pages. However, do not install any man 
 # pages listed on the command line.
-# This is a little bit DWIMish, but still very handy.
+# Also change man pages with .so commands in them into symlinks.
+#
+# This is a little bit (hah!) DWIMish, but still very handy.
 
 PATH=debian:$PATH:/usr/lib/debhelper
 . dh_lib
@@ -15,12 +17,12 @@ for PACKAGE in $DH_DOPACKAGES; do
        # .in files, which are from configure.
        # We also need to exclude all debian/tmp type dirs.
        EXCLUDE=`grep ^Package: debian/control | \
-               cut -d " " -f 2 | tac | tr "\n" "|"`
-       for file in `find * -name "*.[1-9]*" ! -name "*.ex" \
+               cut -d " " -f 2 | tr "\n" "|"`
+       for file in `find * -type f -name "*.[1-9]*" ! -name "*.ex" \
                ! -name "*.in" | egrep -v "^debian/(${EXCLUDE}tmp)/"`
        do
                # Make sure file thinks they are man pages.
-               if file $file|grep -q roff; then
+               if file -L $file|grep -q roff; then
                        if echo $file|grep -q /; then
                                NAME=`expr $file : '.*/\(.*\)'`
                        else
@@ -54,4 +56,16 @@ for PACKAGE in $DH_DOPACKAGES; do
                        fi
                fi
        done
+
+       # Now the .so conversion.
+       for file in `find $TMP/usr/man $TMP/usr/X11*/man -type f -size -256c 2>/dev/null`
+       do
+               solink=expr "`head -1 $file`" : '\.so \(.*\)'
+               if [ "$solink" ]; then
+                       doit "rm -f $file"
+                       # The .so links include the subdir the page is in, 
+                       # thus the ../
+                       doit "ln -s ../$solink $file"
+               fi
+       done
 done

diff --git a/dh_installmanpages.1 b/dh_installmanpages.1
index 5a84d76bed71c3d3154d55ac9693d00c7504bee5..7053dbc6a8ebc995fba8318c983859480d5db7d7 100644 (file)
--- a/dh_installmanpages.1
+++ b/dh_installmanpages.1
@@ -10,7 +10,8 @@ automatically installing man pages into usr/man/ and usr/X11R6/man/ in
 package build directories.
 .P
 dh_installmanpages scans the current directory and all subdirectories for
-filenames that look like man pages. It uses
+filenames that look like man pages. (Note that only real files are looked
+at; symlinks are ignored.) It uses
 .BR file (1)
 to verify that the files are in the correct format. Then, based on the
 files' extensions, it installs them into the correct man directory.
@@ -18,6 +19,9 @@ files' extensions, it installs them into the correct man directory.
 All filenames specified as parameters will be skipped by dh_installmanpages.
 This is useful if by default it installs some man pages that you do not want
 to be installed.
+.P
+After the man page installation step, dh_installmanpages will check to see if
+any of the man pages are ".so" links. If so, it changes them to symlinks.
 .SH OPTIONS
 .TP
 .B \-v, \--verbose