merged patch from debian maintainer

diff --git a/debian/README.Debian b/debian/README.Debian
index 1ffd8f232c0d24c86695fdca43bd72646c170c20..79adfb4d2fc6bff8662d75810ec5fed6e38f61e5 100644 (file)
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,5 +1,4 @@
 fcron for Debian
-$Id: README.Debian,v 1.1 2004-01-29 10:32:15 thib Exp $
 -----------------------------------------------------------------
 
 While in principle this would be possible, the Debian package of fcron does

diff --git a/debian/changelog b/debian/changelog
index 24b9b38cbe57fec4f24409b18ca6021f3a3697f2..0f9038105371a28c428a872e93ddce00955d1d50 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+fcron (2.9.5-1) unstable; urgency=low
+
+  * New upstream version.
+
+  * Fix init script.
+    Closes: #262886
+
+  * Merged change from BSP.
+    Closes: #232986
+
+ -- Russell Coker <russell@coker.com.au>  Sun, 31 Oct 2004 05:39:00 +1100
+
+fcron (2.9.4-3.1) unstable; urgency=low
+
+  * NMU during BSP.
+  * ./configure uses now --with-sendmail without checks (closes: #232986).
+
+ -- Sebastian Muszynski <do2ksm@linkt.de>  Fri, 19 Mar 2004 16:54:57 +0100
+
+fcron (2.9.4-3) unstable; urgency=high
+
+  * Made it depend on exim4|mail-transport-agent.
+    Closes: #228570
+
+ -- Russell Coker <russell@coker.com.au>  Tue, 20 Jan 2004 17:36:00 +1100
+
 fcron (2.9.4-2) unstable; urgency=high
 
   * Accidentally uploaded a version compiled with debugging code, so this

diff --git a/debian/config b/debian/config
index 302a01ee47bc98ea5722787f290560701abe3b1a..51509a9bfc4bafab14b879e58a7ca636a30505e4 100644 (file)
--- a/debian/config
+++ b/debian/config
@@ -1,6 +1,5 @@
 #! /bin/sh
 # Debconf config file for fcron
-# $Id: config,v 1.1 2004-01-29 10:31:56 thib Exp $
 
 set -e
 . /usr/share/debconf/confmodule

diff --git a/debian/control b/debian/control
index 385ab708b834e44ae0d4f65bf26a87b8e14efc0b..43410771a8b54f9e39d0df6a2087ab256442bfb9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: fcron
 Section: admin
 Priority: extra
 Maintainer: Russell Coker <russell@coker.com.au>
-Build-Depends: debhelper (>= 4.1.16), mail-transport-agent, libpam0g-dev, libselinux1-dev (>= 1.2-1.1)
+Build-Depends: debhelper (>= 4.1.16), libpam0g-dev, libselinux1-dev (>= 1.2-1.1)
 Standards-Version: 3.5.9
 
 Package: fcron

diff --git a/debian/fcron-update-crontabs b/debian/fcron-update-crontabs
index 60f87f09d70f0b9c159b8b8408e9a5dac0816b2c..2d48ec6859e7ecb35f28b57f9c7278b310730a60 100644 (file)
--- a/debian/fcron-update-crontabs
+++ b/debian/fcron-update-crontabs
@@ -4,7 +4,6 @@
 #
 # Copyright (c) 2000 Thibault Godouet
 # Released under the same license as the fcron program.
-# $Id: fcron-update-crontabs,v 1.1 2004-01-29 10:31:24 thib Exp $
 
 fcrontabdir=/var/spool/fcron
 

diff --git a/debian/init b/debian/init
index d2eb1045738aead068daa9f231df23d7d5faf673..ec964660cd278574555101caada610ff96a802c3 100644 (file)
--- a/debian/init
+++ b/debian/init
@@ -10,7 +10,6 @@
 #              Modified for Debian GNU/Linux
 #              by Ian Murdock <imurdock@gnu.ai.mit.edu>.
 #
-# $Id: init,v 1.1 2004-01-29 10:31:05 thib Exp $
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/fcron
@@ -42,8 +41,8 @@ case "$1" in
        ;;
   reload|force-reload)
        echo "Reloading $DESC configuration files."
+       fcron-update-crontabs >/dev/null 2>&1
        stopdaemon --signal 1
-       update-fcron-crontabs >/dev/null 2>&1
        ;;
   restart)
        echo -n "Restarting $DESC: "

diff --git a/debian/postinst b/debian/postinst
index 51d48d86f54d04d6ac70ad54fb298fc9c51a32c6..ba244cb7b709e2bd91308c9ba0ea94188d94ad9a 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -1,6 +1,5 @@
 #! /bin/sh
 # postinst script for fcron
-# $Id: postinst,v 1.1 2004-01-29 10:31:51 thib Exp $
 
 set -e
 . /usr/share/debconf/confmodule

diff --git a/debian/postrm b/debian/postrm
index c517078358aa9e942683b263392ea934d4173342..d60f020e2c34b7ca24268e14d24740ca61e87d51 100644 (file)
--- a/debian/postrm
+++ b/debian/postrm
@@ -1,6 +1,5 @@
 #! /bin/sh
 # postrm script for fcron
-# $Id: postrm,v 1.1 2004-01-29 10:32:21 thib Exp $
 #
 # see: dh_installdeb(1)
 

diff --git a/debian/rules b/debian/rules
index 4d686313f4a5c0ff77fd170426de5f3c9a9cad55..38e786cd08093878758d841c44c50a4a00b25662 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 # Sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 # Modified for package fcron
-# $Id: rules,v 1.1 2004-01-29 10:31:20 thib Exp $
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1