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

[etobi]

The following commit has been merged in the e-tobi branch:
commit 5f2ad6d92998168105680b5a33aa5db4fdf6aefd
Merge: fd0af891b1b0681bb5dffec2f2090d9236092bd9 904ac0de268ef78da328081782439efbde50fbc2
Author: etobi <git at e-tobi.net>
Date:   Sat Mar 23 21:27:56 2013 +0100

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/.vdr-patches
    	debian/abi-version
    	debian/changelog

diff --combined debian/.vdr-patches
index 2e18138,b62dee9..a913ad3
--- 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:9c0f2bdcf5f05ae8f112bf2a31a63d91
+ debian/patches/06_default_svdrp_port_0.patch:57814ddbe49c8dbdd22d14904de5051c
 -debian/patches/12_osdbase-maxitems.patch:2453ebb246e91f62943386e196a8233b
 +debian/patches/opt-50_graphtft.patch:fe8641710911991092edaafebd9df7ee
 +debian/patches/opt-37-x_menuorg.patch:e2d361e7c65a95d190254728845b7ba8
  debian/patches/99_ncursesw-include.patch:a1a84fdba449583cb1759209419a413a
diff --combined debian/abi-version
index 26ae166,2d732ce..e76ed77
--- a/debian/abi-version
+++ b/debian/abi-version
@@@ -1,1 -1,1 +1,1 @@@
- vdr-abi-1.7.41-multipatch
 -vdr-abi-1.7.42-debian
++vdr-abi-1.7.42-multipatch
diff --combined debian/changelog
index b4ed535,82ea21f..ab9a3dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,12 +1,12 @@@
 -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
+   * Removed bugging message if shutdown is disabled (which is the default)
+ 
+  -- 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
@@@ -9,17 -17,7 +17,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
@@@ -30,13 -28,10 +38,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 721af09,ad2d0e0..ba8a172
--- a/debian/vdr.init
+++ b/debian/vdr.init
@@@ -28,7 -28,7 +28,7 @@@ test -x $VDRPRG || exit 
  
  # Set shutdown command
  test "$ENABLE_SHUTDOWN" = "1" && VDRSHUTDOWN="/usr/lib/vdr/vdr-shutdown.wrapper" \
-                               || VDRSHUTDOWN="/usr/lib/vdr/vdr-shutdown-message"
+                               || VDRSHUTDOWN=""
  
  . /usr/lib/vdr/plugin-loader.sh
  . /usr/lib/vdr/commands-loader.sh
@@@ -83,17 -83,11 +83,17 @@@ 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 \
                  --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
diff --combined debian/vdr.install
index 987a39c,5797592..1a4149a
--- a/debian/vdr.install
+++ b/debian/vdr.install
@@@ -19,7 -19,6 +19,6 @@@ debian/commands-loader.s
  debian/vdr-groups.sh                    usr/lib/vdr/
  debian/vdr-recordingaction              usr/lib/vdr/
  debian/vdr-shutdown                     usr/lib/vdr/
- debian/vdr-shutdown-message             usr/lib/vdr/
  debian/vdr-shutdown.wrapper             usr/lib/vdr/
  
  debian/vdr.groups                       etc/vdr/
@@@ -34,5 -33,3 +33,5 @@@ debian/reccmds.custom.con
  debian/commands.update-recordings.conf  usr/share/vdr/command-hooks/
  
  debian/themes/*.theme                   var/lib/vdr/themes/
 +
 +debian/vdraptrefresh                    usr/sbin/

-- 
vdr packaging repository