Gidday,
I'd like to request a freeze exception for mythtv-status, for which I'm
both the upstream and the Debian maintainers. The latest version
(0.9.0-4) in Sid contains the following fixes to the one in Lenny. The
only substantial changes are in the init.d script.
* Don't abort the init.d sciprt if /var/run/motd is missing (which can
in turn abort dpkg if it is being installed)
* mythtv-status was changed to return a different exit code in some
circumstances and the init.d script in Lenny doesn't handle this
correctly, the init.d file needs to do the right thing.
I've attached the output from debdiff to this email.
Cheers!
PS. please CC me on any replies.
--
Andrew Ruthven, Wellington, New Zealand
At home: andrew@etc.gen.nz | This space intentionally
| left blank.
diff -wu mythtv-status-0.9.0/debian/mythtv-status.1 mythtv-status-0.9.0/debian/mythtv-status.1
--- mythtv-status-0.9.0/debian/mythtv-status.1
+++ mythtv-status-0.9.0/debian/mythtv-status.1
@@ -1,15 +1,7 @@
-.\" Automatically generated by Pod::Man 2.16 (Pod::Simple 3.07)
+.\" Automatically generated by Pod::Man 2.1801 (Pod::Simple 3.05)
.\"
.\" Standard preamble:
.\" ========================================================================
-.de Sh \" Subsection heading
-.br
-.if t .Sp
-.ne 5
-.PP
-\fB\\$1\fR
-.PP
-..
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
@@ -53,7 +45,7 @@
.el .ds Aq '
.\"
.\" If the F register is turned on, we'll generate index entries on stderr for
-.\" titles (.TH), headers (.SH), subsections (.Sh), items (.Ip), and index
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
.\" entries marked with X<> in POD. Of course, you'll have to process the
.\" output yourself in some meaningful fashion.
.ie \nF \{\
@@ -132,7 +124,7 @@
.\" ========================================================================
.\"
.IX Title "MYTHTV-STATUS 1"
-.TH MYTHTV-STATUS 1 "2008-07-22" "perl v5.10.0" "User Contributed Perl Documentation"
+.TH MYTHTV-STATUS 1 "2008-10-30" "perl v5.10.0" "User Contributed Perl Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff -wu mythtv-status-0.9.0/debian/changelog mythtv-status-0.9.0/debian/changelog
--- mythtv-status-0.9.0/debian/changelog
+++ mythtv-status-0.9.0/debian/changelog
@@ -1,3 +1,28 @@
+mythtv-status (0.9.0-4) unstable; urgency=medium
+
+ * It turns out that release 0.9.1 of mythtv-status snuck into
+ the 0.9.0-2 upload, back that out for now.
+
+ -- Andrew Ruthven <andrew@etc.gen.nz> Thu, 30 Oct 2008 13:55:01 +1300
+
+mythtv-status (0.9.0-3) unstable; urgency=medium
+
+ * If someone has removed /var/run/motd then tries to install (or
+ reinstall) this package, then it fails. We should make sure that
+ doesn't happen by making sure that /var/run/motd exists.
+ * Provide some sanity checking before updating the MOTD file in
+ the init.d script to make sure that mythtv-status didn't die.
+
+ -- Andrew Ruthven <andrew@etc.gen.nz> Tue, 28 Oct 2008 15:12:02 +1300
+
+mythtv-status (0.9.0-2) unstable; urgency=low
+
+ * The init.d script shouldn't check the return code anymore, as the
+ return code may be 1 if there are any warnings present. This
+ has been stopping the MOTD from being updated.
+
+ -- Andrew Ruthven <andrew@etc.gen.nz> Mon, 26 Sep 2008 09:16:53 +1200
+
mythtv-status (0.9.0-1) unstable; urgency=low
* New upstream release.
diff -wu mythtv-status-0.9.0/debian/init.d mythtv-status-0.9.0/debian/init.d
--- mythtv-status-0.9.0/debian/init.d
+++ mythtv-status-0.9.0/debian/init.d
@@ -57,15 +57,23 @@
case "$1" in
start|reload|refresh|restart|force-reload)
log_daemon_msg "Updating $DESC" "$NAME"
+
+ # Just incase someone has removed their motd file.
+ [ ! -f /var/run/motd ] && touch /var/run/motd
[ ! -f /var/run/motd.orig ] && cp /var/run/motd /var/run/motd.orig
cp /var/run/motd.orig /var/run/motd.new
- if $DAEMON $ARGS -h $HOST >> /var/run/motd.new
- then
+ set +e
+ $DAEMON $ARGS -h $HOST >> /var/run/motd.new 2> /dev/null
+ ret=$?
+ set -e
+ if [ $ret -eq 0 -o $ret -eq 1 ]; then
mv /var/run/motd.new /var/run/motd
- fi
log_end_msg 0
+ else
+ log_failure_msg
+ fi
;;
stop)
log_daemon_msg "Stopping $DESC" "$NAME"
Attachment:
signature.asc
Description: This is a digitally signed message part