* merge trunk -14 changes

  * Fix update-exim4.conf.8 manpage
    * FILES section is no longer doubled
    * NAME is no longer multi-line
    * proper reference to ue4cc in FILES section
    * Thanks to Angus Mackenzie
  * debian/rules
    * allow buildbasepackages and extradaemonpackages to be set from
      the environment
    * fix buildbasepackages=no and extradaemonpackages which were
      broken due to the new -dev binary package
    * remove "" in various places, this is Make not shell
    * add optional debugging output for variables that are meant to be set
      externally
    * clean now unpatches first, otherwise clean fails because files
      are first deleted and then non-existing files are unpatched
    * take config.h from first non-light daemon package built instead
      of -heavy (we might not be building -heavy but still need -dev)
    * Thanks to Gerfried Fuchs for actually using these features and
      finding this bug group.
  * exim4.init: Now returns 0 when starting and daemon already
    running, and when stopping and daemon already stopped. This fixes LSB
    compliance. Thanks to Heiko Schlittermann. Closes: #404182


svn path=/exim/branches/experimental/; revision=1877

5 files changed, 60 insertions, 28 deletions

diff --git a/debian/changelog b/debian/changelog
index f28b19c..349208b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,32 @@ exim4 (4.65-1.0) UNRELEASED; urgency=low
   * Add upstream patch from
     http://www.exim.org/mail-archives/exim-users/Week-of-Mon-20070101/msg00063.html
     fixing integer handling
-
- -- Marc Haber <mh+debian-packages@zugschlus.de>  Wed,  3 Jan 2007 20:42:28 +0100
+  * merge trunk -14 changes
+  * Fix update-exim4.conf.8 manpage
+    * FILES section is no longer doubled
+    * NAME is no longer multi-line
+    * proper reference to ue4cc in FILES section
+    * Thanks to Angus Mackenzie
+  * debian/rules
+    * allow buildbasepackages and extradaemonpackages to be set from
+      the environment
+    * fix buildbasepackages=no and extradaemonpackages which were
+      broken due to the new -dev binary package
+    * remove "" in various places, this is Make not shell
+    * add optional debugging output for variables that are meant to be set
+      externally
+    * clean now unpatches first, otherwise clean fails because files
+      are first deleted and then non-existing files are unpatched
+    * take config.h from first non-light daemon package built instead
+      of -heavy (we might not be building -heavy but still need -dev)
+    * Thanks to Gerfried Fuchs for actually using these features and
+      finding this bug group.
+  * exim4.init: Now returns 0 when starting and daemon already
+    running, and when stopping and daemon already stopped. This fixes LSB
+    compliance. Thanks to Heiko Schlittermann. Closes: #404182
+
+
+ -- Marc Haber <mh+debian-packages@zugschlus.de>  Fri,  5 Jan 2007 15:57:08 +0100
 
 exim4 (4.65-1) experimental; urgency=low
 
diff --git a/debian/exim4-base.exim4.init b/debian/exim4-base.exim4.init
index cde3dee..b8995bb 100644
--- a/debian/exim4-base.exim4.init
+++ b/debian/exim4-base.exim4.init
@@ -90,28 +90,28 @@ start_exim()
     install -d -oDebian-exim -gDebian-exim -m750 /var/run/exim4
   case ${QUEUERUNNER} in
     combined)
-      $ENV start-stop-daemon --start --pidfile "$PIDFILE" \
+      $ENV start-stop-daemon --oknodo --start --pidfile "$PIDFILE" \
         --exec $DAEMON -- -bd -q${QFLAGS}${QUEUEINTERVAL} \
         ${COMMONOPTIONS} ${QUEUERUNNEROPTIONS} ${SMTPLISTENEROPTIONS}
       log_progress_msg "exim4"
       ;;
     separate)
-      $ENV start-stop-daemon --start --pidfile "$PIDFILE" \
+      $ENV start-stop-daemon --oknodo --start --pidfile "$PIDFILE" \
         --exec $DAEMON -- -bd ${SMTPLISTENEROPTIONS} ${COMMONOPTIONS}
       log_progress_msg "exim4_listener"
