[SCM] vdr packaging repository branch, e-tobi, updated. debian/2.0.0-1_etobi1-4-g52d39d7

Mon Apr 1 18:52:19 UTC 2013

The following commit has been merged in the e-tobi branch:
commit 52d39d76a35b9e862de10d81d2a0fbb3efbac897
Merge: cee9e7f7a704eade8c9e07ea06818782f19688f0 d48892fff50690458c566288a423d12fe262a6c3
Author: etobi <git at e-tobi.net>
Date:   Mon Apr 1 20:20:32 2013 +0200

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/.vdr-patches
    	debian/patches/99_ncursesw-include.patch
    	debian/vdr.init

diff --combined debian/.vdr-patches
index a913ad3,3a919db..91fcb39

--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@@ -1,10 -1,4 +1,10 @@@
- debian/patches/opt-41-x_timer-info.patch:415aa18fc7f2400f5001a7b214c04164
- debian/patches/12_osdbase-maxitems.patch:2453ebb246e91f62943386e196a8233b
- debian/patches/opt-45_yaepg.patch:a028d6cbd970660a72241b5948a46f0c
--debian/patches/04_newplugin.patch:be5169037184e60fe7265891bb8f9f94
- debian/patches/opt-27_ttxtsubs.patch:d105f6fbc5856b79b1d0333eae5ec5ad
- debian/patches/opt-42-x_MainMenuHooks.patch:2c6b1286d4650bb14ee57d4031e5eaef
--debian/patches/06_default_svdrp_port_0.patch:57814ddbe49c8dbdd22d14904de5051c
- debian/patches/opt-50_graphtft.patch:fe8641710911991092edaafebd9df7ee
- debian/patches/opt-37-x_menuorg.patch:e2d361e7c65a95d190254728845b7ba8
- debian/patches/99_ncursesw-include.patch:a1a84fdba449583cb1759209419a413a
 -debian/patches/12_osdbase-maxitems.patch:2453ebb246e91f62943386e196a8233b
++debian/patches/opt-41-x_timer-info.patch:8df0fefa8fb9dff3448d6bd3633d7b4e
++debian/patches/12_osdbase-maxitems.patch:3b1184fcb109593c63686108c895fcec
++debian/patches/opt-45_yaepg.patch:d518e012e4a8164246be5ea4135b614d
++debian/patches/04_newplugin.patch:22a72799db5051ed0ef08b0770a5e6f0
++debian/patches/opt-27_ttxtsubs.patch:0cfb2e3a8ea41249af28a3733c703809
++debian/patches/opt-42-x_MainMenuHooks.patch:ef26bc79d45a2d32a3cb7b1589e9b652
++debian/patches/06_default_svdrp_port_0.patch:bb49194133b0487b1efe5619930d7af0
++debian/patches/opt-50_graphtft.patch:10a8dfc931180dfc13cf14e4f080b874
++debian/patches/opt-37-x_menuorg.patch:6dcb9013c5e2bf7d800d9c3b23b97c42
+ debian/patches/99_ncursesw-include.patch:9312525e87bdbb7181329cf7ff6c9c0c
diff --combined debian/README.Debian
index 19e0187,e40780b..17eadf3
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@@ -31,6 -31,16 +31,16 @@@ Additional configuration option
  
  The following options can be configured in /etc/default/vdr.
  
+ ENABLE_CORE_DUMPS=<0|1>
+ 
+     Default: 0
+ 
+     Set this to 1, to create core dumps when VDR crashes. If no specific
+     system-wide core dump location is specified, the core dump
+     will be created as /tmp/core.
+     The symbol files are located in the vdr-dbg and vdr-plugin-*-dbg
+     packages.
+ 
  KEYB_TTY="<CONSOLE>"
  
      Default: "" (No console input)
@@@ -78,14 -88,6 +88,14 @@@ USER=<USERNAME
      Username under which vdr will run. All plugins and commands invoked by VDR
      will be executed with the rights of this user.
  
 +LIRC=<lirc_device>
 +
 +    Default: /dev/lircd
 +
 +    Allows one to change the LIRC device or disable LIRC alltogether by
 +    setting it to /dev/null which might be required if you use a
 +    different frontend, like XBMC or xineliboutput.
 +
  VDR_CHARSET_OVERRIDE=<CHARSET>
  
      Default: not set
diff --combined debian/changelog
index 3582bc2,820c2c6..2fd7f4a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,20 +1,25 @@@
 -vdr (2.0.0-1) UNRELEASED; urgency=low
++vdr (2.0.0-1~etobi2) unstable; urgency=low
+ 
 -  * New upstream release
 -  * Dropped vdr-1.7.42-fixpendingtimers.diff - fixed upstream
