[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.1.3-24-g999c0d7



The following commit has been merged in the master branch:
commit fb11eedce925b7d691b9bf7c312f649d1f92ec88
Author: Russ Allbery <rra@debian.org>
Date:   Mon Dec 29 17:50:37 2008 -0800

    Add another test case with a dh_make 0.46 run

diff --git a/private/tags-never-seen b/private/tags-never-seen
index 3bfec6a..68d8a12 100644
--- a/private/tags-never-seen
+++ b/private/tags-never-seen
@@ -1,4 +1,4 @@
-Last generated 2008-12-29
+Last generated 2008-12-30
 
 binaries apparently-corrupted-elf-binary
 binaries arch-dependent-file-in-usr-share
@@ -64,7 +64,6 @@ debconf unknown-field-in-templates
 debconf unknown-template-type
 
 debhelper debhelper-compat-file-is-empty
-debhelper dh-make-template-in-source
 debhelper dh_dhelp-is-deprecated
 
 debian-readme spelling-error-in-readme-debian
diff --git a/t/tests/6500_generic-dh-make-2008.desc b/t/tests/6500_generic-dh-make-2008.desc
new file mode 100644
index 0000000..4a81b2e
--- /dev/null
+++ b/t/tests/6500_generic-dh-make-2008.desc
@@ -0,0 +1,21 @@
+Testname: generic-dh-make-2008
+Type: non-native
+Author: Russ Allbery <rra@debian.org>
+Version: 1.0-1
+Description: Generic dh_make template generated in 2008
+Test-For:
+ bad-homepage
+ copyright-contains-dh_make-todo-boilerplate
+ copyright-has-url-from-dh_make-boilerplate
+ copyright-lists-upstream-authors-with-dh_make-boilerplate
+ copyright-without-copyright-notice
+ debian-watch-file-is-missing
+ description-is-dh_make-template
+ dh-make-template-in-source
+ extended-description-is-probably-too-short
+ new-package-should-close-itp-bug
+ package-contains-empty-directory
+ readme-debian-contains-debmake-template
+ section-is-dh_make-template
+ superfluous-clutter-in-homepage
+ wrong-bug-number-in-closes
diff --git a/t/tests/generic-dh-make-2008/debian/Makefile b/t/tests/generic-dh-make-2008/debian/Makefile
new file mode 100644
index 0000000..4f762d8
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/Makefile
@@ -0,0 +1,4 @@
+# Stub Makefile that's just enough so that the default rules file doesn't
+# error out.
+
+clean install:
diff --git a/t/tests/generic-dh-make-2008/debian/README b/t/tests/generic-dh-make-2008/debian/README
new file mode 100644
index 0000000..6a3c009
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/README
@@ -0,0 +1,13 @@
+dh_make 0.46 test
+=================
+
+This is the results of running dh_make 0.46 on an upstream tarball
+containing only this file.  It's a useful test for the various dh_make
+template and boilerplate tags, as well as many tags for ways of doing
+things dh_make used to promote but are now deprecated or old debhelper
+commands that are now deprecated.
+
+Please don't modify anything about the files in this package; instead, add
+new tags as needed when Lintian adds new checks.  This test case is
+intended to continue to be a test of Lintian's handling of old and
+template packages.
diff --git a/t/tests/generic-dh-make-2008/debian/debian/README.Debian b/t/tests/generic-dh-make-2008/debian/debian/README.Debian
new file mode 100644
index 0000000..69112e6
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/README.Debian
@@ -0,0 +1,6 @@
+generic-dh-make-2008 for Debian
+-------------------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Russ Allbery <rra@debian.org>  Mon, 29 Dec 2008 17:33:59 -0800
diff --git a/t/tests/generic-dh-make-2008/debian/debian/changelog b/t/tests/generic-dh-make-2008/debian/debian/changelog
new file mode 100644
index 0000000..a22ca4f
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/changelog
@@ -0,0 +1,6 @@
+generic-dh-make-2008 (1.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+
+ -- Russ Allbery <rra@debian.org>  Mon, 29 Dec 2008 17:33:59 -0800
+
diff --git a/t/templates/skel/debian/compat b/t/tests/generic-dh-make-2008/debian/debian/compat
similarity index 100%
copy from t/templates/skel/debian/compat
copy to t/tests/generic-dh-make-2008/debian/debian/compat
diff --git a/t/tests/generic-dh-make-2008/debian/debian/control b/t/tests/generic-dh-make-2008/debian/debian/control
new file mode 100644
index 0000000..6b9fd02
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/control
@@ -0,0 +1,13 @@
+Source: generic-dh-make-2008
+Section: unknown
+Priority: extra
+Maintainer: Russ Allbery <rra@debian.org>
+Build-Depends: debhelper (>= 7)
+Standards-Version: 3.7.3
+Homepage: <insert the upstream URL, if relevant>
+
+Package: generic-dh-make-2008
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
diff --git a/t/tests/generic-dh-make-2008/debian/debian/copyright b/t/tests/generic-dh-make-2008/debian/debian/copyright
new file mode 100644
index 0000000..31b796a
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/copyright
@@ -0,0 +1,24 @@
+This package was debianized by Russ Allbery <rra@debian.org> on
+Mon, 29 Dec 2008 17:33:59 -0800.
+
+It was downloaded from <url://example.com>
+
+Upstream Author(s):
+
+    <put author's name and email here>
+    <likewise for another author>
+
+Copyright:
+
+    <Copyright (C) YYYY Name OfAuthor>
+    <likewise for another author>
+
+License:
+
+    <Put the license of the package here indented by 4 spaces>
+
+The Debian packaging is (C) 2008, Russ Allbery <rra@debian.org> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
diff --git a/t/tests/generic-dh-make-2008/debian/debian/cron.d.ex b/t/tests/generic-dh-make-2008/debian/debian/cron.d.ex
new file mode 100644
index 0000000..d00b7d0
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/cron.d.ex
@@ -0,0 +1,4 @@
+#
+# Regular cron jobs for the generic-dh-make-2008 package
+#
+0 4	* * *	root	[ -x /usr/bin/generic-dh-make-2008_maintenance ] && /usr/bin/generic-dh-make-2008_maintenance
diff --git a/t/tests/generic-dh-make-2008/debian/debian/dirs b/t/tests/generic-dh-make-2008/debian/debian/dirs
new file mode 100644
index 0000000..ca882bb
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin
diff --git a/t/tests/basic-non-native/upstream/README b/t/tests/generic-dh-make-2008/debian/debian/docs
similarity index 100%
copy from t/tests/basic-non-native/upstream/README
copy to t/tests/generic-dh-make-2008/debian/debian/docs
diff --git a/t/tests/generic-dh-make-2008/debian/debian/emacsen-install.ex b/t/tests/generic-dh-make-2008/debian/debian/emacsen-install.ex
new file mode 100644
index 0000000..393594b
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/emacsen-install.ex
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+# /usr/lib/emacsen-common/packages/install/generic-dh-make-2008
+
+# Written by Jim Van Zandt <jrv@debian.org>, borrowing heavily
+# from the install scripts for gettext by Santiago Vila
+# <sanvila@ctv.es> and octave by Dirk Eddelbuettel <edd@debian.org>.
+
+FLAVOR=$1
+PACKAGE=generic-dh-make-2008
+
+if [ ${FLAVOR} = emacs ]; then exit 0; fi
+
+echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
+
+#FLAVORTEST=`echo $FLAVOR | cut -c-6`
+#if [ ${FLAVORTEST} = xemacs ] ; then
+#    SITEFLAG="-no-site-file"
+#else
+#    SITEFLAG="--no-site-file"
+#fi
+FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
+
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+
+# Install-info-altdir does not actually exist.
+# Maybe somebody will write it.
+if test -x /usr/sbin/install-info-altdir; then
+    echo install/${PACKAGE}: install Info links for ${FLAVOR}
+    install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz
+fi
+
+install -m 755 -d ${ELCDIR}
+cd ${ELDIR}
+FILES=`echo *.el`
+cp ${FILES} ${ELCDIR}
+cd ${ELCDIR}
+
+cat << EOF > path.el
+(setq load-path (cons "." load-path) byte-compile-warnings nil)
+EOF
+${FLAVOR} ${FLAGS} ${FILES}
+rm -f *.el path.el
+
+exit 0
diff --git a/t/tests/generic-dh-make-2008/debian/debian/emacsen-remove.ex b/t/tests/generic-dh-make-2008/debian/debian/emacsen-remove.ex
new file mode 100644
index 0000000..c48d194
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/emacsen-remove.ex
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+# /usr/lib/emacsen-common/packages/remove/generic-dh-make-2008
+
+FLAVOR=$1
+PACKAGE=generic-dh-make-2008
+
+if [ ${FLAVOR} != emacs ]; then
+    if test -x /usr/sbin/install-info-altdir; then
+        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/generic-dh-make-2008.info.gz
+    fi
+
+    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi
diff --git a/t/tests/generic-dh-make-2008/debian/debian/emacsen-startup.ex b/t/tests/generic-dh-make-2008/debian/debian/emacsen-startup.ex
new file mode 100644
index 0000000..b51657a
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/emacsen-startup.ex
@@ -0,0 +1,25 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50generic-dh-make-2008.el
+;; for the Debian generic-dh-make-2008 package
+;;
+;; Originally contributed by Nils Naumann <naumann@unileoben.ac.at>
+;; Modified by Dirk Eddelbuettel <edd@debian.org>
+;; Adapted for dh-make by Jim Van Zandt <jrv@debian.org>
+
+;; The generic-dh-make-2008 package follows the Debian/GNU Linux 'emacsen' policy and
+;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
+;; xemacs19, emacs20, xemacs20...).  The compiled code is then
+;; installed in a subdirectory of the respective site-lisp directory.
+;; We have to add this to the load-path:
+(let ((package-dir (concat "/usr/share/"
+                           (symbol-name flavor)
+                           "/site-lisp/generic-dh-make-2008")))
+;; If package-dir does not exist, the generic-dh-make-2008 package must have
+;; removed but not purged, and we should skip the setup.
+  (when (file-directory-p package-dir)
+        (setq load-path (cons package-dir load-path))
+       (autoload 'generic-dh-make-2008-mode "generic-dh-make-2008-mode"
+         "Major mode for editing generic-dh-make-2008 files." t)
+       (add-to-list 'auto-mode-alist '("\\.generic-dh-make-2008$" . generic-dh-make-2008-mode))))
+
diff --git a/t/tests/generic-dh-make-2008/debian/debian/generic-dh-make-2008.default.ex b/t/tests/generic-dh-make-2008/debian/debian/generic-dh-make-2008.default.ex
new file mode 100644
index 0000000..d770c6e
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/generic-dh-make-2008.default.ex
@@ -0,0 +1,10 @@
+# Defaults for generic-dh-make-2008 initscript
+# sourced by /etc/init.d/generic-dh-make-2008
+# installed at /etc/default/generic-dh-make-2008 by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=""
diff --git a/t/tests/generic-dh-make-2008/debian/debian/generic-dh-make-2008.doc-base.EX b/t/tests/generic-dh-make-2008/debian/debian/generic-dh-make-2008.doc-base.EX
new file mode 100644
index 0000000..3b966d1
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/generic-dh-make-2008.doc-base.EX
@@ -0,0 +1,22 @@
+Document: generic-dh-make-2008
+Title: Debian generic-dh-make-2008 Manual
+Author: <insert document author here>
+Abstract: This manual describes what generic-dh-make-2008 is
+ and how it can be used to
+ manage online manuals on Debian systems.
+Section: unknown
+
+Format: debiandoc-sgml
+Files: /usr/share/doc/generic-dh-make-2008/generic-dh-make-2008.sgml.gz
+
+Format: postscript
+Files: /usr/share/doc/generic-dh-make-2008/generic-dh-make-2008.ps.gz
+
+Format: text
+Files: /usr/share/doc/generic-dh-make-2008/generic-dh-make-2008.text.gz
+
+Format: HTML
+Index: /usr/share/doc/generic-dh-make-2008/html/index.html
+Files: /usr/share/doc/generic-dh-make-2008/html/*.html
+
+
diff --git a/t/tests/generic-dh-make-2008/debian/debian/init.d.ex b/t/tests/generic-dh-make-2008/debian/debian/init.d.ex
new file mode 100644
index 0000000..b464594
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/init.d.ex
@@ -0,0 +1,157 @@
+#! /bin/sh
+#
+# skeleton	example file to build /etc/init.d/ scripts.
+#		This file should be used to construct scripts for /etc/init.d.
+#
+#		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
+#		Modified for Debian
+#		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
+#               Further changes by Javier Fernandez-Sanguino <jfs@debian.org>
+#
+# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels@cistron.nl
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/generic-dh-make-2008
+NAME=generic-dh-make-2008
+DESC=generic-dh-make-2008
+
+test -x $DAEMON || exit 0
+
+LOGDIR=/var/log/generic-dh-make-2008
+PIDFILE=/var/run/$NAME.pid
+DODTIME=1                   # Time to wait for the server to die, in seconds
+                            # If this value is set too low you might not
+                            # let some servers to die gracefully and
+                            # 'restart' will not work
+
+# Include generic-dh-make-2008 defaults if available
+if [ -f /etc/default/generic-dh-make-2008 ] ; then
+	. /etc/default/generic-dh-make-2008
+fi
+
+set -e
+
+running_pid()
+{
+    # Check if a given process pid's cmdline matches a given name
+    pid=$1
+    name=$2
+    [ -z "$pid" ] && return 1
+    [ ! -d /proc/$pid ] &&  return 1
+    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
+    # Is this the expected child?
+    [ "$cmd" != "$name" ] &&  return 1
+    return 0
+}
+
+running()
+{
+# Check if the process is running looking at /proc
+# (works for all users)
+
+    # No pidfile, probably no daemon present
+    [ ! -f "$PIDFILE" ] && return 1
+    # Obtain the pid and check it against the binary name
+    pid=`cat $PIDFILE`
+    running_pid $pid $DAEMON || return 1
+    return 0
+}
+
+force_stop() {
+# Forcefully kill the process
+    [ ! -f "$PIDFILE" ] && return
+    if running ; then
+        kill -15 $pid
+        # Is it really dead?
+        [ -n "$DODTIME" ] && sleep "$DODTIME"s
+        if running ; then
+            kill -9 $pid
+            [ -n "$DODTIME" ] && sleep "$DODTIME"s
+            if running ; then
+                echo "Cannot kill $LABEL (pid=$pid)!"
+                exit 1
+            fi
+        fi
+    fi
+    rm -f $PIDFILE
+    return 0
+}
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+		--exec $DAEMON -- $DAEMON_OPTS
+        if running ; then
+            echo "$NAME."
+        else
+            echo " ERROR."
+        fi
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+		--exec $DAEMON
+	echo "$NAME."
+	;;
+  force-stop)
+	echo -n "Forcefully stopping $DESC: "
+        force_stop
+        if ! running ; then
+            echo "$NAME."
+        else
+            echo " ERROR."
+        fi
+	;;
+  #reload)
+	#
+	#	If the daemon can reload its config files on the fly
+	#	for example by sending it SIGHUP, do it here.
+	#
+	#	If the daemon responds to changes in its config file
+	#	directly anyway, make this a do-nothing entry.
+	#
+	# echo "Reloading $DESC configuration files."
+	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
+	#	/var/run/$NAME.pid --exec $DAEMON
+  #;;
+  force-reload)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart" except that it does nothing if the
+	#   daemon isn't already running.
+	# check wether $DAEMON is running. If so, restart
+	start-stop-daemon --stop --test --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON \
+	&& $0 restart \
+	|| exit 0
+	;;
+  restart)
+    echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON
+	[ -n "$DODTIME" ] && sleep $DODTIME
+	start-stop-daemon --start --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+	echo "$NAME."
+	;;
+  status)
+    echo -n "$LABEL is "
+    if running ;  then
+        echo "running"
+    else
+        echo " not running."
+        exit 1
+    fi
+    ;;
+  *)
+	N=/etc/init.d/$NAME
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/t/tests/generic-dh-make-2008/debian/debian/init.d.lsb.ex b/t/tests/generic-dh-make-2008/debian/debian/init.d.lsb.ex
new file mode 100644
index 0000000..b3559de
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/init.d.lsb.ex
@@ -0,0 +1,296 @@
+#!/bin/sh
+#
+# Example init.d script with LSB support.
+#
+# Please read this init.d carefully and modify the sections to
+# adjust it to the program you want to run.
+#
+# Copyright (c) 2007 Javier Fernandez-Sanguino <jfs@debian.org>
+#
+# This is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2,
+# or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License with
+# the Debian operating system, in /usr/share/common-licenses/GPL;  if
+# not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+#
+### BEGIN INIT INFO
+# Provides:          generic-dh-make-2008
+# Required-Start:    $network $local_fs
+# Required-Stop:
+# Should-Start:      $named
+# Should-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: <Enter a short description of the sortware>
+# Description:       <Enter a long description of the software>
+#                    <...>
+#                    <...>
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+DAEMON=/usr/sbin/generic-dh-make-2008 # Introduce the server's location here
+NAME=#PACKAGE              # Introduce the short server's name here
+DESC=#PACKAGE              # Introduce a short description here
+LOGDIR=/var/log/generic-dh-make-2008  # Log directory to use
+
+PIDFILE=/var/run/$NAME.pid
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+# Default options, these can be overriden by the information
+# at /etc/default/$NAME
+DAEMON_OPTS=""          # Additional options given to the server
+
+DIETIME=10              # Time to wait for the server to die, in seconds
+                        # If this value is set too low you might not
+                        # let some servers to die gracefully and
+                        # 'restart' will not work
+
+#STARTTIME=2             # Time to wait for the server to start, in seconds
+                        # If this value is set each time the server is
+                        # started (on start or restart) the script will
+                        # stall to try to determine if it is running
+                        # If it is not set and the server takes time
+                        # to setup a pid file the log message might 
+                        # be a false positive (says it did not start
+                        # when it actually did)
+                        
+LOGFILE=$LOGDIR/$NAME.log  # Server logfile
+#DAEMONUSER=generic-dh-make-2008   # Users to run the daemons as. If this value
+                        # is set start-stop-daemon will chuid the server
+
+# Include defaults if available
+if [ -f /etc/default/$NAME ] ; then
+	. /etc/default/$NAME
+fi
+
+# Use this if you want the user to explicitly set 'RUN' in
+# /etc/default/
+#if [ "x$RUN" != "xyes" ] ; then
+#    log_failure_msg "$NAME disabled, please adjust the configuration to your needs "
+#    log_failure_msg "and then set RUN to 'yes' in /etc/default/$NAME to enable it."
+#    exit 1
+#fi
+
+# Check that the user exists (if we set a user)
+# Does the user exist?
+if [ -n "$DAEMONUSER" ] ; then
+    if getent passwd | grep -q "^$DAEMONUSER:"; then
+        # Obtain the uid and gid
+        DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
+        DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
+    else
+        log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist."
+        exit 1
+    fi
+fi
+
+
+set -e
+
+running_pid() {
+# Check if a given process pid's cmdline matches a given name
+    pid=$1
+    name=$2
+    [ -z "$pid" ] && return 1
+    [ ! -d /proc/$pid ] &&  return 1
+    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
+    # Is this the expected server
+    [ "$cmd" != "$name" ] &&  return 1
+    return 0
+}
+
+running() {
+# Check if the process is running looking at /proc
+# (works for all users)
+
+    # No pidfile, probably no daemon present
+    [ ! -f "$PIDFILE" ] && return 1
+    pid=`cat $PIDFILE`
+    running_pid $pid $DAEMON || return 1
+    return 0
+}
+
+start_server() {
+# Start the process using the wrapper
+        if [ -z "$DAEMONUSER" ] ; then
+            start_daemon -p $PIDFILE $DAEMON -- $DAEMON_OPTS
+            errcode=$?
+        else
+# if we are using a daemonuser then change the user id
+            start-stop-daemon --start --quiet --pidfile $PIDFILE \
+                        --chuid $DAEMONUSER \
+                        --exec $DAEMON -- $DAEMON_OPTS
+            errcode=$?
+        fi
+	return $errcode
+}
+
+stop_server() {
+# Stop the process using the wrapper
+        if [ -z "$DAEMONUSER" ] ; then
+            killproc -p $PIDFILE $DAEMON
+            errcode=$?
+        else
+# if we are using a daemonuser then look for process that match
+            start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+                        --user $DAEMONUSER \
+                        --exec $DAEMON
+            errcode=$?
+        fi
+
+	return $errcode
+}
+
+reload_server() {
+    [ ! -f "$PIDFILE" ] && return 1
+    pid=pidofproc $PIDFILE # This is the daemon's pid
+    # Send a SIGHUP
+    kill -1 $pid
+    return $?
+}
+
+force_stop() {
+# Force the process to die killing it manually
+	[ ! -e "$PIDFILE" ] && return
+	if running ; then
+		kill -15 $pid
+	# Is it really dead?
+		sleep "$DIETIME"s
+		if running ; then
+			kill -9 $pid
+			sleep "$DIETIME"s
+			if running ; then
+				echo "Cannot kill $NAME (pid=$pid)!"
+				exit 1
+			fi
+		fi
+	fi
+	rm -f $PIDFILE
+}
+
+
+case "$1" in
+  start)
+	log_daemon_msg "Starting $DESC " "$NAME"
+        # Check if it's running first
+        if running ;  then
+            log_progress_msg "apparently already running"
+            log_end_msg 0
+            exit 0
+        fi
+        if start_server ; then
+            # NOTE: Some servers might die some time after they start,
+            # this code will detect this issue if STARTTIME is set
+            # to a reasonable value
+            [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
+            if  running ;  then
+                # It's ok, the server started and is running
+                log_end_msg 0
+            else
+                # It is not running after we did start
+                log_end_msg 1
+            fi
+        else
+            # Either we could not start it
+            log_end_msg 1
+        fi
+	;;
+  stop)
+        log_daemon_msg "Stopping $DESC" "$NAME"
+        if running ; then
+            # Only stop the server if we see it running
+			errcode=0
+            stop_server || errcode=$?
+            log_end_msg $errcode
+        else
+            # If it's not running don't do anything
+            log_progress_msg "apparently not running"
+            log_end_msg 0
+            exit 0
+        fi
+        ;;
+  force-stop)
+        # First try to stop gracefully the program
+        $0 stop
+        if running; then
+            # If it's still running try to kill it more forcefully
+            log_daemon_msg "Stopping (force) $DESC" "$NAME"
+			errcode=0
+            force_stop || errcode=$?
+            log_end_msg $errcode
+        fi
+	;;
+  restart|force-reload)
+        log_daemon_msg "Restarting $DESC" "$NAME"
+		errcode=0
+        stop_server || errcode=$?
+        # Wait some sensible amount, some server need this
+        [ -n "$DIETIME" ] && sleep $DIETIME
+        start_server || errcode=$?
+        [ -n "$STARTTIME" ] && sleep $STARTTIME
+        running || errcode=$?
+        log_end_msg $errcode
+	;;
+  status)
+
+        log_daemon_msg "Checking status of $DESC" "$NAME"
+        if running ;  then
+            log_progress_msg "running"
+            log_end_msg 0
+        else
+            log_progress_msg "apparently not running"
+            log_end_msg 1
+            exit 1
+        fi
+        ;;
+  # Use this if the daemon cannot reload
+  reload)
+        log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+        log_warning_msg "cannot re-read the config file (use restart)."
+        ;;
+  # And this if it cann
+  #reload)
+          #
+          # If the daemon can reload its config files on the fly
+          # for example by sending it SIGHUP, do it here.
+          #
+          # If the daemon responds to changes in its config file
+          # directly anyway, make this a do-nothing entry.
+          #
+          # log_daemon_msg "Reloading $DESC configuration files" "$NAME"
+          # if running ; then
+          #    reload_server
+          #    if ! running ;  then
+          # Process died after we tried to reload
+          #       log_progress_msg "died on reload"
+          #       log_end_msg 1
+          #       exit 1
+          #    fi
+          # else
+          #    log_progress_msg "server is not running"
+          #    log_end_msg 1
+          #    exit 1
+          # fi
+                                                                                    #;;
+
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/testset/manpages/program.1 b/t/tests/generic-dh-make-2008/debian/debian/manpage.1.ex
similarity index 82%
copy from testset/manpages/program.1
copy to t/tests/generic-dh-make-2008/debian/debian/manpage.1.ex
index 7464631..d67baa2 100644
--- a/testset/manpages/program.1
+++ b/t/tests/generic-dh-make-2008/debian/debian/manpage.1.ex
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH PROGRAM 1 "2007-06-18"
+.TH GENERIC-DH-MAKE-2008 SECTION "December 29, 2008"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,24 +16,24 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-program \- program to do something
+generic-dh-make-2008 \- program to do something
 .SH SYNOPSIS
-.B program
+.B generic-dh-make-2008
 .RI [ options ] " files" ...
 .br
 .B bar
 .RI [ options ] " files" ...
 .SH DESCRIPTION
 This manual page documents briefly the
-.B program
+.B generic-dh-make-2008
 and
 .B bar
 commands.
 .PP
 .\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics, 
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
 .\" respectively.
-\fBprogram\fP is a program that...
+\fBgeneric-dh-make-2008\fP is a program that...
 .SH OPTIONS
 These programs follow the usual GNU command line syntax, with long
 options starting with two dashes (`-').
@@ -53,7 +53,7 @@ The programs are documented fully by
 .IR "The Rise and Fall of a Fooish Bar" ,
 available via the Info system.
 .SH AUTHOR
-program was written by <upstream author>.
+generic-dh-make-2008 was written by <upstream author>.
 .PP
-This manual page was written by #USERNAME# <#EMAIL#>,
+This manual page was written by Russ Allbery <rra@debian.org>,
 for the Debian project (but may be used by others).
diff --git a/t/tests/generic-dh-make-2008/debian/debian/manpage.sgml.ex b/t/tests/generic-dh-make-2008/debian/debian/manpage.sgml.ex
new file mode 100644
index 0000000..26b3e0c
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/manpage.sgml.ex
@@ -0,0 +1,156 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
+  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>December 29, 2008</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
+  <!ENTITY dhemail     "<email>rra@debian.org</email>">
+  <!ENTITY dhusername  "Russ Allbery">
+  <!ENTITY dhucpackage "<refentrytitle>GENERIC-DH-MAKE-2008</refentrytitle>">
+  <!ENTITY dhpackage   "generic-dh-make-2008">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2003</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>program to do something</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>-e <replaceable>this</replaceable></option></arg>
+
+      <arg><option>--example <replaceable>that</replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> and <command>bar</command>
+      commands.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.
+      Instead, it has documentation in the &gnu;
+      <application>Info</application> format; see below.</para>
+
+    <para><command>&dhpackage;</command> is a program that...</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual &gnu; command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.  For a complete description, see the
+      <application>Info</application> files.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-h</option>
+          <option>--help</option>
+        </term>
+        <listitem>
+          <para>Show summary of options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>
+          <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version of program.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>bar (1), baz (1).</para>
+
+    <para>The programs are documented fully by <citetitle>The Rise and
+      Fall of a Fooish Bar</citetitle> available via the
+      <application>Info</application> system.</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+
diff --git a/t/tests/generic-dh-make-2008/debian/debian/manpage.xml.ex b/t/tests/generic-dh-make-2008/debian/debian/manpage.xml.ex
new file mode 100644
index 0000000..2d01c6f
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/manpage.xml.ex
@@ -0,0 +1,291 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+
+<!--
+
+`xsltproc -''-nonet \
+          -''-param man.charmap.use.subset "0" \
+          -''-param make.year.ranges "1" \
+          -''-param make.single.year.ranges "1" \
+          /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
+          manpage.xml'
+
+A manual page <package>.<section> will be generated. You may view the
+manual page with: nroff -man <package>.<section> | less'. A typical entry
+in a Makefile or Makefile.am is:
+
+DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+XP     = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
+
+manpage.1: manpage.xml
+        $(XP) $(DB2MAN) $<
+
+The xsltproc binary is found in the xsltproc package. The XSL files are in
+docbook-xsl. A description of the parameters you can use can be found in the
+docbook-xsl-doc-* packages. Please remember that if you create the nroff
+version in one of the debian/rules file targets (such as build), you will need
+to include xsltproc and docbook-xsl in your Build-Depends control field.
+Alternatively use the xmlto command/package. That will also automatically
+pull in xsltproc and docbook-xsl.
+
+Notes for using docbook2x: docbook2x-man does not automatically create the
+AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as
+<refsect1> ... </refsect1>.
+
+To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections
+read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be
+found in the docbook-xsl-doc-html package.
+
+Validation can be done using: `xmllint -''-noout -''-valid manpage.xml`
+
+General documentation about man-pages and man-page-formatting:
+man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "FIRSTNAME">
+  <!ENTITY dhsurname   "SURNAME">
+  <!-- dhusername could also be set to "&firstname; &surname;". -->  
+  <!ENTITY dhusername  "Russ Allbery">
+  <!ENTITY dhemail     "rra@debian.org">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1) and
+       http://www.tldp.org/HOWTO/Man-Page/q2.html. -->
+  <!ENTITY dhsection   "SECTION">
+  <!-- TITLE should be something like "User commands" or similar (see
+       http://www.tldp.org/HOWTO/Man-Page/q2.html). -->
+  <!ENTITY dhtitle     "generic-dh-make-2008 User Manual">
+  <!ENTITY dhucpackage "GENERIC-DH-MAKE-2008">
+  <!ENTITY dhpackage   "generic-dh-make-2008">
+]>
+
+<refentry>
+  <refentryinfo>
+    <title>&dhtitle;</title>
+    <productname>&dhpackage;</productname>
+    <authorgroup>
+      <author>
+       <firstname>&dhfirstname;</firstname>
+        <surname>&dhsurname;</surname>
+        <contrib>Wrote this manpage for the Debian system.</contrib>
+        <address>
+          <email>&dhemail;</email>
+        </address>
+      </author>
+    </authorgroup>
+    <copyright>
+      <year>2007</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    <legalnotice>
+      <para>This manual page was written for the Debian system
+        (but may be used by others).</para>
+      <para>Permission is granted to copy, distribute and/or modify this
+        document under the terms of the GNU General Public License,
+        Version 2 or (at your option) any later version published by
+        the Free Software Foundation.</para>
+      <para>On Debian systems, the complete text of the GNU General Public
+        License can be found in
+	<filename>/usr/share/common-licenses/GPL</filename>.</para>
+    </legalnotice>
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>&dhucpackage;</refentrytitle>
+    <manvolnum>&dhsection;</manvolnum>
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+    <refpurpose>program to do something</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <!-- These are several examples, how syntaxes could look -->
+      <arg choice="plain"><option>-e <replaceable>this</replaceable></option></arg>
+      <arg choice="opt"><option>--example=<parameter>that</parameter></option></arg>
+      <arg choice="opt">
+        <group choice="req">
+          <arg choice="plain"><option>-e</option></arg>
+          <arg choice="plain"><option>--example</option></arg>
+        </group>
+        <replaceable class="option">this</replaceable>
+      </arg>
+      <arg choice="opt">
+        <group choice="req">
+          <arg choice="plain"><option>-e</option></arg>
+          <arg choice="plain"><option>--example</option></arg>
+        </group>
+        <group choice="req">
+          <arg choice="plain"><replaceable>this</replaceable></arg>
+          <arg choice="plain"><replaceable>that</replaceable></arg>
+        </group>
+      </arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <!-- Normally the help and version options make the programs stop
+           right after outputting the requested information. -->
+      <group choice="opt">
+        <arg choice="plain">
+          <group choice="req">
+            <arg choice="plain"><option>-h</option></arg>
+            <arg choice="plain"><option>--help</option></arg>
+          </group>
+        </arg>
+        <arg choice="plain">
+          <group choice="req">
+            <arg choice="plain"><option>-v</option></arg>
+            <arg choice="plain"><option>--version</option></arg>
+          </group>
+        </arg>
+      </group>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1 id="description">
+    <title>DESCRIPTION</title>
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> and <command>bar</command>
+      commands.</para>
+    <para>This manual page was written for the Debian distribution
+      because the original program does not have a manual page.
+      Instead, it has documentation in the GNU <citerefentry>
+        <refentrytitle>info</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry> format; see below.</para>
+    <para><command>&dhpackage;</command> is a program that...</para>
+  </refsect1>
+  <refsect1 id="options">
+    <title>OPTIONS</title>
+    <para>The program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.  For a complete description, see the
+      <citerefentry>
+        <refentrytitle>info</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry> files.</para>
+    <variablelist>
+      <!-- Use the variablelist.term.separator and the
+           variablelist.term.break.after parameters to
+           control the term elements. -->
+      <varlistentry>
+        <term><option>-e <replaceable>this</replaceable></option></term>
+        <term><option>--example=<replaceable>that</replaceable></option></term>
+        <listitem>
+          <para>Does this and that.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-h</option></term>
+        <term><option>--help</option></term>
+        <listitem>
+          <para>Show summary of options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option></term>
+        <term><option>--version</option></term>
+        <listitem>
+          <para>Show version of program.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1 id="files">
+    <title>FILES</title>
+    <variablelist>
+      <varlistentry>
+        <term><filename>/etc/foo.conf</filename></term>
+        <listitem>
+          <para>The system-wide configuration file to control the
+            behaviour of <application>&dhpackage;</application>. See
+            <citerefentry>
+              <refentrytitle>foo.conf</refentrytitle>
+              <manvolnum>5</manvolnum>
+            </citerefentry> for further details.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><filename>${HOME}/.foo.conf</filename></term>
+        <listitem>
+          <para>The per-user configuration file to control the
+             behaviour of <application>&dhpackage;</application>. See
+             <citerefentry>
+               <refentrytitle>foo.conf</refentrytitle>
+               <manvolnum>5</manvolnum>
+             </citerefentry> for further details.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1 id="environment">
+    <title>ENVIONMENT</title>
+    <variablelist>
+      <varlistentry>
+        <term><envar>FOO_CONF</envar></term>
+        <listitem>
+          <para>If used, the defined file is used as configuration
+            file (see also <xref linkend="files"/>).</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1 id="diagnostics">
+    <title>DIAGNOSTICS</title>
+    <para>The following diagnostics may be issued
+      on <filename class="devicefile">stderr</filename>:</para>
+    <variablelist>
+      <varlistentry>
+        <term><errortext>Bad configuration file. Exiting.</errortext></term>
+        <listitem>
+          <para>The configuration file seems to contain a broken configuration
+            line. Use the <option>--verbose</option> option, to get more info.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para><command>&dhpackage;</command> provides some return codes, that can
+      be used in scripts:</para>
+    <segmentedlist>
+      <segtitle>Code</segtitle>
+      <segtitle>Diagnostic</segtitle>
+      <seglistitem>
+        <seg><errorcode>0</errorcode></seg>
+        <seg>Program exited successfully.</seg>
+      </seglistitem>
+      <seglistitem>
+        <seg><errorcode>1</errorcode></seg>
+        <seg>The configuration file seems to be broken.</seg>
+      </seglistitem>
+    </segmentedlist>
+  </refsect1>
+  <refsect1 id="bugs">
+    <!-- Or use this section to tell about upstream BTS. -->
+    <title>BUGS</title>
+    <para>The program is currently limited to only work
+      with the <package>foobar</package> library.</para>
+    <para>The upstreams <acronym>BTS</acronym> can be found
+      at <ulink url="http://bugzilla.foo.tld"/>.</para>
+  </refsect1>
+  <refsect1 id="see_also">
+    <title>SEE ALSO</title>
+    <!-- In alpabetical order. -->
+    <para><citerefentry>
+        <refentrytitle>bar</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>, <citerefentry>
+        <refentrytitle>baz</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>, <citerefentry>
+        <refentrytitle>foo.conf</refentrytitle>
+        <manvolnum>5</manvolnum>
+      </citerefentry></para>
+    <para>The programs are documented fully by <citetitle>The Rise and
+      Fall of a Fooish Bar</citetitle> available via the <citerefentry>
+        <refentrytitle>info</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry> system.</para>
+  </refsect1>
+</refentry>
+
diff --git a/t/tests/generic-dh-make-2008/debian/debian/menu.ex b/t/tests/generic-dh-make-2008/debian/debian/menu.ex
new file mode 100644
index 0000000..8a67e62
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/menu.ex
@@ -0,0 +1,2 @@
+?package(generic-dh-make-2008):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
+  title="generic-dh-make-2008" command="/usr/bin/generic-dh-make-2008"
diff --git a/testset/dh-test/debian/postinst b/t/tests/generic-dh-make-2008/debian/debian/postinst.ex
similarity index 95%
copy from testset/dh-test/debian/postinst
copy to t/tests/generic-dh-make-2008/debian/debian/postinst.ex
index 4f37c66..b5f5ca7 100644
--- a/testset/dh-test/debian/postinst
+++ b/t/tests/generic-dh-make-2008/debian/debian/postinst.ex
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for #PACKAGE#
+# postinst script for generic-dh-make-2008
 #
 # see: dh_installdeb(1)
 
diff --git a/t/tests/generic-dh-make-2008/debian/debian/postrm.ex b/t/tests/generic-dh-make-2008/debian/debian/postrm.ex
new file mode 100644
index 0000000..1d8a18a
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/postrm.ex
@@ -0,0 +1,39 @@
+#!/bin/sh
+# postrm script for generic-dh-make-2008
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/t/tests/generic-dh-make-2008/debian/debian/preinst.ex b/t/tests/generic-dh-make-2008/debian/debian/preinst.ex
new file mode 100644
index 0000000..3134ccf
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/preinst.ex
@@ -0,0 +1,37 @@
+#!/bin/sh
+# preinst script for generic-dh-make-2008
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/t/tests/generic-dh-make-2008/debian/debian/prerm.ex b/t/tests/generic-dh-make-2008/debian/debian/prerm.ex
new file mode 100644
index 0000000..4e5dd3f
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/prerm.ex
@@ -0,0 +1,40 @@
+#!/bin/sh
+# prerm script for generic-dh-make-2008
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/t/tests/generic-dh-make-2005/debian/debian/rules b/t/tests/generic-dh-make-2008/debian/debian/rules
similarity index 78%
copy from t/tests/generic-dh-make-2005/debian/debian/rules
copy to t/tests/generic-dh-make-2008/debian/debian/rules
index a9fc713..92aa2b1 100755
--- a/t/tests/generic-dh-make-2005/debian/debian/rules
+++ b/t/tests/generic-dh-make-2008/debian/debian/rules
@@ -9,15 +9,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DH_COMPAT=2
 
-CFLAGS = -Wall -g
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+
 
 configure: configure-stamp
 configure-stamp:
@@ -29,22 +23,22 @@ configure-stamp:
 
 build: build-stamp
 
-build-stamp: configure-stamp 
+build-stamp: configure-stamp  
 	dh_testdir
 
 	# Add here commands to compile the package.
-#	$(MAKE)
-	#docbook-to-man debian/dh-test.sgml > dh-test.1
+	$(MAKE)
+	#docbook-to-man debian/generic-dh-make-2008.sgml > generic-dh-make-2008.1
 
-	touch build-stamp
+	touch $@
 
-clean:
+clean: 
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
 	# Add here commands to clean up after the build process.
-	-$(MAKE) clean
+	$(MAKE) clean
 
 	dh_clean 
 
@@ -54,8 +48,8 @@ install: build
 	dh_clean -k 
 	dh_installdirs
 
-	# Add here commands to install the package into debian/dh-test.
-#	$(MAKE) install DESTDIR=$(CURDIR)/debian/dh-test
+	# Add here commands to install the package into debian/generic-dh-make-2008.
+	$(MAKE) DESTDIR=$(CURDIR)/debian/generic-dh-make-2008 install
 
 
 # Build architecture-independent files here.
@@ -64,7 +58,6 @@ binary-indep: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install
-	dh_testversion
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs 
@@ -77,18 +70,16 @@ binary-arch: build install
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
+#	dh_python
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
 	dh_installman
-#	dh_dhelp
-	dh_suidregister
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
 #	dh_perl
-#	dh_python
 #	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
diff --git a/t/tests/generic-dh-make-2008/debian/debian/watch.ex b/t/tests/generic-dh-make-2008/debian/debian/watch.ex
new file mode 100644
index 0000000..e62d18f
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/debian/debian/watch.ex
@@ -0,0 +1,23 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to examine a Webpage
+# <Webpage URL> <string match>
+#http://www.example.com/downloads.php generic-dh-make-2008-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/generic-dh-make-2008-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/generic-dh-make-2008-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to find new files on sourceforge, for devscripts >= 2.9
+# http://sf.net/generic-dh-make-2008/generic-dh-make-2008-(.*)\.tar\.gz
+
+# Uncomment to find new files on GooglePages
+# http://example.googlepages.com/foo.html generic-dh-make-2008-(.*)\.tar\.gz
diff --git a/t/tests/generic-dh-make-2008/pre_build b/t/tests/generic-dh-make-2008/pre_build
new file mode 100755
index 0000000..f7e3633
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/pre_build
@@ -0,0 +1,6 @@
+#!/bin/sh
+#
+# dh_make 0.46 only provides an example watch file, so remove the one that
+# is copied over from the template.
+
+rm -f "$1"/debian/watch
diff --git a/t/tests/generic-dh-make-2008/tags b/t/tests/generic-dh-make-2008/tags
new file mode 100644
index 0000000..f5f86d9
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/tags
@@ -0,0 +1,35 @@
+E: generic-dh-make-2008: description-is-dh_make-template
+E: generic-dh-make-2008: section-is-dh_make-template
+I: generic-dh-make-2008 source: debian-watch-file-is-missing
+I: generic-dh-make-2008: extended-description-is-probably-too-short
+I: generic-dh-make-2008: package-contains-empty-directory usr/bin/
+I: generic-dh-make-2008: package-contains-empty-directory usr/sbin/
+W: generic-dh-make-2008 source: bad-homepage <insert the upstream URL, if relevant>
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/cron.d.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/emacsen-install.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/emacsen-remove.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/emacsen-startup.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/generic-dh-make-2008.default.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/generic-dh-make-2008.doc-base.EX
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/init.d.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/init.d.lsb.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/manpage.1.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/manpage.sgml.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/manpage.xml.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/menu.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/postinst.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/postrm.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/preinst.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/prerm.ex
+W: generic-dh-make-2008 source: dh-make-template-in-source debian/watch.ex
+W: generic-dh-make-2008 source: out-of-date-standards-version 3.7.3 (current is 3.8.0)
+W: generic-dh-make-2008 source: superfluous-clutter-in-homepage <insert the upstream URL, if relevant>
+W: generic-dh-make-2008: bad-homepage <insert the upstream URL, if relevant>
+W: generic-dh-make-2008: copyright-contains-dh_make-todo-boilerplate
+W: generic-dh-make-2008: copyright-has-url-from-dh_make-boilerplate
+W: generic-dh-make-2008: copyright-lists-upstream-authors-with-dh_make-boilerplate
+W: generic-dh-make-2008: copyright-without-copyright-notice
+W: generic-dh-make-2008: new-package-should-close-itp-bug
+W: generic-dh-make-2008: readme-debian-contains-debmake-template
+W: generic-dh-make-2008: superfluous-clutter-in-homepage <insert the upstream URL, if relevant>
+W: generic-dh-make-2008: wrong-bug-number-in-closes l3:#nnnn
diff --git a/t/tests/generic-dh-make-2008/upstream/Makefile b/t/tests/generic-dh-make-2008/upstream/Makefile
new file mode 100644
index 0000000..4f762d8
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/upstream/Makefile
@@ -0,0 +1,4 @@
+# Stub Makefile that's just enough so that the default rules file doesn't
+# error out.
+
+clean install:
diff --git a/t/tests/generic-dh-make-2008/upstream/README b/t/tests/generic-dh-make-2008/upstream/README
new file mode 100644
index 0000000..6a3c009
--- /dev/null
+++ b/t/tests/generic-dh-make-2008/upstream/README
@@ -0,0 +1,13 @@
+dh_make 0.46 test
+=================
+
+This is the results of running dh_make 0.46 on an upstream tarball
+containing only this file.  It's a useful test for the various dh_make
+template and boilerplate tags, as well as many tags for ways of doing
+things dh_make used to promote but are now deprecated or old debhelper
+commands that are now deprecated.
+
+Please don't modify anything about the files in this package; instead, add
+new tags as needed when Lintian adds new checks.  This test case is
+intended to continue to be a test of Lintian's handling of old and
+template packages.

-- 
Debian package checker


Reply to: