[SCM] vdr packaging repository branch, e-tobi, updated. debian/1.7.17-1_ctvdr1-2-g917b622

[etobi]

The following commit has been merged in the e-tobi branch:
commit 5194060a1c0dcd9b0c2e765d63159be20a2064ed
Author: etobi <git at e-tobi.net>
Date:   Sun Mar 20 00:14:57 2011 +0100

    Dropped 99_fix-deleting.dpatch (fixed upstream)

diff --git a/debian/.vdr-patches b/debian/.vdr-patches
index 13d2b12..7b075e3 100644
--- a/debian/.vdr-patches
+++ b/debian/.vdr-patches
@@ -7,4 +7,3 @@ debian/patches/16_channels.conf.terr-fix.dpatch:72595733d0b46aa4093a640708d19226
 debian/patches/06_default_svdrp_port_0.dpatch:653e14e8ab093c456f9bbd8faa5e1ff7
 debian/patches/99_ncursesw-include.dpatch:90810d58108ff8d9afd768fec67be904
 debian/patches/82_valgrind.dpatch:503ddba49c243fff798a36a1c12bb5ae
-debian/patches/99_fix-deleting.dpatch:798aa6bc4941759a9e28666798ec4fff
diff --git a/debian/.vdr-patches.multipatch b/debian/.vdr-patches.multipatch
index 8fc9b6d..096b0f2 100644
--- a/debian/.vdr-patches.multipatch
+++ b/debian/.vdr-patches.multipatch
@@ -18,7 +18,6 @@ debian/patches/opt-31-x_reelchannelscan.dpatch:f8c06ac51888248f68badcab8533c2be
 debian/patches/81_Make_config.dpatch:da281b9af48273bcbd19f3052ee993fd
 debian/patches/opt-51_cuttime.dpatch:5459582bf3c6d95895d7e0ca18b52213
 debian/patches/opt-48-x_pin.dpatch:f123bc131bb9986fec6143bb288a3c32
-debian/patches/99_fix-deleting.dpatch:798aa6bc4941759a9e28666798ec4fff
 debian/patches/opt-37-x_menuorg.dpatch:9fb02cc8bd848add50b3866b6f476644
 debian/patches/opt-45_yaepg.dpatch:77fdabd83bdf4187d7040faaf1c758c7
 debian/patches/opt-27_ttxtsubs.dpatch:af553c89b0f4cb7f75fb38768c0ab72a
diff --git a/debian/changelog b/debian/changelog
index a303417..25811e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ vdr (1.7.17-1~ctvdr1) unstable; urgency=low
   * Slighlty improved documentation about FF firmware upgrade
   * Made sure po files are unmodified after clean (Closes: #593925)
   * Dropped marks reloading from jumpplay patch (Patch modified by Udo Richter)
+  * Dropped 99_fix-deleting.dpatch (fixed upstream)
 
  -- Tobias Grimm <etobi at debian.org>  Sun, 20 Mar 2011 00:02:15 +0100
 
diff --git a/debian/patches/00list b/debian/patches/00list
index fda2fd2..282de01 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -9,7 +9,6 @@
 
 99_ncursesw-include
 99_vdr-workaround-broken-sys-capability
-99_fix-deleting
 
 # Patch collection (replaces enAIO).
 # opt-20_liemikuutio
diff --git a/debian/patches/00list.multipatch b/debian/patches/00list.multipatch
index 90f73fa..8457990 100644
--- a/debian/patches/00list.multipatch
+++ b/debian/patches/00list.multipatch
@@ -9,7 +9,6 @@
 
 99_ncursesw-include
 99_vdr-workaround-broken-sys-capability
-99_fix-deleting
 
 # Patch collection (replaces enAIO).
 opt-20_liemikuutio
diff --git a/debian/patches/99_fix-deleting.dpatch b/debian/patches/99_fix-deleting.dpatch
deleted file mode 100644
index ee6d1d9..0000000
--- a/debian/patches/99_fix-deleting.dpatch
+++ /dev/null
@@ -1,36 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99_fix-deleting.dpatch by Steffen Barszus <steffenbpunkt at googlemail.com>
-## http://www.linuxtv.org/pipermail/vdr/2010-October/023774.html
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes problem with deleting records from video.01, video.02, ...
-
- at DPATCH@
-diff -urNad vdr-1.7.16~/tools.c vdr-1.7.16/tools.c
---- vdr-1.7.16~/tools.c	2010-08-29 17:03:08.000000000 +0200
-+++ vdr-1.7.16/tools.c	2010-10-14 23:55:22.622829123 +0200
-@@ -368,7 +368,7 @@
-                     cString buffer = AddDirectory(FileName, e->d_name);
-                     if (FollowSymlinks) {
-                        struct stat st2;
--                       if (stat(buffer, &st2) == 0) {
-+                       if (lstat(buffer, &st2) == 0) {
-                           if (S_ISLNK(st2.st_mode)) {
-                              int size = st2.st_size + 1;
-                              char *l = MALLOC(char, size);
-@@ -377,14 +377,12 @@
-                                 if (errno != EINVAL)
-                                    LOG_ERROR_STR(*buffer);
-                                 }
--                             else if (n < size) {
-+                             else {
-                                 l[n] = 0;
-                                 dsyslog("removing %s", l);
-                                 if (remove(l) < 0)
-                                    LOG_ERROR_STR(l);
-                                 }
--                             else
--                                esyslog("ERROR: symlink name length (%d) exceeded anticipated buffer size (%d)", n, size);
-                              free(l);
-                              }
-                           }

-- 
vdr packaging repository