r2490 - in vdr/vdr-plugin-extrecmenu/trunk/debian: . patches
Thomas Günther
tom-guest at costa.debian.org
Sun Apr 23 23:14:54 UTC 2006
Author: tom-guest
Date: 2006-04-23 23:14:53 +0000 (Sun, 23 Apr 2006)
New Revision: 2490
Added:
vdr/vdr-plugin-extrecmenu/trunk/debian/patches/03_fix-cmdsubmenu.dpatch
vdr/vdr-plugin-extrecmenu/trunk/debian/patches/90_APIVERSION.dpatch
Modified:
vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
vdr/vdr-plugin-extrecmenu/trunk/debian/control
vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list
vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch
Log:
New upstream release 0.9a
Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/changelog
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/changelog 2006-04-23 22:56:56 UTC (rev 2489)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/changelog 2006-04-23 23:14:53 UTC (rev 2490)
@@ -1,3 +1,16 @@
+vdr-plugin-extrecmenu (0.9a-1) unstable; urgency=low
+
+ * NOT RELEASED YET
+
+ * Thomas Günther <tom at toms-cafe.de>
+ - New upstream release
+ - Updated 02_fix-jumpplay.dpatch
+ - Added 03_fix-cmdsubmenu.dpatch
+ - Added 90_APIVERSION.dpatch
+ - Build-Depend on vdr-dev (>= 1.3.48-1)
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Mon, 24 Apr 2006 00:08:10 +0200
+
vdr-plugin-extrecmenu (0.9-2) unstable; urgency=low
* NOT RELEASED YET
Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/control
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/control 2006-04-23 22:56:56 UTC (rev 2489)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/control 2006-04-23 23:14:53 UTC (rev 2490)
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Thomas Günther <tom at toms-cafe.de>, Tobias Grimm <tg at e-tobi.net>, Thomas Schmidt <tschmidt at debian.org>
-Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.47-1), dpatch
+Build-Depends: debhelper (>> 4.1.16), vdr-dev (>= 1.3.48-1), dpatch
Standards-Version: 3.6.2
Package: vdr-plugin-extrecmenu
Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list 2006-04-23 22:56:56 UTC (rev 2489)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/00list 2006-04-23 23:14:53 UTC (rev 2490)
@@ -1,2 +1,5 @@
01_dvdarchive-path
02_fix-jumpplay
+03_fix-cmdsubmenu
+
+90_APIVERSION
Modified: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch 2006-04-23 22:56:56 UTC (rev 2489)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/02_fix-jumpplay.dpatch 2006-04-23 23:14:53 UTC (rev 2490)
@@ -1,116 +1,15 @@
#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_fix-jumpplay.dpatch by Thomas Günther <tom at toms-cafe.de>
-## http://toms-cafe.de/vdr/download/extrecmenu-0.9-fix-jumpplay.diff
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes BIG(B|P)A(TCH|CK)VERSION confusion - using JUMPPLAYVERSNUM instead
-## DP: to activate the jumpplay features (version >= 0.7 of jumpplay is needed).
+## DP: Using JUMPPLAYVERSNUM to activate the jumpplay features (version >= 0.7
+## DP: of jumpplay is needed).
@DPATCH@
---- extrecmenu-0.9/myreplaycontrol.c
-+++ extrecmenu-0.9/myreplaycontrol.c
-@@ -14,10 +14,9 @@
- char *myReplayControl::title = NULL;
-
- myReplayControl::myReplayControl(void)
--#ifdef BIGPATCHVERSION
-+#ifdef JUMPPLAYVERSNUM
- :cDvbPlayerControl(fileName,&marks)
--#endif
--#ifndef BIGPATCHVERSION
-+#else
- :cDvbPlayerControl(fileName)
- #endif
- {
-@@ -29,7 +28,7 @@
- timeoutShow = 0;
- timeSearchActive = false;
- marks.Load(fileName);
--#ifdef BIGPACKVERSION
-+#ifdef JUMPPLAYVERSNUM
- lastLoadMarks = time(NULL);
- #endif
- cRecording Recording(fileName);
-@@ -253,15 +252,14 @@
- ShowTimed(2);
- bool Play, Forward;
- int Speed;
--#ifndef BIGPACKVERSION
-- if (GetReplayMode(Play, Forward, Speed) && !Play)
-- Goto(Current, true);
--#endif
--#ifdef BIGBACKVERSION
-+#ifdef JUMPPLAYVERSNUM
- if (GetReplayMode(Play, Forward, Speed) && !Play) {
- Goto(Current, true);
- displayFrames = true;
- }
-+#else
-+ if (GetReplayMode(Play, Forward, Speed) && !Play)
-+ Goto(Current, true);
- #endif
- }
-
-@@ -276,11 +274,7 @@
- if (GetIndex(Current, Total)) {
- cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current);
- if (m) {
--#ifndef BIGPACKVERSION
-- Goto(m->position, true);
-- displayFrames = true;
--#endif
--#ifdef BIGPACKVERSION
-+#ifdef JUMPPLAYVERSNUM
- bool Play2, Forward2;
- int Speed;
- if (Setup.JumpPlay && GetReplayMode(Play2, Forward2, Speed) &&
-@@ -292,6 +286,9 @@
- Goto(m->position, true);
- displayFrames = true;
- }
-+#else
-+ Goto(m->position, true);
-+ displayFrames = true;
- #endif
- }
- }
-@@ -347,11 +344,10 @@
- if (!m)
- m = marks.GetNext(Current);
- if (m) {
--#ifndef BIGPACKVERSION
-- if ((m->Index() & 0x01) != 0)
--#endif
--#ifdef BIGPACKVERSION
-+#ifdef JUMPPLAYVERSNUM
- if ((m->Index() & 0x01) != 0 && !Setup.PlayJump)
-+#else
-+ if ((m->Index() & 0x01) != 0)
- #endif
- m = marks.Next(m);
- if (m) {
-@@ -374,7 +370,7 @@
- {
- if (!Active())
- return osEnd;
--#ifdef BIGPACKVERSION
-+#ifdef JUMPPLAYVERSNUM
- if (Setup.LoadMarksInterval &&
- time(NULL) >= lastLoadMarks + Setup.LoadMarksInterval) {
- marks.Load(fileName, true);
---- extrecmenu-0.9/myreplaycontrol.h
-+++ extrecmenu-0.9/myreplaycontrol.h
-@@ -1,3 +1,4 @@
-+#include <vdr/config.h>
+--- extrecmenu-0.9a/myreplaycontrol.h
++++ extrecmenu-0.9a/myreplaycontrol.h
+@@ -1,1 +1,4 @@
#include <vdr/dvbplayer.h>
- #define MODETIMEOUT 3 // seconds
-
-@@ -11,7 +12,7 @@
- bool lastPlay, lastForward;
- int lastSpeed;
- time_t timeoutShow;
--#ifdef BIGPACKVERSION
+#ifdef JUMPPLAYVERSNUM
- time_t lastLoadMarks;
- #endif
- bool timeSearchActive, timeSearchHide;
++#define BIGPATCHVERSION JUMPPLAYVERSNUM
++#endif
Added: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/03_fix-cmdsubmenu.dpatch
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/03_fix-cmdsubmenu.dpatch 2006-04-23 22:56:56 UTC (rev 2489)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/03_fix-cmdsubmenu.dpatch 2006-04-23 23:14:53 UTC (rev 2490)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fix-cmdsubmenu.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Using CMDSUBMENUVERSNUM to activate the cmdsubmenu features (version >= 0.5
+## DP: of cmdsubmenu is needed).
+
+ at DPATCH@
+--- extrecmenu-0.9a/mymenucommands.c
++++ extrecmenu-0.9a/mymenucommands.c
+@@ -33,3 +33,3 @@
+-#ifdef CMD_SUBMENUS
++#ifdef CMDSUBMENUVERSNUM
+ if (command->hasChilds()) {
+- AddSubMenu(new cMenuCommands(command->Title(), command->getChilds(), parameters));
++ AddSubMenu(new myMenuCommands(command->Title(), command->getChilds(), parameters));
Added: vdr/vdr-plugin-extrecmenu/trunk/debian/patches/90_APIVERSION.dpatch
===================================================================
--- vdr/vdr-plugin-extrecmenu/trunk/debian/patches/90_APIVERSION.dpatch 2006-04-23 22:56:56 UTC (rev 2489)
+++ vdr/vdr-plugin-extrecmenu/trunk/debian/patches/90_APIVERSION.dpatch 2006-04-23 23:14:53 UTC (rev 2490)
@@ -0,0 +1,20 @@
+#! /bin/sh -e
+## 90_APIVERSION.dpatch by Thomas Günther <tom at toms-cafe.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Support for the APIVERSION define as introduced in VDR-1.3.47.
+
+case "$1" in
+ -patch)
+ sed -i -e s/VDRVERSION/APIVERSION/g Makefile
+ ;;
+ -unpatch)
+ sed -i -e s/APIVERSION/VDRVERSION/g Makefile
+ ;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+ ;;
+esac
+
+exit 0
More information about the pkg-vdr-dvb-changes
mailing list