* dh_make.1 uses correct orig file Closes: #487808

* cron.d.ex now checks -x Closes: #436241 * watch example for googlepages Closes: #447680 * Removed trailing whitespace Closes: #451479 * Updated debhelper compat to 7 Closes: #464949 * Fixed some problems in init.d.lsb.ex Closes: #485625 * Making init.d.lsb.ex more lsb correct Closes: #450898
SamB · Jun 27, 2008 · 651a0dc · 651a0dc
1 parent c6e833f
commit 651a0dc
Show file tree

Hide file tree

Showing 28 changed files with 86 additions and 75 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,8 +1,14 @@
 dh-make (0.46) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
-
- -- Craig Small <csmall@debian.org>  Fri, 09 May 2008 22:43:09 +1000
+  * dh_make.1 uses correct orig file Closes: #487808
+  * cron.d.ex now checks -x Closes: #436241
+  * watch example for googlepages Closes: #447680
+  * Removed trailing whitespace Closes: #451479
+  * Updated debhelper compat to 7 Closes: #464949
+  * Fixed some problems in init.d.lsb.ex Closes: #485625
+  * Making init.d.lsb.ex more lsb correct Closes:  #450898
+
+ -- Craig Small <csmall@debian.org>  Fri, 27 Jun 2008 20:47:50 +1000
 
 dh-make (0.45) unstable; urgency=low
 

diff --git a/debian/compat b/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: dh-make
 Section: devel
 Priority: optional
 Maintainer: Craig Small <csmall@debian.org>
-Build-Depends: debhelper  (>= 6)
+Build-Depends: debhelper  (>= 7)
 Standards-Version: 3.7.3
 
 Package: dh-make

diff --git a/dh_make b/dh_make
@@ -483,7 +483,7 @@ foreach $orig (@ORIG)
 }
 
 our ($CONFIG_STATUS, $CONFIGURE_STAMP, $PHONY_CONFIGURE, $CONFIGURE, $DPKG_ARCH, $INSTALL, $CLEAN, $CDBS_CLASS );
-our $BUILD_DEPS = 'debhelper (>= 6)';
+our $BUILD_DEPS = 'debhelper (>= 7)';
 if ($package_type eq "b") {
   $BUILD_DEPS = 'cdbs, '.$BUILD_DEPS;
 }

diff --git a/dh_make.1 b/dh_make.1
@@ -49,7 +49,7 @@ CDBS provides a sane set of default rules upon which packages can build.
 .SH ACTIONS PERFORMED
 Unless \-\-native was given, 
 .B dh_make
-makes sure a original source archive (<packagename>\-<version>.orig.tar.gz)
+makes sure a original source archive (<packagename>_<version>.orig.tar.gz)
 exists.
 If no such file exists, the file specified with \-f is copied in place.
 If no \-f is supplied either but \-\-createorig is, the current directory

diff --git a/lib/debian/compat b/lib/debian/compat
@@ -1 +1 @@
-6
+7
diff --git a/lib/debian/cron.d.ex b/lib/debian/cron.d.ex
@@ -1,4 +1,4 @@
 #
 # Regular cron jobs for the #PACKAGE# package
 #
