[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.42-1_etobi1-2-g19cbab4

[etobi]

The following commit has been merged in the e-tobi branch:
commit 19cbab4904379df565d71966829f0895e2ca693d
Merge: 5f2ad6d92998168105680b5a33aa5db4fdf6aefd 276974477cad2e7214f38f44cb5d7a75b69f601c
Author: etobi <git at e-tobi.net>
Date:   Tue Mar 26 21:56:58 2013 +0100

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

diff --combined debian/.vdr-patches
index a913ad3,b62dee9..8e6924b
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@@ -1,10 -1,4 +1,11 @@@
 +debian/patches/opt-41-x_timer-info.patch:415aa18fc7f2400f5001a7b214c04164
 +debian/patches/12_osdbase-maxitems.patch:2453ebb246e91f62943386e196a8233b
++debian/patches/vdr-1.7.42-fixpendingtimers.diff:29282c8b20c2b956c86e0afa856d2c53
 +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/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/changelog
index ab9a3dd,e2c63d5..b395cfa
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,10 +1,10 @@@
 -vdr (1.7.42-2) unstable; urgency=low
++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
@@@ -6,7 -12,7 +12,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
@@@ -17,17 -23,7 +23,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
@@@ -38,13 -34,10 +44,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 cfc095b,3d4ca30..7bfcada
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -4,26 -4,4 +4,29 @@@
  
  99_ncursesw-include.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-1.7.42-fixpendingtimers.diff
++
diff --combined debian/patches/vdr-1.7.42-fixpendingtimers.diff
index 0000000,be6c601..3cfc9e8
mode 000000,100644..100644
--- a/debian/patches/vdr-1.7.42-fixpendingtimers.diff
+++ b/debian/patches/vdr-1.7.42-fixpendingtimers.diff
@@@ -1,0 -1,14 +1,14 @@@
 ---- timers.c	2013/03/16 10:37:10	2.17
 -+++ timers.c	2013/03/25 10:44:46
++--- vdr/timers.c	2013/03/16 10:37:10	2.17
+++++ vdr/timers.c	2013/03/25 10:44:46
+ @@ -720,8 +720,10 @@
+    for (cTimer *ti = First(); ti; ti = Next(ti)) {
+        if (!ti->Recording() && ti->Matches(t)) {
+           if (ti->Pending()) {
+ -            if (ti->Index() > LastPending)
+ +            if (ti->Index() > LastPending) {
+                 LastPending = ti->Index();
+ +               return ti;
+ +               }
+              else
+                 continue;
+              }

-- 
vdr packaging repository