r7034 - in /vdr/vdr/trunk/debian: changelog control linda/ make-special-vdr.sh vdr-shutdown

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Tue Jun 17 22:53:11 2008
New Revision: 7034

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7034
Log:
* Replaced usage of 'at' with 'nohupc -c "( command )" >/dev/null 2>&1 &'
* Removed debian/linda

Removed:
    vdr/vdr/trunk/debian/linda/
Modified:
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/control
    vdr/vdr/trunk/debian/make-special-vdr.sh
    vdr/vdr/trunk/debian/vdr-shutdown

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=7034&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Tue Jun 17 22:53:11 2008
@@ -1,8 +1,10 @@
-vdr (1.6.0-3) UNRELEASED; urgency=low
+vdr (1.6.0-3) unstable; urgency=low
 
   * Installing the pictures plugin now with vdr-plugin-examples
-
- -- Tobias Grimm <tg at e-tobi.net>  Sat, 14 Jun 2008 15:39:38 +0200
+  * Replaced usage of 'at' with 'nohupc -c "( command )" >/dev/null 2>&1 &'
+  * Removed debian/linda
+
+ -- Tobias Grimm <tg at e-tobi.net>  Wed, 18 Jun 2008 00:52:58 +0200
 
 vdr (1.6.0-2) unstable; urgency=low
 

Modified: vdr/vdr/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/control?rev=7034&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/control (original)
+++ vdr/vdr/trunk/debian/control Tue Jun 17 22:53:11 2008
@@ -13,7 +13,7 @@
 
 Package: vdr
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, psmisc, at
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, psmisc
 Recommends: lirc, ttf-bitstream-vera | ttf-freefont
 Provides: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
 Conflicts: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu, vdradmin (<< 3.4.3)

Modified: vdr/vdr/trunk/debian/make-special-vdr.sh
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/make-special-vdr.sh?rev=7034&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/make-special-vdr.sh (original)
+++ vdr/vdr/trunk/debian/make-special-vdr.sh Tue Jun 17 22:53:11 2008
@@ -438,11 +438,11 @@
 --- debian/commands.switch-vdr.conf  1970-01-01 00:00:00.000000000 +0000
 +++ debian/commands.switch-vdr.conf
 @@ -0,0 +1 @@
-+VDR-Standardversion starten : echo "/usr/lib/vdr${SPECIAL_VDR_SUFFIX}/ctvdr${SPECIAL_VDR_SUFFIX}wrapper --stop && /bin/sleep 5 && /usr/lib/vdr/ctvdrwrapper --restart" | at now
++VDR-Standardversion starten : nohup sh -c "( /usr/lib/vdr${SPECIAL_VDR_SUFFIX}/ctvdr${SPECIAL_VDR_SUFFIX}wrapper --stop && /bin/sleep 5 && /usr/lib/vdr/ctvdrwrapper --restart )" >/dev/null 2>&1 &
 --- debian/commands.switch-vdr${SPECIAL_VDR_SUFFIX}.conf  1970-01-01 00:00:00.000000000 +0000
 +++ debian/commands.switch-vdr${SPECIAL_VDR_SUFFIX}.conf
 @@ -0,0 +1 @@
-+VDR-Entwicklerversion vdr${SPECIAL_VDR_SUFFIX} starten : echo "/usr/lib/vdr/ctvdrwrapper --stop && /bin/sleep 5 && /usr/lib/vdr${SPECIAL_VDR_SUFFIX}/ctvdr${SPECIAL_VDR_SUFFIX}wrapper --restart" | at now
++VDR-Entwicklerversion vdr${SPECIAL_VDR_SUFFIX} starten : nohup sh -c "( /usr/lib/vdr/ctvdrwrapper --stop && /bin/sleep 5 && /usr/lib/vdr${SPECIAL_VDR_SUFFIX}/ctvdr${SPECIAL_VDR_SUFFIX}wrapper --restart )" >/dev/null 2>&1 &
 --- debian/vdr${SPECIAL_VDR_SUFFIX}.install
 +++ debian/vdr${SPECIAL_VDR_SUFFIX}.install
 @@ -0,0 +1,2 @@

Modified: vdr/vdr/trunk/debian/vdr-shutdown
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/vdr-shutdown?rev=7034&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/vdr-shutdown (original)
+++ vdr/vdr/trunk/debian/vdr-shutdown Tue Jun 17 22:53:11 2008
@@ -45,7 +45,7 @@
     if [ $TRY_AGAIN -gt 0 ]
     then
         $log "$shutdownhook requests to try again in $TRY_AGAIN minutes" 
-        echo "$svdrpsend \"HITK Power\" > /dev/null" | at now + $TRY_AGAIN minutes
+        nohup sh -c "( sleep $(( $TRY_AGAIN * 60 )) && $svdrpsend \"HITK Power\" )" >/dev/null 2>&1 & 
         osdmsg "Shutdown aborted. Retry in $TRY_AGAIN minutes." &
         exit 0
     fi