-0 4	* * *	root	#PACKAGE#_maintenance
+0 4	* * *	root	[ -x /usr/bin/#PACKAGE#_maintenance ] && /usr/bin/#PACKAGE#_maintenance
diff --git a/lib/debian/emacsen-install.ex b/lib/debian/emacsen-install.ex
@@ -23,7 +23,7 @@ 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. 
+# 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}

diff --git a/lib/debian/init.d.ex b/lib/debian/init.d.ex
@@ -4,7 +4,7 @@
 #		This file should be used to construct scripts for /etc/init.d.
 #
 #		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
-#		Modified for Debian 
+#		Modified for Debian
 #		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
 #               Further changes by Javier Fernandez-Sanguino <jfs@debian.org>
 #
@@ -37,7 +37,7 @@ running_pid()
     # Check if a given process pid's cmdline matches a given name
     pid=$1
     name=$2
-    [ -z "$pid" ] && return 1 
+    [ -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?

diff --git a/lib/debian/init.d.lsb.ex b/lib/debian/init.d.lsb.ex
@@ -1,4 +1,4 @@
-#!/bin/sh 
+#!/bin/sh
 #
 # Example init.d script with LSB support.
 #
@@ -25,9 +25,9 @@
 ### BEGIN INIT INFO
 # Provides:          #PACKAGE#
 # Required-Start:    $network $local_fs
-# Required-Stop:     
+# Required-Stop:
 # Should-Start:      $named
-# Should-Stop:       
+# Should-Stop:
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: <Enter a short description of the sortware>
@@ -43,22 +43,22 @@ NAME=#PACKAGE              # Introduce the short server's name here
 DESC=#PACKAGE              # Introduce a short description here
 LOGDIR=/var/log/#PACKAGE#  # Log directory to use
 
-PIDFILE=/var/run/$NAME.pid 
+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 
+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
 
-#STARTIME=2             # Time to wait for the server to start, in seconds
+#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
@@ -76,7 +76,7 @@ if [ -f /etc/default/$NAME ] ; then
 	. /etc/default/$NAME
 fi
 
-# Use this if you want the user to explicitly set 'RUN' in 
+# 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 "
@@ -104,7 +104,7 @@ running_pid() {
 # Check if a given process pid's cmdline matches a given name
     pid=$1
     name=$2
-    [ -z "$pid" ] && return 1 
+    [ -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
@@ -126,8 +126,7 @@ running() {
 start_server() {
 # Start the process using the wrapper
         if [ -z "$DAEMONUSER" ] ; then
-            start-stop-daemon --start --quiet --pidfile $PIDFILE \
-                        --exec $DAEMON -- $DAEMON_OPTS
+            start_daemon -p $PIDFILE $DAEMON -- $DAEMON_OPTS
             errcode=$?
         else
 # if we are using a daemonuser then change the user id
@@ -142,8 +141,7 @@ start_server() {
 stop_server() {
 # Stop the process using the wrapper
         if [ -z "$DAEMONUSER" ] ; then
-            start-stop-daemon --stop --quiet --pidfile $PIDFILE \
-                        --exec $DAEMON
+            killproc -p $PIDFILE $DAEMON
             errcode=$?
         else
 # if we are using a daemonuser then look for process that match
@@ -158,7 +156,7 @@ stop_server() {
 
 reload_server() {
     [ ! -f "$PIDFILE" ] && return 1
-    pid=`cat $PIDFILE` # This is the daemon's pid
+    pid=pidofproc $PIDFILE # This is the daemon's pid
     # Send a SIGHUP
     kill -1 $pid
     return $?
@@ -214,8 +212,9 @@ case "$1" in
         log_daemon_msg "Stopping $DESC" "$NAME"
         if running ; then
             # Only stop the server if we see it running
-            stop_server
-            log_end_msg $?
+			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"
@@ -229,19 +228,21 @@ case "$1" in
         if running; then
             # If it's still running try to kill it more forcefully
             log_daemon_msg "Stopping (force) $DESC" "$NAME"
-            force_stop
-            log_end_msg $?
+			errcode=0
+            force_stop || errcode=$?
+            log_end_msg $errcode
         fi
 	;;
   restart|force-reload)
         log_daemon_msg "Restarting $DESC" "$NAME"
-        stop_server
+		errcode=0
+        stop_server || errcode=$?
         # Wait some sensible amount, some server need this
         [ -n "$DIETIME" ] && sleep $DIETIME
-        start_server
+        start_server || errcode=$?
         [ -n "$STARTTIME" ] && sleep $STARTTIME
-        running
-        log_end_msg $?
+        running || errcode=$?
+        log_end_msg $errcode
 	;;
   status)
 

diff --git a/lib/debian/manpage.1.ex b/lib/debian/manpage.1.ex
@@ -31,7 +31,7 @@ and
 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.
 \fB#PACKAGE#\fP is a program that...
 .SH OPTIONS

diff --git a/lib/debian/manpage.sgml.ex b/lib/debian/manpage.sgml.ex
@@ -8,7 +8,7 @@
 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
@@ -125,7 +125,7 @@ manpage.1: manpage.sgml
     <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 
+      the terms of the &gnu; General Public License, Version 2 any
 	  later version published by the Free Software Foundation.
     </para>
 	<para>

diff --git a/lib/debian/manpage.xml.ex b/lib/debian/manpage.xml.ex
@@ -20,7 +20,7 @@ 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

diff --git a/lib/debian/package.doc-base.EX b/lib/debian/package.doc-base.EX
@@ -19,4 +19,4 @@ Format: HTML
 Index: /usr/share/doc/#PACKAGE#/html/index.html
 Files: /usr/share/doc/#PACKAGE#/html/*.html
 
-  
+
diff --git a/lib/debianb/rules b/lib/debianb/rules
@@ -1,5 +1,5 @@
 #!/usr/bin/make -f
-  
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 #CDBS_CLASS#
 #PATCH_CLASS#

diff --git a/lib/debianb/watch.ex b/lib/debianb/watch.ex
@@ -6,7 +6,7 @@
 # Compulsory line, this is a version 3 file
 version=3
 
-# Uncomment to examine a Webpage 
+# Uncomment to examine a Webpage
 # <Webpage URL> <string match>
 #http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
 
@@ -19,4 +19,5 @@ version=3
 # Uncomment to find new files on sourceforge, for devscripts >= 2.9
 # http://sf.net/#PACKAGE#/#PACKAGE#-(.*)\.tar\.gz
 
-
+# Uncomment to find new files on GooglePages
+# http://example.googlepages.com/foo.html #PACKAGE#-(.*)\.tar\.gz
diff --git a/lib/debiank/control b/lib/debiank/control
@@ -13,7 +13,7 @@ Description: <insert up to 60 chars description> <insert long description, inden
 
 Package: #PACKAGE#-source
 Architecture: all
-Depends: module-assistant, debhelper (>= 5), make, bzip2
+Depends: module-assistant, debhelper (>= 7), make, bzip2
 Description: Source for the #PACKAGE# driver.
  This package provides the source code for the #PACKAGE# kernel modules.
  The #PACKAGE# package is also required in order to make use of these

diff --git a/lib/debiank/control.modules.in b/lib/debiank/control.modules.in
@@ -2,7 +2,7 @@ Source: #PACKAGE#
 Section: unknown
 Priority: optional
 Maintainer: #USERNAME# <#EMAIL#>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 7)
 Standards-Version: #POLICY#
 
 Package: #PACKAGE#-modules-_KVERS_

diff --git a/lib/debiank/rules b/lib/debiank/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper. 
+# Sample debian/rules that uses debhelper.
 # This file was originally written by Joey Hess and Craig Small.
 # As a special exception, when this file is copied by dh-make into a
 # dh-make output file, you may use that output file without restriction.
@@ -12,14 +12,14 @@
 # either dep/indep for things like common files or userspace components
 # needed for the kernel modules.
 
-# Uncomment this to turn on verbose mode. 
+# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 
 #DPKG_ARCH#
 
 # some default definitions, important!
-# 
+#
 # Name of the source package
 psource:=#PACKAGE#-source
 
@@ -51,9 +51,9 @@ MA_DIR ?= /usr/share/modass
 # The kdist_config target is called by make-kpkg modules_config and
 # by kdist* rules by dependency. It should configure the module so it is
 # ready for compilation (mostly useful for calling configure).
-# prep-deb-files from module-assistant creates the neccessary debian/ files 
+# prep-deb-files from module-assistant creates the neccessary debian/ files
 kdist_config: prep-deb-files
-  
+
 # the kdist_clean target is called by make-kpkg modules_clean and from
 # kdist* rules. It is responsible for cleaning up any changes that have
 # been made by the other kdist_commands (except for the .deb files created)

diff --git a/lib/debianl/watch.ex b/lib/debianl/watch.ex
@@ -6,7 +6,7 @@
 # Compulsory line, this is a version 3 file
 version=3
 
-# Uncomment to examine a Webpage 
+# Uncomment to examine a Webpage
 # <Webpage URL> <string match>
 #http://www.example.com/downloads.php #PACKAGE#-(.*)\.tar\.gz
 
@@ -19,4 +19,5 @@ version=3
 # Uncomment to find new files on sourceforge, for devscripts >= 2.9
 # http://sf.net/#PACKAGE#/#PACKAGE#-(.*)\.tar\.gz
 
-
+# Uncomment to find new files on GooglePages
+# http://example.googlepages.com/foo.html #PACKAGE#-(.*)\.tar\.gz
diff --git a/lib/debianm/rules b/lib/debianm/rules
@@ -23,14 +23,14 @@ export DH_OPTIONS
 
 #CONFIGURE#
 
-#Architecture 
+#Architecture
 build: build-arch build-indep
 
 build-arch: build-arch-stamp
 build-arch-stamp: #CONFIGURE_STAMP# #CONFIG_STATUS# #PATCH_STAMP#
 
 	# Add here commands to compile the arch part of the package.
-	#$(MAKE) 
+	#$(MAKE)
 	touch $@
 
 build-indep: build-indep-stamp
@@ -69,7 +69,7 @@ install-arch:
 	dh_clean -k -s#PRESERVE#
 	dh_installdirs -s
 
-	# Add here commands to install the arch part of the package into 
+	# Add here commands to install the arch part of the package into
 	# debian/tmp.
 	#INSTALL#
 
@@ -96,7 +96,7 @@ binary-common:
 	dh_installman
 	dh_link
 	dh_strip
-	dh_compress 
+	dh_compress
 	dh_fixperms
 #	dh_perl
 	dh_makeshlibs