[vdradmin-am] 04/05: Dropped Fixed-LSTR-for-VDR-1.7.21.patch - fixed upstream

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdradmin-am.

commit 29673e69f487c418dc22ad39210e48935ee33997
Author: etobi <git at e-tobi.net>
Date:   Sun Oct 19 09:32:01 2014 +0200

    Dropped Fixed-LSTR-for-VDR-1.7.21.patch - fixed upstream
---
 debian/changelog                               |  1 +
 debian/patches/01_dist-var.patch               | 10 ++++-----
 debian/patches/03_cfgfiles-fhs.patch           |  8 +++----
 debian/patches/Fixed-LSTR-for-VDR-1.7.21.patch | 31 --------------------------
 debian/patches/series                          |  1 -
 5 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e92ad2..363d905 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 vdradmin-am (3.6.10-1) unstable; urgency=medium
 
   * New upstream release
+  * Dropped Fixed-LSTR-for-VDR-1.7.21.patch - fixed upstream
 
  -- Tobias Grimm <etobi at debian.org>  Sun, 19 Oct 2014 09:29:34 +0200
 
diff --git a/debian/patches/01_dist-var.patch b/debian/patches/01_dist-var.patch
index 2a504b4..9a0c26a 100644
--- a/debian/patches/01_dist-var.patch
+++ b/debian/patches/01_dist-var.patch
@@ -7,16 +7,16 @@
 ## DP: instead of local, relative paths
 
 @DPATCH@
-Index: vdradmin-am-3.6.8/vdradmind.pl
+Index: vdradmin-am/vdradmind.pl
 ===================================================================
---- vdradmin-am-3.6.8.orig/vdradmind.pl	2011-06-03 06:33:40.000000000 +0200
-+++ vdradmin-am-3.6.8/vdradmind.pl	2011-06-05 12:53:24.000000000 +0200
-@@ -96,7 +96,7 @@
+--- vdradmin-am.orig/vdradmind.pl	2014-10-19 09:30:20.688622761 +0200
++++ vdradmin-am/vdradmind.pl	2014-10-19 09:30:20.684622780 +0200
+@@ -94,7 +94,7 @@
  
  #use warnings;
  
 -my $SEARCH_FILES_IN_SYSTEM    = 0;
 +my $SEARCH_FILES_IN_SYSTEM    = 1;
  my $VDR_MAX_SVDRP_LENGTH      = 10000;                        # validate this value
- my $SUPPORTED_LOCALE_PREFIXES = "^(cs|de|en|es|fi|fr|it|nl|ru)_";
+ my $SUPPORTED_LOCALE_PREFIXES = "^(cs|de|en|es|fi|fr|hu|it|nl|ru)_";
  
diff --git a/debian/patches/03_cfgfiles-fhs.patch b/debian/patches/03_cfgfiles-fhs.patch
index cd0c0ea..fa1731e 100644
--- a/debian/patches/03_cfgfiles-fhs.patch
+++ b/debian/patches/03_cfgfiles-fhs.patch
@@ -6,11 +6,11 @@
 ## DP: with the FHS (vdradmin changes these files at runtime)
 
 @DPATCH@
-Index: vdradmin-am-3.6.8/vdradmind.pl
+Index: vdradmin-am/vdradmind.pl
 ===================================================================
---- vdradmin-am-3.6.8.orig/vdradmind.pl	2011-06-05 12:53:35.000000000 +0200
-+++ vdradmin-am-3.6.8/vdradmind.pl	2011-06-05 12:53:38.000000000 +0200
-@@ -142,9 +142,9 @@
+--- vdradmin-am.orig/vdradmind.pl	2014-10-19 09:30:27.328606915 +0200
++++ vdradmin-am/vdradmind.pl	2014-10-19 09:30:35.340606058 +0200
+@@ -140,9 +140,9 @@
  $CONFIG{SERVERHOST} = "0.0.0.0";
  $CONFIG{SERVERPORT} = 8001;
  $CONFIG{LOCAL_NET}  = "0.0.0.0/32";
diff --git a/debian/patches/Fixed-LSTR-for-VDR-1.7.21.patch b/debian/patches/Fixed-LSTR-for-VDR-1.7.21.patch
deleted file mode 100644
index c28e7d5..0000000
--- a/debian/patches/Fixed-LSTR-for-VDR-1.7.21.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From c2bed581bb0cffa49941e64d357048c2043b5db0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?David=20R=C3=BCtti?= <d_ruetti at hotmail.com>
-Date: Sat, 24 Dec 2011 21:41:27 +0100
-Subject: [PATCH] Fixed LSTR for VDR >= 1.7.21 when executing recording
- commands
-
----
- HISTORY      |    1 +
- vdradmind.pl |    6 +++++-
- 2 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/vdradmind.pl b/vdradmind.pl
-index 60fe3fa..1299565 100755
---- a/vdradmind.pl
-+++ b/vdradmind.pl
-@@ -6438,7 +6438,11 @@ sub recRunCmd {
-     my ($day,    $month, $hour, $minute, $newtitle, $c, $folder);
- 
-     for (SendCMD("lstr")) {
--        ($rec_id, $date, $time, $title) = split(/ +/, $_, 4);
-+        if ($FEATURES{VDRVERSION} < 10721) {
-+            ($rec_id, $date, $time, $title) = split(/ +/, $_, 4);
-+        } else {
-+            ($rec_id, $date, $time, undef, $title) = split(/ +/, $_, 5);
-+        }
-         last if ($rec_id == $id);
-     }
- 
--- 
-1.7.7.3
-
diff --git a/debian/patches/series b/debian/patches/series
index e499525..fb35ad2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 01_dist-var.patch
 02_search-path.patch
 03_cfgfiles-fhs.patch
-Fixed-LSTR-for-VDR-1.7.21.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdradmin-am.git