[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.21-1_ctvdr3-19-g0495185

[etobi]

The following commit has been merged in the e-tobi branch:
commit 29db79207596c25d51157a30f16c96c4c2187643
Author: etobi <git at e-tobi.net>
Date:   Sat Dec 10 21:52:33 2011 +0100

    Dropped 99_dvbc-unitiymedia-fix.dpatch - fixed upstream

diff --git a/debian/changelog b/debian/changelog
index 6fab184..27b4110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 vdr (1.7.22-1) unstable; urgency=low
 
   * New upstream release
+  * Dropped 99_dvbc-unitiymedia-fix.dpatch - fixed upstream
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 10 Dec 2011 21:51:31 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index 2427dc9..267f7f3 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -8,4 +8,3 @@
 82_valgrind
 
 99_ncursesw-include
-99_dvbc-unitiymedia-fix
diff --git a/debian/patches/00list.multipatch b/debian/patches/00list.multipatch
index 59dd5e1..f90af26 100644
--- a/debian/patches/00list.multipatch
+++ b/debian/patches/00list.multipatch
@@ -8,7 +8,6 @@
 82_valgrind
 
 99_ncursesw-include
-99_dvbc-unitiymedia-fix
 
 # Patch collection (replaces enAIO).
 opt-20_liemikuutio
diff --git a/debian/patches/99_dvbc-unitiymedia-fix.dpatch b/debian/patches/99_dvbc-unitiymedia-fix.dpatch
deleted file mode 100644
index 06ff0b2..0000000
--- a/debian/patches/99_dvbc-unitiymedia-fix.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_dvbc-unitiymedia-fix.dpatch by Zabrimus
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch for dvbc (unitymedia germany)
-## DP: See: http://linuxtv.org/pipermail/vdr/2011-October/025347.html
-
- at DPATCH@
-diff -Naur vdr-1.6.0.orig/libsi/si.c vdr-1.6.0/libsi/si.c
---- vdr-1.6.0.orig/libsi/si.c	2008-03-05 18:00:55.000000000 +0100
-+++ vdr-1.6.0/libsi/si.c	2011-10-20 23:29:31.895846505 +0200
-@@ -206,6 +206,11 @@
-          array[i]=0;
-    } else if (length != d->getLastDescriptorNumber()+1)
-       return; //avoid crash in case of misuse
-+
-+   if (length < d->getDescriptorNumber()+1) {
-+  	return;
-+   }
-+
-    array[d->getDescriptorNumber()]=d;
- }
- 

-- 
vdr packaging repository