[vdr-plugin-remotetimers] 03/03: New upstream release

[Tobias Grimm]

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

tiber-guest pushed a commit to branch master
in repository vdr-plugin-remotetimers.

commit a3cc7ca9ec85f0bc146e9be7744c306a85fbe054
Author: etobi <git at e-tobi.net>
Date:   Thu Sep 3 19:04:30 2015 +0200

    New upstream release
---
 debian/changelog                      |   6 ++
 debian/patches/series                 |   1 -
 debian/patches/vdr-2.1.x-compat.patch | 134 ----------------------------------
 3 files changed, 6 insertions(+), 135 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fad4c73..d3e8b1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-remotetimers (1.0.2-1) unstable; urgency=medium
+
+  * New upstream release
+
+ -- Tobias Grimm <etobi at debian.org>  Thu, 03 Sep 2015 19:04:24 +0200
+
 vdr-plugin-remotetimers (1.0.1-3) unstable; urgency=medium
 
   * Now supporting the /etc/vdr/conf.d mechanism
diff --git a/debian/patches/series b/debian/patches/series
index 31a45b8..aa22a93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01_include_path.patch
-vdr-2.1.x-compat.patch
diff --git a/debian/patches/vdr-2.1.x-compat.patch b/debian/patches/vdr-2.1.x-compat.patch
deleted file mode 100644
index 748a123..0000000
--- a/debian/patches/vdr-2.1.x-compat.patch
+++ /dev/null
@@ -1,134 +0,0 @@
---- a/menu.c
-+++ b/menu.c
-@@ -189,14 +189,23 @@
- bool cFreeDiskSpace::HasChanged(const char *SubDir, bool ForceCheck)
- {
-   cString path(ExchangeChars(strdup(SubDir ? SubDir : ""), true), true);
-+#if APIVERSNUM > 20101
-+  path = cString::sprintf("%s/%s", cVideoDirectory::Name(), *path);
-+#else
-   path = cString::sprintf("%s/%s", VideoDirectory, *path);
-+#endif
-   if (ForceCheck || time(NULL) - lastDiskSpaceCheck > DISKSPACECHEK || !EntriesOnSameFileSystem(path, lastPath)) {
-      int FreeMB;
-      int Percent;
-      int MBperMinute = -1;
-      lastPath = path;
-+#if APIVERSNUM > 20101
-+     if (cVideoDirectory::IsOnVideoDirectoryFileSystem(path)) {
-+        Percent = cVideoDirectory::VideoDiskSpace(&FreeMB);
-+#else
-      if (IsOnVideoDirectoryFileSystem(path)) {
-         Percent = ::VideoDiskSpace(&FreeMB);
-+#endif
-         MBperMinute = Recordings.MBperMinute();
-      }
-      else {
-@@ -1758,8 +1767,13 @@
-         int len = strlen(RemoteTimersSetup.serverDir);
-         bool remote = len == 0 || (strstr(name, RemoteTimersSetup.serverDir) == name && name[len] == FOLDERDELIMCHAR);
-         if (!remote) {
-+#if APIVERSNUM > 20101
-+           if (RecordingsHandler.GetUsage(*fileName) == ruNone) {
-+              if (RecordingsHandler.Add(ruCut, *fileName))
-+#else
-            if (!cCutter::Active()) {
-               if (cCutter::Start(*fileName))
-+#endif
-                  Skins.Message(mtInfo, tr("Editing process started"));
-               else
-                  Skins.Message(mtError, tr("Can't start editing process!"));
-@@ -1898,7 +1912,11 @@
-          name[len] = '\0';
-      }
-      cString newName(ExchangeChars(strdup(name), true), true);
-+#if APIVERSNUM > 20101
-+     newName = cString::sprintf("%s/%s%s", cVideoDirectory::Name(), *newName, p);
-+#else
-      newName = cString::sprintf("%s/%s%s", VideoDirectory, *newName, p);
-+#endif
-      bool wasMoving = cMoveRec::IsMoving();
-      if (Rename(Recording, newName)) {
-         // keep old name when moving recording in background
-@@ -2215,7 +2233,11 @@
- 
- cString cMenuRecordings::DirectoryName(void)
- {
-+#if APIVERSNUM > 20101
-+  cString d(cVideoDirectory::Name());
-+#else
-   cString d(VideoDirectory);
-+#endif
-   if (base) {
-      char *s = ExchangeChars(strdup(base), true);
-      d = AddDirectory(d, s);
-@@ -2312,9 +2334,17 @@
-            }
-         cRecording *recording = ri->Recording();
-         cString FileName = recording->FileName();
-+#if APIVERSNUM > 20101
-+        if (RecordingsHandler.GetUsage(*FileName) != ruNone) {
-+#else
-         if (cCutter::Active(ri->Recording()->FileName())) {
-+#endif
-            if (Interface->Confirm(tr("Recording is being edited - really delete?"))) {
-+#if APIVERSNUM > 20101
-+              RecordingsHandler.Del(*FileName);
-+#else
-               cCutter::Stop();
-+#endif
-               recording = Recordings.GetByName(FileName); // cCutter::Stop() might have deleted it if it was the edited version
-               // we continue with the code below even if recording is NULL,
-               // in order to have the menu updated etc.
---- a/remotetimers.c
-+++ b/remotetimers.c
-@@ -172,11 +172,23 @@
-                    if (*RemoteTimersSetup.serverDir) {
-                       ir->name = cString::sprintf("%s~%s", RemoteTimersSetup.serverDir, recording.Name());
- 
-+#if APIVERSNUM > 20101
-+                      int len = strlen(cVideoDirectory::Name());
-+#else
-                       int len = strlen(VideoDirectory);
-+#endif
-                       ir->fileName = recording.FileName();
-+#if APIVERSNUM > 20101
-+                      if (strncmp(ir->fileName, cVideoDirectory::Name(), strlen(cVideoDirectory::Name())) == 0 && ir->fileName[len] == '/') {
-+#else
-                       if (strncmp(ir->fileName, VideoDirectory, strlen(VideoDirectory)) == 0 && ir->fileName[len] == '/') {
-+#endif
-                          char *serverDir = ExchangeChars(strdup(RemoteTimersSetup.serverDir), true);
-+#if APIVERSNUM > 20101
-+                         ir->fileName = cString::sprintf("%s/%s%s", cVideoDirectory::Name(), serverDir, ir->fileName + len);
-+#else
-                          ir->fileName = cString::sprintf("%s/%s%s", VideoDirectory, serverDir, ir->fileName + len);
-+#endif
-                          free(serverDir);
-                       }
-                       else {
---- a/watcher.c
-+++ b/watcher.c
-@@ -44,7 +44,11 @@
- cUpdateWatcher::cUpdateWatcher(): cThread("remotetimers update file watcher")
- {
- 	serverLastModifiedTime = 0;
-+#if APIVERSNUM > 20101
-+	clientUpdateFile = AddDirectory(cVideoDirectory::Name(), ".update");
-+#else
- 	clientUpdateFile = AddDirectory(VideoDirectory, ".update");
-+#endif
- 	clientLastDev = 0;
- 	inSubDir = false;
- }
-@@ -63,7 +67,11 @@
- 		// server recordings in subdir: check mtime of subdir/.update
- 		char *tmpDir = strdup(RemoteTimersSetup.serverDir);
- 		tmpDir = ExchangeChars(tmpDir, true);
-+#if APIVERSNUM > 20101
-+		serverUpdateFile = AddDirectory(cVideoDirectory::Name(), AddDirectory(tmpDir, ".update"));
-+#else
- 		serverUpdateFile = AddDirectory(VideoDirectory, AddDirectory(tmpDir, ".update"));
-+#endif
- 	        serverLastModifiedTime = LastModifiedTime(serverUpdateFile);
- 		free(tmpDir);
- 	}

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