[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.23-1_ctvdr1-7-g02dc270

[etobi]

The following commit has been merged in the e-tobi branch:
commit f91e52bf39a5c46bfdbf11b06836f0cfd7051cc6
Author: etobi <git at e-tobi.net>
Date:   Sun Jan 15 21:17:37 2012 +0100

    Updated opt-44_rotor.patch

diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index c1d2d87..549f280 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -15,7 +15,7 @@ debian/patches/99_ncursesw-include.patch:9bafeb768f7921015a5bab5e47786950
 debian/patches/82_valgrind.patch:60ad50e72eabb0861d096d1002fddca7
 debian/patches/opt-22-x_edit_marks.patch:5c6b433d3816e2081c3ae937be54b534
 debian/patches/opt-39_noepg.patch:dac5d60f94ef09a9c497999cb8acd199
-debian/patches/opt-44_rotor.patch:755854c8f2e048902b582f9343919ee1
+debian/patches/opt-44_rotor.patch:dfece0f496d456b7003c0709c5ca7f01
 debian/patches/12_osdbase-maxitems.patch:f6fc7c5a100f8e891280195b3e1d69ba
 debian/patches/opt-50_graphtft-liemikuutio.patch:a5a3ead7091ddd35fab0b6925ffefcab
 debian/patches/opt-45_yaepg.patch:e8b772b5a17269778f6fc6c4bea5ef79
diff --git a/debian/changelog b/debian/changelog
index 3c20c0b..485cc9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 vdr (1.7.23-1~ctvdr1) unstable; urgency=low
 
   * New upstream release
+  * Updated opt-44_rotor.patch
 
  -- Tobias Grimm <etobi at debian.org>  Sun, 15 Jan 2012 20:50:20 +0100
 
diff --git a/debian/patches/opt-44_rotor.patch b/debian/patches/opt-44_rotor.patch
index e458c9a..4c5ea2d 100644
--- a/debian/patches/opt-44_rotor.patch
+++ b/debian/patches/opt-44_rotor.patch
@@ -4,8 +4,8 @@ Origin: extracted from the rotor plugin 0.1.4-vdr1.5
 
 Index: vdr/device.h
 ===================================================================
---- vdr.orig/device.h	2011-12-11 02:29:26.000000000 +0100
-+++ vdr/device.h	2011-12-11 02:29:53.000000000 +0100
+--- vdr.orig/device.h	2012-01-15 21:12:41.000000000 +0100
++++ vdr/device.h	2012-01-15 21:14:13.000000000 +0100
 @@ -24,6 +24,8 @@
  #include "spu.h"
  #include "thread.h"
@@ -25,9 +25,9 @@ Index: vdr/device.h
  
 Index: vdr/dvbdevice.c
 ===================================================================
---- vdr.orig/dvbdevice.c	2011-12-10 21:59:26.000000000 +0100
-+++ vdr/dvbdevice.c	2011-12-11 02:29:53.000000000 +0100
-@@ -261,6 +261,7 @@
+--- vdr.orig/dvbdevice.c	2012-01-15 21:07:03.000000000 +0100
++++ vdr/dvbdevice.c	2012-01-15 21:15:44.000000000 +0100
+@@ -285,6 +285,7 @@
  private:
    static cMutex bondMutex;
    enum eTunerStatus { tsIdle, tsSet, tsTuned, tsLocked };
@@ -35,7 +35,7 @@ Index: vdr/dvbdevice.c
    const cDvbDevice *device;
    int fd_frontend;
    int adapter, frontend;
-@@ -276,6 +277,7 @@
+@@ -300,6 +301,7 @@
    cMutex mutex;
    cCondVar locked;
    cCondVar newSet;
@@ -43,7 +43,7 @@ Index: vdr/dvbdevice.c
    cDvbTuner *bondedTuner;
    bool bondedMaster;
    bool bondedMasterFailed;
-@@ -300,12 +302,14 @@
+@@ -325,12 +327,14 @@
    bool Locked(int TimeoutMs = 0);
    int GetSignalStrength(void) const;
    int GetSignalQuality(void) const;
@@ -52,13 +52,13 @@ Index: vdr/dvbdevice.c
  
  cMutex cDvbTuner::bondMutex;
  
- cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend, fe_delivery_system FrontendType)
+ cDvbTuner::cDvbTuner(const cDvbDevice *Device, int Fd_Frontend, int Adapter, int Frontend)
  {
 +  SendDiseqc=false;
    device = Device;
    fd_frontend = Fd_Frontend;
    adapter = Adapter;
-@@ -625,6 +629,18 @@
+@@ -644,6 +648,18 @@
    return -1;
  }
  
@@ -77,7 +77,7 @@ Index: vdr/dvbdevice.c
  static unsigned int FrequencyToHz(unsigned int f)
  {
    while (f && f < 1000000)
-@@ -813,6 +829,10 @@
+@@ -857,6 +873,10 @@
          if (GetFrontendStatus(NewStatus))
             Status = NewStatus;
          cMutexLock MutexLock(&mutex);
@@ -88,7 +88,7 @@ Index: vdr/dvbdevice.c
          switch (tunerStatus) {
            case tsIdle:
                 break;
-@@ -1415,6 +1435,11 @@
+@@ -1509,6 +1529,11 @@
    return dvbTuner ? dvbTuner->Locked(TimeoutMs) : false;
  }
  
@@ -102,9 +102,9 @@ Index: vdr/dvbdevice.c
    setTransferModeForDolbyDigital = Mode;
 Index: vdr/dvbdevice.h
 ===================================================================
---- vdr.orig/dvbdevice.h	2011-12-10 21:59:26.000000000 +0100
-+++ vdr/dvbdevice.h	2011-12-11 02:29:53.000000000 +0100
-@@ -181,6 +181,7 @@
+--- vdr.orig/dvbdevice.h	2012-01-15 21:07:03.000000000 +0100
++++ vdr/dvbdevice.h	2012-01-15 21:14:13.000000000 +0100
+@@ -190,6 +190,7 @@
    virtual bool SetChannelDevice(const cChannel *Channel, bool LiveView);
  public:
    virtual bool HasLock(int TimeoutMs = 0);

-- 
vdr packaging repository