r1292 - in vdr/vdr/trunk/debian: . patches
Thomas Schmidt
tschmidt at costa.debian.org
Sun Sep 25 16:01:39 UTC 2005
Author: tschmidt
Date: 2005-09-25 16:01:38 +0000 (Sun, 25 Sep 2005)
New Revision: 1292
Removed:
vdr/vdr/trunk/debian/patches/14_update-resume.dpatch
vdr/vdr/trunk/debian/patches/18_vdr-plugin-sky-fix.dpatch
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/patches/00list
Log:
vdr: New upstream 1.3.33
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2005-09-25 15:30:52 UTC (rev 1291)
+++ vdr/vdr/trunk/debian/changelog 2005-09-25 16:01:38 UTC (rev 1292)
@@ -1,9 +1,18 @@
-vdr (1.3.32-1) unstable; urgency=low
+vdr (1.3.33-1) unstable; urgency=low
* NOT RELEASED YET
* Thomas Schmidt <tschmidt at debian.org>
- New upstream release
+ + Removed 14_update-resume.dpatch
+ + Removed 18_vdr-plugin-sky-fix
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sun, 25 Sep 2005 17:51:14 +0200
+
+vdr (1.3.32-1) unstable; urgency=low
+
+ * Thomas Schmidt <tschmidt at debian.org>
+ - New upstream release
+ Added 18_vdr-plugin-sky-fix.dpatch
+ Updated 10_dd-record-option.dpatch
+ Removed 18_vdr-1.3.31-remuxbraces.dpatch
Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list 2005-09-25 15:30:52 UTC (rev 1291)
+++ vdr/vdr/trunk/debian/patches/00list 2005-09-25 16:01:38 UTC (rev 1292)
@@ -11,11 +11,9 @@
11_sortrecordings
12_osdbase-maxitems
13_epgfix
-14_update-resume
15_dvbplayer
16_avoidTrashing
17_replay
-18_vdr-plugin-sky-fix
22_vdr-playerepg
# Patch needed for DVB subtitles or ttxtsubs (does not work with AC3-patch)
Deleted: vdr/vdr/trunk/debian/patches/14_update-resume.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/14_update-resume.dpatch 2005-09-25 15:30:52 UTC (rev 1291)
+++ vdr/vdr/trunk/debian/patches/14_update-resume.dpatch 2005-09-25 16:01:38 UTC (rev 1292)
@@ -1,102 +0,0 @@
-#!/bin/sh /usr/share/dpatch/dpatch-run
-
-## 14_update-resume.dpatch by Thomas Günther <tom at toms-cafe.de>
-##
-## 2005-03-08: version 0.1
-## - trigger reread of the resume file after replaying a recording
-## - reset resume of a recording when the resume file is deleted
-## - trigger reread of the resume files for all recordings if Resume ID is
-## changed
-## http://toms-cafe.de/vdr/download/vdr-update-resume-0.1-1.3.18.diff
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Updates resume of a recording after replay.
-
- at DPATCH@
---- vdr-1.3.18/menu.c
-+++ vdr-1.3.18/menu.c
-@@ -2161,6 +2161,8 @@
- // --- cMenuSetupReplay ------------------------------------------------------
-
- class cMenuSetupReplay : public cMenuSetupBase {
-+protected:
-+ virtual void Store(void);
- public:
- cMenuSetupReplay(void);
- };
-@@ -2173,6 +2175,13 @@
- Add(new cMenuEditIntItem(tr("Setup.Replay$Resume ID"), &data.ResumeID, 0, 99));
- }
-
-+void cMenuSetupReplay::Store(void)
-+{
-+ if (Setup.ResumeID != data.ResumeID)
-+ Recordings.ResetResume();
-+ cMenuSetupBase::Store();
-+}
-+
- // --- cMenuSetupMisc --------------------------------------------------------
-
- class cMenuSetupMisc : public cMenuSetupBase {
---- vdr-1.3.18/recording.c
-+++ vdr-1.3.18/recording.c
-@@ -199,6 +199,7 @@
- if (safe_write(f, &Index, sizeof(Index)) < 0)
- LOG_ERROR_STR(fileName);
- close(f);
-+ Recordings.ResetResume(fileName);
- return true;
- }
- }
-@@ -210,6 +211,7 @@
- if (fileName) {
- if (remove(fileName) < 0 && errno != ENOENT)
- LOG_ERROR_STR(fileName);
-+ Recordings.ResetResume(fileName);
- }
- }
-
-@@ -616,6 +618,11 @@
- return RemoveVideoFile(FileName());
- }
-
-+void cRecording::ResetResume(void) const
-+{
-+ resume = RESUME_NOT_INITIALIZED;
-+}
-+
- // --- cRecordings -----------------------------------------------------------
-
- cRecordings Recordings;
-@@ -702,6 +709,13 @@
- Del(recording);
- }
-
-+void cRecordings::ResetResume(const char *ResumeFileName)
-+{
-+ for (cRecording *recording = First(); recording; recording = Next(recording))
-+ if (!ResumeFileName || strncmp(ResumeFileName, recording->FileName(), strlen(recording->FileName())) == 0)
-+ recording->ResetResume();
-+}
-+
- // --- cMark -----------------------------------------------------------------
-
- cMark::cMark(int Position, const char *Comment)
---- vdr-1.3.18/recording.h
-+++ vdr-1.3.18/recording.h
-@@ -58,6 +58,7 @@
- const char *PrefixFileName(char Prefix);
- int HierarchyLevels(void) const;
- bool IsNew(void) const { return GetResume() <= 0; }
-+ void ResetResume(void) const;
- bool IsEdited(void) const;
- bool WriteSummary(void);
- bool Delete(void);
-@@ -78,6 +79,7 @@
- bool Load(void);
- void TriggerUpdate(void) { lastUpdate = 0; }
- bool NeedsUpdate(void);
-+ void ResetResume(const char *ResumeFileName = NULL);
- cRecording *GetByName(const char *FileName);
- void AddByName(const char *FileName);
- void DelByName(const char *FileName);
Deleted: vdr/vdr/trunk/debian/patches/18_vdr-plugin-sky-fix.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/18_vdr-plugin-sky-fix.dpatch 2005-09-25 15:30:52 UTC (rev 1291)
+++ vdr/vdr/trunk/debian/patches/18_vdr-plugin-sky-fix.dpatch 2005-09-25 16:01:38 UTC (rev 1292)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-
-## 18_vdr-plugin-sky-fix.dpatch by Thomas Schmidt <tschmidt at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix building of the sky plugin
-
- at DPATCH@
-diff -urNad vdr-1.3.32/PLUGINS/src/sky/sky.c /tmp/dpep.s0biey/vdr-1.3.32/PLUGINS/src/sky/sky.c
---- vdr-1.3.32/PLUGINS/src/sky/sky.c 2004-12-26 13:45:22.000000000 +0100
-+++ /tmp/dpep.s0biey/vdr-1.3.32/PLUGINS/src/sky/sky.c 2005-09-11 22:23:27.825058752 +0200
-@@ -13,6 +13,7 @@
- #include <unistd.h>
- #include <vdr/plugin.h>
- #include <vdr/sources.h>
-+#include <vdr/device.h>
-
- static const char *VERSION = "0.3.3";
- static const char *DESCRIPTION = "Sky Digibox interface";
More information about the pkg-vdr-dvb-changes
mailing list