diff -u tenshi-0.11/debian/control tenshi-0.11/debian/control --- tenshi-0.11/debian/control +++ tenshi-0.11/debian/control @@ -2,8 +2,10 @@ Section: admin Priority: optional Maintainer: Ignace Mouzannar -Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7) -Standards-Version: 3.8.3 +Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7) +Standards-Version: 3.9.1 +Vcs-Svn: svn://svn.debian.org/collab-maint/ext-maint/tenshi/trunk/ +Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/ext-maint/tenshi/trunk/ Homepage: http://dev.inversepath.com/trac/tenshi Package: tenshi diff -u tenshi-0.11/debian/rules tenshi-0.11/debian/rules --- tenshi-0.11/debian/rules +++ tenshi-0.11/debian/rules @@ -6,3 +5,0 @@ - -override_dh_installinit: - dh_installinit -R diff -u tenshi-0.11/debian/watch tenshi-0.11/debian/watch --- tenshi-0.11/debian/watch +++ tenshi-0.11/debian/watch @@ -1,10 +1,2 @@ -# 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 - -#monitor tenshi package http://dev.inversepath.com/download/tenshi/tenshi-((?!latest).*)\.tar\.gz diff -u tenshi-0.11/debian/changelog tenshi-0.11/debian/changelog --- tenshi-0.11/debian/changelog +++ tenshi-0.11/debian/changelog @@ -1,3 +1,34 @@ +tenshi (0.11-2) unstable; urgency=low + + * debian/control: + - Bumped Standards-Version to 3.9.1. + - Added Vcs-Svn and Vcs-Browser. + - Set debhelper dependency to (>= 7.0.8) as dh_overrides are not used by + debian/rules anymore. + * debian/postinst: + - Changed tenshi user home directory from /var/run/tenshi to + /var/lib/tenshi as files in /var/run are cleared at boot time. + This made the package upgrade from lenny to squeeze fail. + Thank you Lucas Nussbaum for spotting this issue. + (Closes: #605240, #606789) + * debian/patches: + - 20-manpage.diff: Added typo correction in manpage. + * debian/source: + - Added format file set to "1.0". + * debian/rules: + - Removed the dh_installinit override, in order to stop the tenshi script + before upgrading the package. This will be applicable during the next + upgrade. + * debian/preinst: + - Added this pre-installation script in order to stop the tenshi daemon + before starting the upgrade to the current release. This had to be + done as the -R flag was passed to dh_installinit in previous release. + * debian/postrm: + - Replaced deluser(8) with userdel(8) as adduser package is purged before + tenshi. Thank you Hideki Yamane for the patch. + + -- Ignace Mouzannar Mon, 20 Dec 2010 22:43:12 +0100 + tenshi (0.11-1) unstable; urgency=low * New maintainer. (Closes: #549956) diff -u tenshi-0.11/debian/postinst tenshi-0.11/debian/postinst --- tenshi-0.11/debian/postinst +++ tenshi-0.11/debian/postinst @@ -7,14 +7,19 @@ configure) if ! getent passwd tenshi 2>&1 >/dev/null; then # the account doesn't exist... time to create it - echo -n "Adding tenshi system user.." - adduser --quiet --system --group --home /var/run/tenshi tenshi - echo ".done" + echo "Adding tenshi system user ..." + adduser --quiet --system --group --home /var/lib/tenshi tenshi adduser --quiet tenshi adm + chown tenshi:root /var/lib/tenshi + elif getent passwd tenshi | grep "/var/run/tenshi" 2>&1 >/dev/null; then + # change the user's home directory to /var/lib/tenshi on + # previous installations + echo "Updating tenshi user's home directory ... " + usermod -d /var/lib/tenshi tenshi + chown tenshi:root /var/lib/tenshi fi chown tenshi:root /etc/tenshi/tenshi.conf - chown tenshi:root /var/run/tenshi ;; abort-upgrade|abort-remove|abort-deconfigure) diff -u tenshi-0.11/debian/postrm tenshi-0.11/debian/postrm --- tenshi-0.11/debian/postrm +++ tenshi-0.11/debian/postrm @@ -5,10 +5,10 @@ case "$1" in purge) - rm -rf /var/run/tenshi ||true + rm -rf /var/lib/tenshi ||true if getent passwd tenshi 2>&1 >/dev/null; then echo -n "Removing tenshi system user.." - deluser --quiet tenshi ||true + userdel tenshi echo ".done" fi diff -u tenshi-0.11/debian/patches/20-manpage.diff tenshi-0.11/debian/patches/20-manpage.diff --- tenshi-0.11/debian/patches/20-manpage.diff +++ tenshi-0.11/debian/patches/20-manpage.diff @@ -4,6 +4,15 @@ --- a/tenshi.8 +++ b/tenshi.8 +@@ -36,7 +36,7 @@ + + The program reads a configuration file + .RI ( tenshi.conf ) +-and then forks a deamon for monitoring the specified log files. ++and then forks a daemon for monitoring the specified log files. + + .SH OPTIONS + .SS @@ -62,7 +62,7 @@ and expects log lines to be fed to standard in. When it receives an EOF it will stop processing. No alerts will be sent in this mode, it is used solely for only in patch2: unchanged: --- tenshi-0.11.orig/debian/preinst +++ tenshi-0.11/debian/preinst @@ -0,0 +1,31 @@ +#! /bin/sh +# preinst script for tenshi + +set -e + +case "$1" in + install) + ;; + + upgrade) + if [ -x "/etc/init.d/tenshi" ]; then + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then + invoke-rc.d tenshi stop || exit $? + else + /etc/init.d/tenshi stop || exit $? + fi + fi + ;; + + abort-upgrade) + ;; + +*) + echo "preinst called with unknown argument '$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 only in patch2: unchanged: --- tenshi-0.11.orig/debian/source/format +++ tenshi-0.11/debian/source/format @@ -0,0 +1 @@ +1.0