-      $ENV start-stop-daemon --start --pidfile "$QRPIDFILE" \
+      $ENV start-stop-daemon --oknodo --start --pidfile "$QRPIDFILE" \
         --exec $DAEMON -- -oP "$QRPIDFILE" \
         -q${QFLAGS}${QUEUEINTERVAL} ${QUEUERUNNEROPTIONS} ${COMMONOPTIONS}
       log_progress_msg "exim4_queuerunner"
       ;;
     queueonly)
-      $ENV start-stop-daemon --start --pidfile "$QRPIDFILE" \
+      $ENV start-stop-daemon --oknodo --start --pidfile "$QRPIDFILE" \
         --exec $DAEMON -- -oP "$QRPIDFILE" \
         -q${QFLAGS}${QUEUEINTERVAL} ${QUEUERUNNEROPTIONS} ${COMMONOPTIONS}
       log_progress_msg "exim4_queuerunner"
       ;;
     no|ppp)
-      $ENV start-stop-daemon --start --pidfile "$PIDFILE" \
+      $ENV start-stop-daemon --oknodo --start --pidfile "$PIDFILE" \
         --exec $DAEMON -- -bd ${SMTPLISTENEROPTIONS}
       log_progress_msg "exim4_listener"
       ;;
@@ -125,12 +125,12 @@ stop_exim()
 # we try to kill eximqr and exim SMTP listener, no matter what
 # ${QUEUERUNNER} is set to, we could have switched since starting.
   if [ -f "$QRPIDFILE" ]; then
-    start-stop-daemon --stop --pidfile "$QRPIDFILE" \
+    start-stop-daemon --stop --oknodo --pidfile "$QRPIDFILE" \
       --oknodo --retry 30 --exec $DAEMON
     log_progress_msg "exim4_queuerunner"
   fi
   if [ -f "$PIDFILE" ]; then
-    start-stop-daemon --stop --pidfile "$PIDFILE" \
+    start-stop-daemon --stop --oknodo --pidfile "$PIDFILE" \
       --oknodo --retry 30 --exec $DAEMON
     log_progress_msg "exim4_listener"
   fi
diff --git a/debian/exim4-dev.install b/debian/exim4-dev.install
index 41fb18b..71ec11d 100644
--- a/debian/exim4-dev.install
+++ b/debian/exim4-dev.install
@@ -1,4 +1,4 @@
 build-tree/src/local_scan.h usr/include/exim4
 build-tree/src/store.h usr/include/exim4
 build-tree/src/mytypes.h usr/include/exim4
-build-tree/build-exim4-daemon-heavy/config.h usr/include/exim4
+
diff --git a/debian/manpages/update-exim4.conf.8 b/debian/manpages/update-exim4.conf.8
index bcfe2bd..a850666 100644
--- a/debian/manpages/update-exim4.conf.8
+++ b/debian/manpages/update-exim4.conf.8
@@ -19,7 +19,6 @@
 .\" \(lqthis text is enclosed in double quotes\(rq
 .SH NAME
 update\-exim4.conf \- Generate exim4 configuration files.
-update\-exim4.conf.conf \- Configuration file for update-exim4.conf
 
 .SH SYNOPSIS
 .B update\-exim4.conf [\-v|\-\-verbose] [\-h|\-\-help] [\-\-keepcomments] [\-\-removecomments] [\-o|\-\-output file]
@@ -134,13 +133,6 @@ variable CFILEMODE. If CFILEMODE is neither set in
 Change this to 0640 if you are keeping sensitive information (LDAP credentials
 et. al.) in there.
 
-.SH FILES
-.B update\-exim4.conf
-manages these files:
-.TP
-.I /var/lib/exim4/config.autogenerated
-Exim's main configuration file
-
 .SH REPLACEMENT PATTERNS
 .B update\-exim4.conf
 know about these identifiers:
