r58: Initial Import

3 files changed, 48 insertions, 8 deletions

diff --git a/TODO b/TODO
index 00281d70..6683d0dd 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,25 @@
-* .so files of compressed manpages -- change to symlinks
 * add all other functionality of debstd (??)
+  - add a program to generate file similar to buildinfo.Debian generated by
+    debmake (wishlist bug #17043). I just never saw the point of that file..
+  - Make dh_movefiles remove emptied directories after it's moved all the
+    files out of them (wishlist bug #17111).
+  - .so files of compressed manpages -- change to symlinks. Policy says we
+    need only do this "if it's easy". The hard bit is implementing it ;-)
 * dh_fixperms: allow listing of files not to be touched (diffucult).
 * add a dh_debstd, which mimics debstd, but uses debhelper tools internally.
-* dh_compress: add --exclude "*.conf" type-thingy
-* info support for debhelper
+  Note thatthe idea here is not just another debstd. This program will have
+  a -v switch, that lists all the other debhelper commands it needs to run to
+  do what debstd had to do. The intent is to make it easy to switch from
+  debstd to debhelper.
+* dh_compress: add --exclude "*.conf" type-thingy, sincethat's the change
+  you most often want to make to what it does, and a debian/conpress file is
+  overkill in those cases.
+* info support for debhelper (currently implmented, but I hate how I did it,
+  so it's not in the package.) (wishlist bug #15717)
+* enhance dh_installmanpages so it associates binaries and man pages and
+  installs the man pages into the correct areas to suit the binaries they
+  document. I may need to make this only happen when a switch is given, to
+  preserve backward compatability.
+* maybe make dh_installmanpages look at the .TH line of man pages whose
+  filenames end in .man, to figure out what section they go it. This would
+  require a switch to turn on, for backwards compatability.
diff --git a/debian/changelog b/debian/changelog
index 6e72b1c1..8d2df4b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debhelper (0.62) unstable; urgency=low
+
+  * dh_installmanpages: if the man page filename ends in 'x', install it in
+    /usr/X11R6/man/.
+  * TODO: expanded descriptions of stuff, in the hope someone else will get
+    inspired to implement some of it.
+  *  Also added all wishlist bugs to the TODO.
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu, 12 Feb 1998 22:38:53 -0800
+
 debhelper (0.61) unstable; urgency=low
 
   * dh_installmanpages: Add / to end of egrep -v regexp, fixes it so
diff --git a/dh_installmanpages b/dh_installmanpages
index a2bcfc10..0c968a3f 100755
--- a/dh_installmanpages
+++ b/dh_installmanpages
@@ -14,8 +14,11 @@ for PACKAGE in $DH_DOPACKAGES; do
 	# .ex files are examples installed by deb-make, we don't want those, or
 	# .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" ! -name "*.in" | egrep -v "^debian/(${EXCLUDE}tmp)/"`; do
+	EXCLUDE=`grep ^Package: debian/control | \
+		cut -d " " -f 2 | tac | tr "\n" "|"`
+	for file in `find * -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 echo $file|grep -q /; then
@@ -34,12 +37,20 @@ for PACKAGE in $DH_DOPACKAGES; do
 			done
 			if [ "$install" ]; then
 				SECTION=man`expr $NAME : '.*\.\([123456789]\)'`
+				# Test to see if the filename ends with 'x',
+				# if so, this is an X man page.
+				echo $NAME
+				if expr $NAME : '.*\.[123456789]x' >/dev/null; then
+					EXTDIR="X11R6"
+				else
+					EXTDIR=""
+				fi
 				if [ ! -e $TMP/usr/man/$SECTION/$NAME -a \
 				     ! -e $TMP/usr/X11*/man/$SECTION/$NAME ]; then
-					if [ ! -d $TMP/usr/man/$SECTION ]; then
-						doit "install -d $TMP/usr/man/$SECTION"
+					if [ ! -d $TMP/usr/$EXTDIR/man/$SECTION ]; then
+						doit "install -d $TMP/usr/$EXTDIR/man/$SECTION"
 					fi
-					doit "install -p -m644 $file $TMP/usr/man/$SECTION/$NAME"
+					doit "install -p -m644 $file $TMP/usr/$EXTDIR/man/$SECTION/$NAME"
 				fi
 			fi
 		fi