r6469 - in /vdr/vdr/trunk/debian: README.Debian changelog config-loader.sh rules vdr.init

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

Author: tiber-guest
Date: Fri Mar 21 22:49:32 2008
New Revision: 6469

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=6469
Log:
* Instead of setting VFAT=1 at compile time, introduced a new
  configuration option in /etc/defautl/vdr (using VDR's 
  --vfat option), so that the VFAT support can be disabled 

Modified:
    vdr/vdr/trunk/debian/README.Debian
    vdr/vdr/trunk/debian/changelog
    vdr/vdr/trunk/debian/config-loader.sh
    vdr/vdr/trunk/debian/rules
    vdr/vdr/trunk/debian/vdr.init

Modified: vdr/vdr/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/README.Debian?rev=6469&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/README.Debian (original)
+++ vdr/vdr/trunk/debian/README.Debian Fri Mar 21 22:49:32 2008
@@ -41,12 +41,6 @@
     Set this to 1, to make VDR switch to the console specified in KEYB_TTY
     on startup.
 
-NONPTL=<0|1>
-
-    Default: 0
-
-    Change this to 1, if you want VDR to not use NPTL.
-
 PLUGIN_CHECK_PATCHLEVEL="<yes|no>"
 
     Default: "no"
@@ -90,7 +84,7 @@
 
     Username under which vdr will run. All plugins and commands invoked by VDR
     will be executed with this users rights.
-  
+
 VDR_CHARSET_OVERRIDE=<CHARSET>
 
     Default: not set
@@ -107,6 +101,15 @@
 
     Locale which is used when running vdr (Default is C, because vdr does 
     not run on systems where the default is UTF8 like on Etch)
+
+VFAT=<0|1>
+
+    Default: 1
+
+    This corresponds to VDR's --vfat option. If videos are stored on a VFAT file
+    system or a SAMBA share, VFAT should be set to 1. With VFAT=1, the encoding
+    and length of file names will be tweaked, so that it can be correctly stored
+    on VFAT file systems.
 
 VIDEO_DIR="<VIDEODIR>"
 

Modified: vdr/vdr/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/changelog?rev=6469&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/changelog (original)
+++ vdr/vdr/trunk/debian/changelog Fri Mar 21 22:49:32 2008
@@ -45,6 +45,9 @@
   * Added support for VDR_CHARSET_OVERRIDE=<CHARSET> in /etc/default/vdr
   * Made vdrleaktest and debugvdr explicitly using bash, because
     commands-loader.sh and plugin-loader.sh contain bashisms
+  * Instead of setting VFAT=1 at compile time, introduced a new
+    configuration option in /etc/defautl/vdr (using VDR's 
+    --vfat option), so that the VFAT support can be disabled 
 
   [ Thomas Günther ]
   * Adapted 04_newplugin.dpatch

Modified: vdr/vdr/trunk/debian/config-loader.sh
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/config-loader.sh?rev=6469&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/config-loader.sh (original)
+++ vdr/vdr/trunk/debian/config-loader.sh Fri Mar 21 22:49:32 2008
@@ -68,4 +68,7 @@
 [ -z "$LANG" ] && LANG="C"
 VDR_LANG=$LANG
 
+# Enable VFAT file system support by default
+VFAT=1
+
 test -f /etc/default/vdr && . /etc/default/vdr

Modified: vdr/vdr/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/rules?rev=6469&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/rules (original)
+++ vdr/vdr/trunk/debian/rules Fri Mar 21 22:49:32 2008
@@ -27,7 +27,7 @@
 MANPAGES = debian/vdrdbg-buildpackage.1 debian/debugvdr.1 debian/vdr-dbg.1 \
            debian/vdrleaktest.1
 
-MAKE_OPTIONS = VFAT=1 REMOTE=LIRC CONFDIR=/var/lib/vdr LOCDIR=/usr/share/locale \
+MAKE_OPTIONS = REMOTE=LIRC CONFDIR=/var/lib/vdr LOCDIR=/usr/share/locale \
                VIDEODIR=/var/lib/video.00 PLUGINLIBDIR=/usr/lib/vdr/plugins
 
 %.1: %.1.xml

Modified: vdr/vdr/trunk/debian/vdr.init
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr/trunk/debian/vdr.init?rev=6469&op=diff
==============================================================================
--- vdr/vdr/trunk/debian/vdr.init (original)
+++ vdr/vdr/trunk/debian/vdr.init Fri Mar 21 22:49:32 2008
@@ -34,6 +34,7 @@
 
 . /usr/lib/vdr/plugin-loader.sh
 . /usr/lib/vdr/commands-loader.sh
+
 
 clean_console()
 {
@@ -79,6 +80,11 @@
             mergecommands "commands"
             mergecommands "reccmds"
             configure_console_input
+
+            if [ "$VFAT" == "1" ]; then
+                $OPTIONS="--vfat $OPTIONS"
+            fi
+
             start-stop-daemon --start --quiet --startas $DAEMON --background \
                 --name $(basename $DAEMON) --pidfile $PIDFILE --make-pidfile -- \
                 -v $VIDEO_DIR -c $CFG_DIR -L $PLUGIN_DIR -r $REC_CMD \