+   * Added new config option ENABLE_CORE_DUMPS in /etc/default/vdr
+   * Append CPPFLAGS to CFLAGS, so this gets stored in vdr.pc
+     and can be used by plugins
+ 
 - -- Tobias Grimm <etobi at debian.org>  Sun, 31 Mar 2013 13:41:03 +0200
++ -- Tobias Grimm <etobi at debian.org>  Mon, 01 Apr 2013 20:19:46 +0200
++
 +vdr (2.0.0-1~etobi1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Dropped vdr-1.7.42-fixpendingtimers.diff - fixed upstream
  
 -vdr (1.7.42-2) unstable; urgency=low
 + -- Tobias Grimm <etobi at debian.org>  Sun, 31 Mar 2013 13:45:00 +0200
 +
 +vdr (1.7.42-2~etobi1) unstable; urgency=low
  
    * Added vdr-1.7.42-fixpendingtimers.diff
  
   -- Tobias Grimm <etobi at debian.org>  Tue, 26 Mar 2013 21:52:54 +0100
  
 -vdr (1.7.42-1) unstable; urgency=low
 +vdr (1.7.42-1~etobi1) unstable; urgency=low
  
    * New upstream release
    * Standards-Version: 3.9.4
@@@ -19,7 -22,7 +27,7 @@@
  
   -- Tobias Grimm <etobi at debian.org>  Sat, 23 Mar 2013 21:17:06 +0100
  
 -vdr (1.7.41-1) unstable; urgency=low
 +vdr (1.7.41-1~etobi1) unstable; urgency=low
  
    * New upstream release
    * Improved plugin loading now allows one to explicitly load specific plugins
@@@ -30,17 -33,7 +38,17 @@@
  
   -- Tobias Grimm <etobi at debian.org>  Sun, 17 Mar 2013 19:06:49 +0100
  
 -vdr (1.7.40-1) unstable; urgency=low
 +vdr (1.7.40-1~etobi1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Updated ttxtsubs patch from ttxtsubs plugin version 0.3.0
 +  * Delete /var/lib/vdr/channels.conf(.terr|.cable) in postrm
 +  * Clean up /var/lib/vdr/themes when purging package
 +  * vdr-dbg and vdr-plugin-*-dbg now install the debug symbols
 +
 + -- Tobias Grimm <etobi at debian.org>  Sun, 10 Mar 2013 18:42:30 +0100
 +
 +vdr (1.7.39-1~etobi1) unstable; urgency=low
  
    * New upstream release
    * Dropped 11_sortrecordings.patch - The recording list sorting now is as it is
@@@ -51,13 -44,10 +59,13 @@@
    * Dropped Added 16_channels.conf.terr-fix.patch - fixed upstream
    * Switch to debhelper/compat 9
    * Make use of dh and VDR's install target to simplify debian/rules
 -  * Clean up /var/lib/vdr/themes when purging package
 -  * vdr-dbg and vdr-plugin-*-dbg now install the debug symbols
 +  * Refreshed the patches and dropped the following ones:
 +    - opt-20_liemikuutio.patch
 +    - opt-22-x_edit_marks.patch
 +    - opt-24_jumpplay.patch
 +    - opt-50_graphtft-liemikuutio.patch
  
 - -- Tobias Grimm <etobi at debian.org>  Wed, 23 Jan 2013 22:47:45 +0100
 + -- Tobias Grimm <etobi at debian.org>  Sun, 03 Mar 2013 09:24:30 +0100
  
  vdr (1.7.28-1) unstable; urgency=low
  
diff --combined debian/vdr.init
index ba8a172,da5d265..daf1b37
--- a/debian/vdr.init
+++ b/debian/vdr.init
@@@ -83,17 -83,16 +83,22 @@@ startvdr(
                  OPTIONS="--vfat $OPTIONS"
              fi
  
 +            if [ -n "$LIRC" ]; then
 +                LIRC_OPT="--lirc=$LIRC"
 +            else
 +                LIRC_OPT="--lirc"
 +            fi
 +
-             start-stop-daemon --start --quiet --startas $DAEMON --background \
+             if [ "$ENABLE_CORE_DUMPS" == "1" ]; then
+                 ulimit -c unlimited
+                 OPTIONS="$OPTIONS --userdump"
 -            fi
+ 
++            fi
+             start-stop-daemon --start --quiet --startas $DAEMON --background -d /tmp \
                  --name $(basename $DAEMON) --pidfile $PIDFILE --make-pidfile -- \
                  -v $VIDEO_DIR -c $CFG_DIR -L $PLUGIN_DIR -r $REC_CMD \
                  -s $VDRSHUTDOWN -E $EPG_FILE -u $USER -g /tmp \
 -                --port $SVDRP_PORT $OPTIONS $PLUGINS $REDIRECT
 +                --port $SVDRP_PORT $LIRC_OPT $PLUGINS $OPTIONS $REDIRECT
          else
              echo -n " - seems to be running already"
          fi

-- 
vdr packaging repository