@@ -354,7 +346,13 @@ than us and has more experience in writing manual pages, any patches
 would be greatly appreciated.
 
 .SH FILES
-.BR /etc/exim4/update-exim4.conf.conf,
+.LP
+.TP
+.B /var/lib/exim4/config.autogenerated
+Exim's main configuration file
+.LP
+.TP
+.B /etc/exim4/update-exim4.conf.conf
 Configuration file being written by exim4-config maintainer scripts,
 which may be hand-edited, and is read as input by update-exim4.conf.
 
diff --git a/debian/rules b/debian/rules
index 587f1e7..660db94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,9 +30,13 @@ endif
 export CFLAGS
 
 # Which packages should we build?
+ifndef buildbasepackages
 buildbasepackages=yes
+endif
 
+ifndef extradaemonpackages
 extradaemonpackages=exim4-daemon-heavy
+endif
 # If you want to build a daemon with a configuration tailored to YOUR special
 # needs, call "fakeroot debian/rules unpack-configs", copy EDITME.exim4-light
 # to EDITME.exim4-custom and modify it. Please note that you _need_ to
@@ -69,16 +73,20 @@ basedaemonpackages=exim4-daemon-light
 combinedadbgpackage=exim4-base eximon4
 combinedidbgpackage=exim4-config exim4
 exim4dbg=exim4-dbg
+dhstripparm=--dbg-package=$(exim4dbg)
 exim4dev=exim4-dev
 extraadbgpackage=$(basedaemonpackages) $(extradaemonpackages)
 else
-basedaemonpackages=""
-combinedadbgpackage=""
-combinedidbgpackage=""
-exim4dbg=""
-exim4dev=""
+basedaemonpackages=
+combinedadbgpackage=
+combinedidbgpackage=
+exim4dbg=
+dhstripparm=
+exim4dev=
 extraadbgpackage=$(extradaemonpackages)
 endif
+#DEBUGOUT:=$(shell echo >&2 buildbasepackages $(buildbasepackages))
+#DEBUGOUT:=$(shell echo >&2 extradaemonpackages $(extradaemonpackages))
 
 # If you want to build with OpenSSL instead of GnuTLS, uncomment this
 # OPENSSL:=1
@@ -216,7 +224,7 @@ endif
 
 build: build-arch build-indep
 
-clean: cleanfiles unpatch
+clean: unpatch cleanfiles
 
 cleanfiles:
 	dh_testdir
@@ -351,7 +359,7 @@ ifeq ($(buildbasepackages),yes)
 	dh_installppp -i --name=exim4
 	dh_installman -i
 	dh_install -i
-	dh_strip $(dhcombinedidbgpackage) --dbg-package=$(exim4dbg)
+	dh_strip $(dhcombinedidbgpackage) $(dhstripparm)
 	#for pkg in $(extraidbgpackage); do \
 	#  dh_strip -p$$pkg --dbg-package=$${pkg}-dbg; \
 	#done
@@ -403,8 +411,10 @@ binary-arch: build $(install)
 #	dh_installinfo $(dhbuildpackages)
 #	dh_undocumented $(dhbuildpackages)
 	dh_installman $(dhbuildpackages)
-	dh_install $(dhbuildpackages)
-	dh_strip $(dhcombinedadbgpackage) --dbg-package=$(exim4dbg)
+	# install config.h from daemon package, but not from exim4-daemon-light
+	dh_install $(dhbuildpackages) $(shell ls -1 build-tree/build-exim4-daemon-*/config.h | grep -v build-tree/build-exim4-daemon-light/config.h) usr/include/exim4
+	dh_install -p exim4-dev $(shell ls -1 build-tree/build-exim4-daemon-*/config.h | grep -v build-tree/build-exim4-daemon-light/config.h) usr/include/exim4
+	dh_strip $(dhcombinedadbgpackage) $(dhstripparm)
 	for pkg in $(extraadbgpackage); do \
 	  dh_strip -p$$pkg --dbg-package=$${pkg}-dbg; \
 	done