r349 - in vdr/vdr-xxv/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2005-03-28 17:10:02 +0000 (Mon, 28 Mar 2005)
New Revision: 349

Removed:
   vdr/vdr-xxv/trunk/debian/patches/03_empty-pid-file.dpatch
Modified:
   vdr/vdr-xxv/trunk/debian/dirs
   vdr/vdr-xxv/trunk/debian/init
   vdr/vdr-xxv/trunk/debian/patches/00list
   vdr/vdr-xxv/trunk/debian/postinst
Log:
xxv: use own subdir in /var/run

Modified: vdr/vdr-xxv/trunk/debian/dirs
===================================================================
--- vdr/vdr-xxv/trunk/debian/dirs	2005-03-28 17:02:07 UTC (rev 348)
+++ vdr/vdr-xxv/trunk/debian/dirs	2005-03-28 17:10:02 UTC (rev 349)
@@ -2,3 +2,4 @@
 var/cache/vdr-xxv/doc
 var/cache/vdr-xxv/preview
 var/log/vdr-xxv
+var/run/vdr-xxv

Modified: vdr/vdr-xxv/trunk/debian/init
===================================================================
--- vdr/vdr-xxv/trunk/debian/init	2005-03-28 17:02:07 UTC (rev 348)
+++ vdr/vdr-xxv/trunk/debian/init	2005-03-28 17:10:02 UTC (rev 349)
@@ -39,7 +39,7 @@
 #
 CONFIGFILE="/var/lib/vdr-xxv/xxvd.cfg"
 LOGFILE="/var/log/vdr-xxv/xxvd.log"
-PIDFILE="/var/run/xxvd.pid"
+PIDFILE="/var/run/vdr-xxv/xxvd.pid"
 LOCALEDIR="/usr/share/locale/"
 MODULEDIR="/usr/share/perl5/vdr-xxv/XXV/MODULES/*.pm"
 DOCUDIR="/var/cache/vdr-xxv/doc/"
@@ -75,8 +75,6 @@
 start()
 {
     create_grabdir
-    touch $PIDFILE
-    chown xxv $PIDFILE
     XXV_GRABDIR=$XXV_GRABDIR start-stop-daemon --start --pidfile $PIDFILE \
       --nicelevel 19 -c $USER:$GROUP --exec $DAEMON -- $COMMANDLINE
 }
@@ -88,7 +86,6 @@
 stop()
 {
     start-stop-daemon --stop -q -o --pidfile $PIDFILE
-    rm -f $PIDFILE
 }
 
 

Modified: vdr/vdr-xxv/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/00list	2005-03-28 17:02:07 UTC (rev 348)
+++ vdr/vdr-xxv/trunk/debian/patches/00list	2005-03-28 17:10:02 UTC (rev 349)
@@ -1,4 +1,3 @@
 01_libpath
 02_secure-grab
-03_empty-pid-file
 04_mplayer-log

Deleted: vdr/vdr-xxv/trunk/debian/patches/03_empty-pid-file.dpatch
===================================================================
--- vdr/vdr-xxv/trunk/debian/patches/03_empty-pid-file.dpatch	2005-03-28 17:02:07 UTC (rev 348)
+++ vdr/vdr-xxv/trunk/debian/patches/03_empty-pid-file.dpatch	2005-03-28 17:10:02 UTC (rev 349)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_empty-pid-file.dpatch by Tobias Grimm <tg@e-tobi.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allow empty pid file.
-
-@DPATCH@
-diff -urNad vdr-xxv-0.20/bin/xxvd /tmp/dpep.JuRFuC/vdr-xxv-0.20/bin/xxvd
---- vdr-xxv-0.20/bin/xxvd	2005-03-28 14:21:59.000000000 +0200
-+++ /tmp/dpep.JuRFuC/vdr-xxv-0.20/bin/xxvd	2005-03-28 14:27:05.000000000 +0200
-@@ -107,8 +107,11 @@
- 
- # PID and forking stuff
- if(! $killer and -e $PATHS->{PIDFILE}) {
--    printf "Sorry, but xxvd is running with PID %s !\n", load_file($PATHS->{PIDFILE});
--    exit(1);
-+    my $loaded_pid = load_file($PATHS->{PIDFILE});
-+    if ($loaded_pid) {
-+        printf "Sorry, but xxvd is running with PID %s !\n", $loaded_pid;
-+        exit(1);
-+    }
- } elsif($killer and ! -e $PATHS->{PIDFILE}) {
-     printf "PID File %s is not exist!\n", $PATHS->{PIDFILE};
-     &quit;

Modified: vdr/vdr-xxv/trunk/debian/postinst
===================================================================
--- vdr/vdr-xxv/trunk/debian/postinst	2005-03-28 17:02:07 UTC (rev 348)
+++ vdr/vdr-xxv/trunk/debian/postinst	2005-03-28 17:10:02 UTC (rev 349)
@@ -195,6 +195,7 @@
         chown -R xxv:xxv /var/cache/vdr-xxv/doc
         chown -R xxv:xxv /var/cache/vdr-xxv/preview
         chown -R xxv:xxv /var/log/vdr-xxv
+        chown -R xxv:xxv /var/run/vdr-xxv
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
     ;;