[SCM] vdr packaging repository branch, e-tobi, updated. debian/2.0.0-1_etobi3-2-gcb33da3

[etobi]

The following commit has been merged in the e-tobi branch:
commit cb33da3d6201027b5d6c69a73a56d5bcafd9b569
Merge: 9ff4ec039c328d1583e35a988b0a5303bcb25c61 55c10daebffe9f1c43708481a4587c081deda8c2
Author: etobi <git at e-tobi.net>
Date:   Sat Apr 6 10:37:04 2013 +0200

    Merge branch 'master' into e-tobi
    
    Conflicts:
    	debian/.vdr-patches
    	debian/patches/series

diff --combined debian/.vdr-patches
index f04c1d7,0c584fb..d114464
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@@ -1,11 -1,5 +1,12 @@@
 -debian/patches/04_newplugin.patch:be5169037184e60fe7265891bb8f9f94
 -debian/patches/06_default_svdrp_port_0.patch:57814ddbe49c8dbdd22d14904de5051c
 +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/06_default_svdrp_port_0.patch:bb49194133b0487b1efe5619930d7af0
+ debian/patches/vdr-2.0.0-fixkeeptracksinit.diff:88942ee1799af959433d5c47e0858cbb
 -debian/patches/12_osdbase-maxitems.patch:2453ebb246e91f62943386e196a8233b
 +debian/patches/opt-37-x_menuorg.patch:6dcb9013c5e2bf7d800d9c3b23b97c42
 +debian/patches/opt-22-x_edit_marks.patch:29794d91fd06559eaea8970d43689af7
  debian/patches/99_ncursesw-include.patch:9312525e87bdbb7181329cf7ff6c9c0c
diff --combined debian/changelog
index 5e04dd1,e850aa6..afbbc16
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,31 -1,21 +1,37 @@@
 -vdr (2.0.0-1) UNRELEASED; urgency=low
++vdr (2.0.0-1~etobi4) unstable; urgency=low
++
++  * Added upstream fix vdr-2.0.0-fixkeeptracksinit.diff
++
++ -- Tobias Grimm <etobi at debian.org>  Sat, 06 Apr 2013 10:36:35 +0200
++
 +vdr (2.0.0-1~etobi3) unstable; urgency=low
 +
 +  * Added opt-22-x_edit_marks.patch again
 +
 + -- Tobias Grimm <etobi at debian.org>  Tue, 02 Apr 2013 21:33:01 +0200
 +
 +vdr (2.0.0-1~etobi2) unstable; urgency=low
  
    * 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
 -  * Added upstream fix vdr-2.0.0-fixkeeptracksinit.diff
  
 - -- 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 (1.7.42-2) unstable; urgency=low
 +vdr (2.0.0-1~etobi1) unstable; urgency=low
 +
 +  * New upstream release
 +  * Dropped vdr-1.7.42-fixpendingtimers.diff - fixed upstream
 +
 + -- 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
@@@ -33,7 -23,7 +39,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
@@@ -44,17 -34,7 +50,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
@@@ -65,13 -45,10 +71,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/patches/series
index afd386d,097892a..0b5d975
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -4,29 -4,4 +4,31 @@@
  
  99_ncursesw-include.patch
  
+ vdr-2.0.0-fixkeeptracksinit.diff
++
 +# Move cut mark 10 seconds with 1/3 and stop playback when toggeling cut mark
 +opt-22-x_edit_marks.patch
 +
 +# Patch needed for the ttxtsubs plugin.
 +opt-27_ttxtsubs.patch
 +
 +# Speed up zapping channels.
 +# opt-29_syncearly.patch
 +
 +# Patch that shows if there is a valid setup value left or right with < and >.
 +# opt-35_setup-show-valid.patch
 +
 +# Patch needed for the menuorg plugin.
 +opt-37-x_menuorg.patch
 +
 +# Patch to show an info, if it is possible to record an event in the timer-info.
 +opt-41-x_timer-info.patch
 +
 +# Patch to allow plugins to replace the VDR mainmenus
 +opt-42-x_MainMenuHooks.patch
 +
 +# Patch needed for the yaepg plugin.
 +opt-45_yaepg.patch
 +
 +# Patch required for the GraphTFT plugin
 +opt-50_graphtft.patch

-- 
vdr packaging repository