r186 - in vdr/vdr/trunk/debian: . patches scripts
Thomas Schmidt
pkg-vdr-dvb-changes@lists.alioth.debian.org
Sun, 27 Feb 2005 01:37:25 +0100
Author: tschmidt
Date: 2005-02-27 01:37:23 +0100 (Sun, 27 Feb 2005)
New Revision: 186
Added:
vdr/vdr/trunk/debian/patches/13_remote.dpatch
vdr/vdr/trunk/debian/scripts/
vdr/vdr/trunk/debian/scripts/vdr-daemon
vdr/vdr/trunk/debian/scripts/vdr-lirc
vdr/vdr/trunk/debian/scripts/vdr-rcu
vdr/vdr/trunk/debian/vdr.prerm
Removed:
vdr/vdr/trunk/debian/vdr-daemon.install
vdr/vdr/trunk/debian/vdr-daemon.links
vdr/vdr/trunk/debian/vdr-daemon.postinst
vdr/vdr/trunk/debian/vdr-daemon.prerm
vdr/vdr/trunk/debian/vdr-kbd.install
vdr/vdr/trunk/debian/vdr-kbd.links
vdr/vdr/trunk/debian/vdr-kbd.postinst
vdr/vdr/trunk/debian/vdr-kbd.prerm
vdr/vdr/trunk/debian/vdr-lirc.install
vdr/vdr/trunk/debian/vdr-lirc.links
vdr/vdr/trunk/debian/vdr-lirc.postinst
vdr/vdr/trunk/debian/vdr-lirc.prerm
vdr/vdr/trunk/debian/vdr-rcu.install
vdr/vdr/trunk/debian/vdr-rcu.links
vdr/vdr/trunk/debian/vdr-rcu.postinst
vdr/vdr/trunk/debian/vdr-rcu.prerm
Modified:
vdr/vdr/trunk/debian/changelog
vdr/vdr/trunk/debian/control
vdr/vdr/trunk/debian/patches/00list
vdr/vdr/trunk/debian/patches/opt-20_elchiaio4d+1.dpatch
vdr/vdr/trunk/debian/rules
vdr/vdr/trunk/debian/vdr.NEWS
vdr/vdr/trunk/debian/vdr.install
vdr/vdr/trunk/debian/vdr.links
vdr/vdr/trunk/debian/vdr.postinst
Log:
- Added 13_remote.dpatch from Darren Salt, this allows to have
just 1 binary for all 4 possible control methods, and it should
reduce build-time by about 75%
- Removed packages vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu because
they are not necessary anymore
- Added "Conflicts and Replaces: vdr-daemon, vdr-kbd, vdr-lirc,
vdr-rcu" to debian/control
- Made a very small change to opt-20_elchiaio4d+1.dpatch (Makefile),
i hope this does not conflict with other dpatch-files in Tobis
Repository (elchiaio will not compile with 13_remote.dpatch without
this change)
- Seems to work fine so far, just a small issue with this init-script
not beeing able to restart vdr on upgrade, maybe needs some tweaks
Modified: vdr/vdr/trunk/debian/changelog
===================================================================
--- vdr/vdr/trunk/debian/changelog 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/changelog 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,3 +1,18 @@
+vdr (1.2.6-9) experimental; urgency=low
+
+ * NOT RELEASED YET
+
+ * Thomas Schmidt <tschmidt@debian.org>
+ - Added 13_remote.dpatch from Darren Salt, this allows to have
+ just 1 binary for all 4 possible control methods, and it should
+ reduce build-time by about 75%
+ - Removed packages vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu because
+ they are not necessary anymore
+ - Added "Conflicts and Replaces: vdr-daemon, vdr-kbd, vdr-lirc,
+ vdr-rcu" to debian/control
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel@lists.alioth.debian.org> Sat, 26 Feb 2005 20:35:43 +0100
+
vdr (1.2.6-8) unstable; urgency=low
* Thomas Schmidt <tschmidt@debian.org>
Modified: vdr/vdr/trunk/debian/control
===================================================================
--- vdr/vdr/trunk/debian/control 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/control 2005-02-27 00:37:23 UTC (rev 186)
@@ -8,7 +8,10 @@
Package: vdr
Architecture: any
-Depends: ${misc:Depends}, vdr-kbd | vdr-lirc | vdr-rcu | vdr-daemon, makedev (>=2.3.1-66), adduser
+Depends: ${misc:Depends}, makedev (>=2.3.1-66), adduser
+Recommends: lirc
+Conflicts: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
+Replaces: vdr-daemon, vdr-kbd, vdr-lirc, vdr-rcu
Description: Video Disk Recorder for DVB cards
Video Disk Recorder (VDR) is a digital sat-receiver program using
Linux and DVB technologies. It allows one to record MPEG2 streams,
@@ -35,56 +38,6 @@
This package contains the header files of VDR.
You need this package to be able to build vdr-plugins!
-Package: vdr-kbd
-Architecture: any
-Depends: ${shlibs:Depends}, vdr (= ${Source-Version})
-Description: Video Disk Recorder for DVB cards with keyboard control
- Video Disk Recorder (VDR) is a digital sat-receiver program using
- Linux and DVB-technologies. It allows one to record MPEG2 streams,
- as well as output the stream to TV.
- .
- This package contains the vdr-kbd program which is controlled via the
- PC keyboard. There are also vdr-rcu and vdr-lirc packages which
- contain another VDR versions using RCU or infrared remote control.
-
-Package: vdr-lirc
-Architecture: any
-Depends: ${shlibs:Depends}, vdr (= ${Source-Version}), lirc
-Description: Video Disk Recorder for DVB cards with IR remote control
- Video Disk Recorder (VDR) is a digital sat-receiver program using
- Linux and DVB technologies. It allows one to record MPEG2 streams,
- as well as output the stream to TV.
- .
- This package contains the vdr-lirc program which is controlled via a
- IR remote control. There are also vdr-kbd and vdr-rcu packages which
- contain another VDR versions using keyboard/rcu control.
-
-Package: vdr-rcu
-Architecture: any
-Depends: ${shlibs:Depends}, vdr (= ${Source-Version})
-Description: Video Disk Recorder for DVB cards with RCU control
- Video Disk Recorder (VDR) is a digital sat-receiver program using
- Linux and DVB technologies. It allows one to record MPEG2 streams,
- as well as output the stream to TV.
- .
- This package contains the vdr-kbd program which is controlled via the
- the "Remote Control Unit". There are also vdr-kbd and vdr-lirc
- packages which contain another VDR versions using PC keyboard or
- infrared remote control.
-
-Package: vdr-daemon
-Architecture: any
-Depends: ${shlibs:Depends}, vdr (= ${Source-Version}), debconf
-Description: Server version of Video Disk Recorder for DVB cards
- Video Disk Recorder (VDR) is a digital sat-receiver program using
- Linux and DVB technologies. It allows one to record MPEG2 streams,
- as well as output the stream to TV.
- .
- This package contains a VDR version without any direct control
- capabilities. Instead, it opens a control port and other programs
- like kvdr (from the kvdr package) can connect to the vdr-daemon and
- use it.
-
Package: vdr-plugin-sky
Architecture: any
Depends: ${shlibs:Depends}, vdr (= ${Source-Version})
Modified: vdr/vdr/trunk/debian/patches/00list
===================================================================
--- vdr/vdr/trunk/debian/patches/00list 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/patches/00list 2005-02-27 00:37:23 UTC (rev 186)
@@ -8,6 +8,7 @@
06_default_svdrp_port_0
07_not_as_root
08_security_CAN-2005-0071
+13_remote
# The Elchi AIO 4d patch for a nicer OSD, inlcuding the frames and black
# square fix.
Added: vdr/vdr/trunk/debian/patches/13_remote.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/13_remote.dpatch 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/patches/13_remote.dpatch 2005-02-27 00:37:23 UTC (rev 186)
@@ -0,0 +1,121 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_remote.dpatch by <ds@flibble.youmustbejoking.demon.co.uk>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Consolidate input device handling.
+
+@DPATCH@
+diff -urNad vdr-1.2.6/Makefile /tmp/dpep.8j05le/vdr-1.2.6/Makefile
+--- vdr-1.2.6/Makefile 2005-02-27 00:02:04.864404216 +0100
++++ /tmp/dpep.8j05le/vdr-1.2.6/Makefile 2005-02-27 00:02:05.231348432 +0100
+@@ -43,11 +43,10 @@
+ OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
+ FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
+
+-ifndef NO_KBD
+-DEFINES += -DREMOTE_KBD
+-endif
++REMOTE_LIRC ?= /dev/lircd
++REMOTE_RCU ?= /dev/ttyS1
+
+-DEFINES += -DREMOTE_$(REMOTE)
++DEFINES += -DREMOTE_RCU=\"$(REMOTE_RCU)\" -DREMOTE_LIRC=\"$(REMOTE_LIRC)\"
+
+ DEFINES += -DCMD_SUBMENUS
+ DEFINES += -D_GNU_SOURCE
+diff -urNad vdr-1.2.6/vdr.1 /tmp/dpep.8j05le/vdr-1.2.6/vdr.1
+--- vdr-1.2.6/vdr.1 2003-05-29 13:58:28.000000000 +0200
++++ /tmp/dpep.8j05le/vdr-1.2.6/vdr.1 2005-02-27 00:06:28.218368328 +0100
+@@ -45,8 +45,19 @@
+ Read config files from directory \fIdir\fR
+ (default is to read them from the video directory).
+ .TP
+-.B -d, --daemon
+-Run in daemon mode.
++.B \-d, \-\-daemon
++Run in daemon mode. (This implies \-\-no\-kbd.)
++.TP
++.B \-\-no\-kbd
++Don't use the keyboard as an input device.
++.TP
++.BI \-\-lirc [=DEVICE]
++If this option is present, vdr will use a LIRC remote control device.
++If the device name is omitted, vdr uses \fI/dev/lircd\fR.
++.TP
++.BI \-\-rcu [=DEVICE]
++If this option is present, vdr will use a serial port remote control device.
++If the device name is omitted, vdr uses \fI/dev/ttyS1\fR.
+ .TP
+ .BI -D\ num ,\ --device= num
+ Use only the given DVB device (\fInum\fR = 0, 1, 2...).
+diff -urNad vdr-1.2.6/vdr.c /tmp/dpep.8j05le/vdr-1.2.6/vdr.c
+--- vdr-1.2.6/vdr.c 2005-02-27 00:02:04.889400416 +0100
++++ /tmp/dpep.8j05le/vdr-1.2.6/vdr.c 2005-02-27 00:09:23.444729872 +0100
+@@ -200,6 +200,8 @@
+ int WatchdogTimeout = DEFAULTWATCHDOG;
+ const char *Terminal = NULL;
+ const char *Shutdown = NULL;
++ const char *rcu = NULL, *lirc = NULL;
++ int kbd = 1;
+ cPluginManager PluginManager(DEFAULTPLUGINDIR);
+ const char* username = NULL;
+ const char* groupname = NULL;
+@@ -224,6 +226,9 @@
+ { "watchdog", required_argument, NULL, 'w' },
+ { "user", required_argument, NULL, 'u' },
+ { "group", required_argument, NULL, 'g' },
++ { "no-kbd", no_argument, NULL, 'k'&31 },
++ { "rcu", optional_argument, NULL, 'r'&31 },
++ { "lirc", optional_argument, NULL, 'l'&31 },
+ { NULL }
+ };
+
+@@ -322,6 +327,15 @@
+ break;
+ case 'g': groupname = optarg;
+ break;
++ case 'k'&31:
++ kbd = 0;
++ break;
++ case 'r'&31:
++ rcu = optarg ? : REMOTE_RCU;
++ break;
++ case 'l'&31:
++ lirc = optarg ? : REMOTE_LIRC;
++ break;
+ default: return 2;
+ }
+ }
+@@ -383,6 +397,11 @@
+ " seconds (default: %d); '0' disables the watchdog\n"
+ " -u USER, --user=USER run as user USER instead of root\n"
+ " -g GROUP, --group=GROUP use group GROUP instead of primary group of user\n"
++ " --no-kbd don't use the keyboard as an input device\n"
++ " --rcu[=PATH] use a remote control device, attached to PATH\n"
++ " (default: " REMOTE_RCU ")\n"
++ " --lirc use a LIRC remote control device, attached to PATH\n"
++ " (default: " REMOTE_LIRC ")\n"
+ "\n",
+ cSIProcessor::GetEpgDataFileName() ? cSIProcessor::GetEpgDataFileName() : "'-'",
+ DEFAULTPLUGINDIR,
+@@ -555,15 +574,12 @@
+ return 2;
+
+ // Remote Controls:
+-#if defined(REMOTE_RCU)
+- new cRcuRemote("/dev/ttyS1");
+-#elif defined(REMOTE_LIRC)
+- new cLircRemote("/dev/lircd");
+-#endif
+-#if defined(REMOTE_KBD)
+- if (!DaemonMode && HasStdin)
++ if (rcu)
++ new cRcuRemote((char*)rcu);
++ if (lirc)
++ new cLircRemote((char*)lirc);
++ if (!DaemonMode && HasStdin && kbd)
+ new cKbdRemote;
+-#endif
+ Interface->LearnKeys();
+
+ // External audio:
Property changes on: vdr/vdr/trunk/debian/patches/13_remote.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: vdr/vdr/trunk/debian/patches/opt-20_elchiaio4d+1.dpatch
===================================================================
--- vdr/vdr/trunk/debian/patches/opt-20_elchiaio4d+1.dpatch 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/patches/opt-20_elchiaio4d+1.dpatch 2005-02-27 00:37:23 UTC (rev 186)
@@ -10,9 +10,9 @@
## DP: ELCHI AIO Version 4d osd improvement patch
@DPATCH@
-diff -Nur vdr.orig/config.c vdr/config.c
---- vdr.orig/config.c 2004-07-22 20:19:11.000000000 +0200
-+++ vdr/config.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/config.c /tmp/dpep.R4020h/vdr-1.2.6/config.c
+--- vdr-1.2.6/config.c 2005-02-27 00:58:27.417178032 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/config.c 2005-02-27 00:58:28.012087592 +0100
@@ -15,6 +15,8 @@
#include "plugin.h"
#include "recording.h"
@@ -358,9 +358,9 @@
+ }
+ return false;
+}
-diff -Nur vdr.orig/config.h vdr/config.h
---- vdr.orig/config.h 2004-07-22 20:19:11.000000000 +0200
-+++ vdr/config.h 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/config.h /tmp/dpep.R4020h/vdr-1.2.6/config.h
+--- vdr-1.2.6/config.h 2005-02-27 00:58:27.493166480 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/config.h 2005-02-27 00:58:28.013087440 +0100
@@ -22,6 +22,8 @@
#define VDRVERSION "1.2.6"
#define VDRVERSNUM 10206 // Version * 10000 + Major * 100 + Minor
@@ -479,9 +479,9 @@
+};
+
#endif //__CONFIG_H
-diff -Nur vdr.orig/dvbplayer.c vdr/dvbplayer.c
---- vdr.orig/dvbplayer.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/dvbplayer.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/dvbplayer.c /tmp/dpep.R4020h/vdr-1.2.6/dvbplayer.c
+--- vdr-1.2.6/dvbplayer.c 2003-05-24 11:04:26.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/dvbplayer.c 2005-02-27 00:58:28.013087440 +0100
@@ -173,7 +173,7 @@
//XXX+ also used in recorder.c - find a better place???
// The size of the array used to buffer video data:
@@ -491,9 +491,9 @@
// The number of frames to back up when resuming an interrupted replay session:
#define RESUMEBACKUP (10 * FRAMESPERSEC)
-diff -Nur vdr.orig/eit.c vdr/eit.c
---- vdr.orig/eit.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/eit.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/eit.c /tmp/dpep.R4020h/vdr-1.2.6/eit.c
+--- vdr-1.2.6/eit.c 2003-10-12 13:05:42.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/eit.c 2005-02-27 00:58:28.015087136 +0100
@@ -280,6 +280,16 @@
return szEndTime;
}
@@ -511,9 +511,9 @@
time_t cEventInfo::GetTime() const
{
return tTime;
-diff -Nur vdr.orig/eit.h vdr/eit.h
---- vdr.orig/eit.h 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/eit.h 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/eit.h /tmp/dpep.R4020h/vdr-1.2.6/eit.h
+--- vdr-1.2.6/eit.h 2003-05-17 11:15:56.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/eit.h 2005-02-27 00:58:28.015087136 +0100
@@ -60,6 +60,7 @@
const unsigned char GetTableID(void) const;
const char *GetTimeString(void) const;
@@ -522,9 +522,9 @@
const char *GetDate(void) const;
bool IsFollowing(void) const;
bool IsPresent(void) const;
-diff -Nur vdr.orig/font.c vdr/font.c
---- vdr.orig/font.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/font.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/font.c /tmp/dpep.R4020h/vdr-1.2.6/font.c
+--- vdr-1.2.6/font.c 2000-11-18 16:16:08.000000000 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/font.c 2005-02-27 00:58:28.016086984 +0100
@@ -12,6 +12,8 @@
#include "fontfix.c"
@@ -544,9 +544,9 @@
// TODO others...
}
}
-diff -Nur vdr.orig/font.h vdr/font.h
---- vdr.orig/font.h 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/font.h 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/font.h /tmp/dpep.R4020h/vdr-1.2.6/font.h
+--- vdr-1.2.6/font.h 2000-11-18 15:51:45.000000000 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/font.h 2005-02-27 00:58:28.016086984 +0100
@@ -12,13 +12,17 @@
enum eDvbFont {
@@ -565,9 +565,9 @@
class cFont {
public:
enum { NUMCHARS = 256 };
-diff -Nur vdr.orig/fontsml.c vdr/fontsml.c
---- vdr.orig/fontsml.c 1970-01-01 01:00:00.000000000 +0100
-+++ vdr/fontsml.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/fontsml.c /tmp/dpep.R4020h/vdr-1.2.6/fontsml.c
+--- vdr-1.2.6/fontsml.c 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/fontsml.c 2005-02-27 00:58:28.022086072 +0100
@@ -0,0 +1,5602 @@
+cFont::tPixelData FontSml[][24] = {
+ { // 32
@@ -6171,9 +6171,9 @@
+ 0x000001C0, // ..***.....
+ },
+ };
-diff -Nur vdr.orig/fontsym.c vdr/fontsym.c
---- vdr.orig/fontsym.c 1970-01-01 01:00:00.000000000 +0100
-+++ vdr/fontsym.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/fontsym.c /tmp/dpep.R4020h/vdr-1.2.6/fontsym.c
+--- vdr-1.2.6/fontsym.c 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/fontsym.c 2005-02-27 00:58:28.025085616 +0100
@@ -0,0 +1,1724 @@
+cFont::tPixelData FontSym[][29] = {
+ { // 32
@@ -7899,9 +7899,9 @@
+ 0x00000000, // ......
+ },
+ };
-diff -Nur vdr.orig/HISTORY-ElchiAIO vdr/HISTORY-ElchiAIO
---- vdr.orig/HISTORY-ElchiAIO 1970-01-01 01:00:00.000000000 +0100
-+++ vdr/HISTORY-ElchiAIO 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/HISTORY-ElchiAIO /tmp/dpep.R4020h/vdr-1.2.6/HISTORY-ElchiAIO
+--- vdr-1.2.6/HISTORY-ElchiAIO 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/HISTORY-ElchiAIO 2005-02-27 00:58:28.026085464 +0100
@@ -0,0 +1,114 @@
+History ElchiAIO:
+-----------------
@@ -8017,9 +8017,9 @@
+- updated version number
+
+Please report any bugs/anomalies in VDRPortal forums - preferably with working fixes!
-diff -Nur vdr.orig/i18n.c vdr/i18n.c
---- vdr.orig/i18n.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/i18n.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/i18n.c /tmp/dpep.R4020h/vdr-1.2.6/i18n.c
+--- vdr-1.2.6/i18n.c 2003-09-11 15:51:56.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/i18n.c 2005-02-27 00:58:28.028085160 +0100
@@ -3739,6 +3739,1230 @@
"Ennek a plugin-nak nincs setup-parametere!",
"Aquest plugin no admet configuració!",
@@ -9251,9 +9251,9 @@
{ NULL }
};
-diff -Nur vdr.orig/interface.c vdr/interface.c
---- vdr.orig/interface.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/interface.c 2004-08-01 13:42:59.000000000 +0200
+diff -urNad vdr-1.2.6/interface.c /tmp/dpep.R4020h/vdr-1.2.6/interface.c
+--- vdr-1.2.6/interface.c 2003-10-24 16:38:08.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/interface.c 2005-02-27 00:58:28.029085008 +0100
@@ -14,6 +14,7 @@
#include "i18n.h"
#include "osd.h"
@@ -9479,9 +9479,9 @@
cStatus::MsgOsdHelpKeys(Red, Green, Yellow, Blue);
}
-diff -Nur vdr.orig/interface.h vdr/interface.h
---- vdr.orig/interface.h 2004-05-30 00:23:11.000000000 +0200
-+++ vdr/interface.h 2004-08-01 13:42:59.000000000 +0200
+diff -urNad vdr-1.2.6/interface.h /tmp/dpep.R4020h/vdr-1.2.6/interface.h
+--- vdr-1.2.6/interface.h 2003-10-05 11:42:53.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/interface.h 2005-02-27 00:58:28.029085008 +0100
@@ -32,6 +32,7 @@
~cInterface();
bool IsOpen(void) { return open > 0; }
@@ -9490,22 +9490,22 @@
void Close(void);
bool HasSVDRPConnection(void) { return SVDRP && SVDRP->HasConnection(); }
void Interrupt(void) { interrupted = true; }
-diff -Nur vdr.orig/Makefile vdr/Makefile
---- vdr.orig/Makefile 2004-07-22 20:19:11.000000000 +0200
-+++ vdr/Makefile 2004-08-01 13:40:47.000000000 +0200
-@@ -42,6 +42,9 @@
- OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
- FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
+diff -urNad vdr-1.2.6/Makefile /tmp/dpep.R4020h/vdr-1.2.6/Makefile
+--- vdr-1.2.6/Makefile 2005-02-27 00:58:27.457171952 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/Makefile 2005-02-27 00:58:47.472129216 +0100
+@@ -39,6 +39,9 @@
+ receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o sources.o\
+ spu.o status.o svdrp.o thread.o timers.o tools.o transfer.o vdr.o videodir.o
+# ElchiAIO
+OBJS += theme.o
+
- ifndef NO_KBD
- DEFINES += -DREMOTE_KBD
- endif
-diff -Nur vdr.orig/menu.c vdr/menu.c
---- vdr.orig/menu.c 2004-07-22 20:19:11.000000000 +0200
-+++ vdr/menu.c 2004-08-01 13:42:59.000000000 +0200
+ OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
+ FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
+
+diff -urNad vdr-1.2.6/menu.c /tmp/dpep.R4020h/vdr-1.2.6/menu.c
+--- vdr-1.2.6/menu.c 2005-02-27 00:58:27.444173928 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/menu.c 2005-02-27 00:58:28.033084400 +0100
@@ -655,7 +655,7 @@
{
channel = Channel;
@@ -11102,9 +11102,9 @@
Interface->Fill(0, 2, 11, 1, clrBackground);
return osContinue;
}
-diff -Nur vdr.orig/menu.h vdr/menu.h
---- vdr.orig/menu.h 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/menu.h 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/menu.h /tmp/dpep.R4020h/vdr-1.2.6/menu.h
+--- vdr-1.2.6/menu.h 2003-08-03 11:37:18.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/menu.h 2005-02-27 00:58:28.033084400 +0100
@@ -16,6 +16,7 @@
#include "dvbplayer.h"
#include "recorder.h"
@@ -11157,9 +11157,9 @@
bool visible, modeOnly, shown, displayFrames;
int lastCurrent, lastTotal;
time_t timeoutShow;
-diff -Nur vdr.orig/menuitems.c vdr/menuitems.c
---- vdr.orig/menuitems.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/menuitems.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/menuitems.c /tmp/dpep.R4020h/vdr-1.2.6/menuitems.c
+--- vdr-1.2.6/menuitems.c 2003-04-12 11:21:33.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/menuitems.c 2005-02-27 00:58:28.034084248 +0100
@@ -12,6 +12,9 @@
#include "i18n.h"
#include "plugin.h"
@@ -11401,9 +11401,9 @@
h = H;
fgColor = FgColor;
bgColor = BgColor;
-diff -Nur vdr.orig/menuitems.h vdr/menuitems.h
---- vdr.orig/menuitems.h 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/menuitems.h 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/menuitems.h /tmp/dpep.R4020h/vdr-1.2.6/menuitems.h
+--- vdr-1.2.6/menuitems.h 2003-01-12 16:06:23.000000000 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/menuitems.h 2005-02-27 00:58:28.035084096 +0100
@@ -75,6 +75,9 @@
void SetHelpKeys(void);
virtual void Set(void);
@@ -11414,9 +11414,9 @@
public:
cMenuEditStrItem(const char *Name, char *Value, int Length, const char *Allowed);
~cMenuEditStrItem();
-diff -Nur vdr.orig/osdbase.c vdr/osdbase.c
---- vdr.orig/osdbase.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/osdbase.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/osdbase.c /tmp/dpep.R4020h/vdr-1.2.6/osdbase.c
+--- vdr-1.2.6/osdbase.c 2003-08-24 13:38:27.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/osdbase.c 2005-02-27 00:58:28.035084096 +0100
@@ -14,6 +14,75 @@
#include <sys/stat.h>
#include <sys/unistd.h>
@@ -11664,9 +11664,9 @@
// --- cWindow ---------------------------------------------------------------
cWindow::cWindow(int Handle, int x, int y, int w, int h, int Bpp, bool ClearWithBackground, bool Tiled)
-diff -Nur vdr.orig/osdbase.h vdr/osdbase.h
---- vdr.orig/osdbase.h 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/osdbase.h 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/osdbase.h /tmp/dpep.R4020h/vdr-1.2.6/osdbase.h
+--- vdr-1.2.6/osdbase.h 2002-09-08 16:12:41.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/osdbase.h 2005-02-27 00:58:28.036083944 +0100
@@ -13,7 +13,7 @@
#include <stdio.h>
#include "font.h"
@@ -11736,9 +11736,9 @@
};
#define MAXNUMWINDOWS 7 // OSD windows are counted 1...7
-diff -Nur vdr.orig/osd.c vdr/osd.c
---- vdr.orig/osd.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/osd.c 2004-08-01 13:42:59.000000000 +0200
+diff -urNad vdr-1.2.6/osd.c /tmp/dpep.R4020h/vdr-1.2.6/osd.c
+--- vdr-1.2.6/osd.c 2003-06-04 18:13:00.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/osd.c 2005-02-27 00:58:28.036083944 +0100
@@ -12,6 +12,7 @@
#include "device.h"
#include "i18n.h"
@@ -12022,9 +12022,9 @@
case kUp|k_Repeat:
case kUp: CursorUp(); break;
case kDown|k_Repeat:
-diff -Nur vdr.orig/osd.h vdr/osd.h
---- vdr.orig/osd.h 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/osd.h 2004-08-01 13:42:59.000000000 +0200
+diff -urNad vdr-1.2.6/osd.h /tmp/dpep.R4020h/vdr-1.2.6/osd.h
+--- vdr-1.2.6/osd.h 2003-09-14 12:59:22.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/osd.h 2005-02-27 00:58:28.079077408 +0100
@@ -50,6 +50,8 @@
osUser8,
osUser9,
@@ -12065,9 +12065,9 @@
protected:
bool visible;
const char *hk(const char *s);
-diff -Nur vdr.orig/recorder.c vdr/recorder.c
---- vdr.orig/recorder.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/recorder.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/recorder.c /tmp/dpep.R4020h/vdr-1.2.6/recorder.c
+--- vdr-1.2.6/recorder.c 2003-08-02 15:01:19.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/recorder.c 2005-02-27 00:58:28.079077408 +0100
@@ -14,7 +14,7 @@
// The size of the array used to buffer video data:
@@ -12077,9 +12077,9 @@
// The maximum time we wait before assuming that a recorded video data stream
// is broken:
-diff -Nur vdr.orig/recording.c vdr/recording.c
---- vdr.orig/recording.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/recording.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/recording.c /tmp/dpep.R4020h/vdr-1.2.6/recording.c
+--- vdr-1.2.6/recording.c 2003-11-08 16:25:35.000000000 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/recording.c 2005-02-27 00:58:28.080077256 +0100
@@ -45,8 +45,9 @@
#define RESUMEFILESUFFIX "/resume%s%s.vdr"
#define SUMMARYFILESUFFIX "/summary.vdr"
@@ -12209,9 +12209,9 @@
// The number of frames to stay off the end in case of time shift:
#define INDEXSAFETYLIMIT 150 // frames
-diff -Nur vdr.orig/recording.h vdr/recording.h
---- vdr.orig/recording.h 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/recording.h 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/recording.h /tmp/dpep.R4020h/vdr-1.2.6/recording.h
+--- vdr-1.2.6/recording.h 2003-10-17 16:27:36.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/recording.h 2005-02-27 00:58:28.080077256 +0100
@@ -66,6 +66,9 @@
bool Remove(void);
// Actually removes the file from the disk
@@ -12231,9 +12231,9 @@
// The maximum file size is limited by the range that can be covered
// with 'int'. 4GB might be possible (if the range is considered
-diff -Nur vdr.orig/remux.c vdr/remux.c
---- vdr.orig/remux.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/remux.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/remux.c /tmp/dpep.R4020h/vdr-1.2.6/remux.c
+--- vdr-1.2.6/remux.c 2003-09-14 12:34:39.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/remux.c 2005-02-27 00:58:28.081077104 +0100
@@ -106,7 +106,7 @@
#define ADAPT_FIELD 0x20
@@ -12243,9 +12243,9 @@
#define IPACKS 2048
-diff -Nur vdr.orig/theme.c vdr/theme.c
---- vdr.orig/theme.c 1970-01-01 01:00:00.000000000 +0100
-+++ vdr/theme.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/theme.c /tmp/dpep.R4020h/vdr-1.2.6/theme.c
+--- vdr-1.2.6/theme.c 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/theme.c 2005-02-27 00:58:28.082076952 +0100
@@ -0,0 +1,370 @@
+/*
+ * theme.c: Theme implementations
@@ -12617,9 +12617,9 @@
+ height += 3;
+ return height;
+}
-diff -Nur vdr.orig/theme.h vdr/theme.h
---- vdr.orig/theme.h 1970-01-01 01:00:00.000000000 +0100
-+++ vdr/theme.h 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/theme.h /tmp/dpep.R4020h/vdr-1.2.6/theme.h
+--- vdr-1.2.6/theme.h 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/theme.h 2005-02-27 00:58:28.082076952 +0100
@@ -0,0 +1,123 @@
+/*
+ * theme.h: Theme implementation
@@ -12744,9 +12744,9 @@
+};
+
+#endif // __THEME_H
-diff -Nur vdr.orig/timers.c vdr/timers.c
---- vdr.orig/timers.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/timers.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/timers.c /tmp/dpep.R4020h/vdr-1.2.6/timers.c
+--- vdr-1.2.6/timers.c 2003-10-12 12:33:09.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/timers.c 2005-02-27 00:58:28.082076952 +0100
@@ -253,6 +253,16 @@
return weekday == 0 ? 6 : weekday - 1; // we start with monday==0!
}
@@ -12764,9 +12764,9 @@
bool cTimer::DayMatches(time_t t)
{
return IsSingleEvent() ? GetMDay(t) == day : (day & (1 << GetWDay(t))) != 0;
-diff -Nur vdr.orig/timers.h vdr/timers.h
---- vdr.orig/timers.h 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/timers.h 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/timers.h /tmp/dpep.R4020h/vdr-1.2.6/timers.h
+--- vdr-1.2.6/timers.h 2003-05-11 15:35:53.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/timers.h 2005-02-27 00:58:28.082076952 +0100
@@ -61,6 +61,7 @@
bool IsSingleEvent(void);
int GetMDay(time_t t);
@@ -12775,9 +12775,9 @@
bool DayMatches(time_t t);
static time_t IncDay(time_t t, int Days);
static time_t SetTime(time_t t, int SecondsFromMidnight);
-diff -Nur vdr.orig/tools.c vdr/tools.c
---- vdr.orig/tools.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/tools.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/tools.c /tmp/dpep.R4020h/vdr-1.2.6/tools.c
+--- vdr-1.2.6/tools.c 2003-04-06 17:31:45.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/tools.c 2005-02-27 00:58:28.083076800 +0100
@@ -17,6 +17,7 @@
#include <time.h>
#include <unistd.h>
@@ -12796,9 +12796,9 @@
snprintf(buffer, sizeof(buffer), "%s %2d.%02d %02d:%02d", WeekDayName(tm->tm_wday), tm->tm_mday, tm->tm_mon + 1, tm->tm_hour, tm->tm_min);
return buffer;
}
-diff -Nur vdr.orig/transfer.c vdr/transfer.c
---- vdr.orig/transfer.c 2004-07-17 17:27:25.000000000 +0200
-+++ vdr/transfer.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/transfer.c /tmp/dpep.R4020h/vdr-1.2.6/transfer.c
+--- vdr-1.2.6/transfer.c 2003-08-31 14:19:16.000000000 +0200
++++ /tmp/dpep.R4020h/vdr-1.2.6/transfer.c 2005-02-27 00:58:28.083076800 +0100
@@ -12,8 +12,8 @@
//XXX+ also used in recorder.c - find a better place???
// The size of the array used to buffer video data:
@@ -12810,9 +12810,9 @@
// --- cTransfer -------------------------------------------------------------
-diff -Nur vdr.orig/vdr.c vdr/vdr.c
---- vdr.orig/vdr.c 2004-07-22 20:19:11.000000000 +0200
-+++ vdr/vdr.c 2004-08-01 13:40:47.000000000 +0200
+diff -urNad vdr-1.2.6/vdr.c /tmp/dpep.R4020h/vdr-1.2.6/vdr.c
+--- vdr-1.2.6/vdr.c 2005-02-27 00:58:27.457171952 +0100
++++ /tmp/dpep.R4020h/vdr-1.2.6/vdr.c 2005-02-27 00:58:28.084076648 +0100
@@ -96,7 +96,6 @@
int SVDRPport = DEFAULTSVDRPPORT;
Modified: vdr/vdr/trunk/debian/rules
===================================================================
--- vdr/vdr/trunk/debian/rules 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/rules 2005-02-27 00:37:23 UTC (rev 186)
@@ -33,24 +33,8 @@
# Add here commands to compile the package.
- # vdr-kbd
$(MAKE) VIDEODIR=$(VIDEODIR) VFAT=1 DVBDIR=$(DVBDIR) PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
- cp vdr vdr-kbd
- make clean
-
- # vdr-daemon
- $(MAKE) VIDEODIR=$(VIDEODIR) NO_KBD=1 VFAT=1 DVBDIR=$(DVBDIR) PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
- cp vdr vdr-daemon
- make clean
-
- # vdr-lirc
- $(MAKE) VIDEODIR=$(VIDEODIR) REMOTE=LIRC VFAT=1 DVBDIR=$(DVBDIR) PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
- cp vdr vdr-lirc
- make clean
-
- # vdr-rcu
- $(MAKE) VIDEODIR=$(VIDEODIR) REMOTE=RCU VFAT=1 DVBDIR=$(DVBDIR) PLUGINLIBDIR=$(PLUGINDIR) CFGDIR=$(CFGDIR)
- cp vdr vdr-rcu
+ ln -f vdr vdr-kbd
make include-dir
@@ -79,7 +63,7 @@
-$(MAKE) plugins-clean
-$(MAKE) clean
- rm -f vdr-kbd vdr-daemon vdr-lirc vdr-rcu
+ rm -f vdr-kbd
rm -rf PLUGINS/lib
rm -f vdr-newplugin
sh debian/patchlevel.sh clean
Added: vdr/vdr/trunk/debian/scripts/vdr-daemon
===================================================================
--- vdr/vdr/trunk/debian/scripts/vdr-daemon 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/scripts/vdr-daemon 2005-02-27 00:37:23 UTC (rev 186)
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec /usr/bin/vdr-kbd "$@" --no-kbd
Added: vdr/vdr/trunk/debian/scripts/vdr-lirc
===================================================================
--- vdr/vdr/trunk/debian/scripts/vdr-lirc 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/scripts/vdr-lirc 2005-02-27 00:37:23 UTC (rev 186)
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec /usr/bin/vdr-kbd "$@" --lirc
Added: vdr/vdr/trunk/debian/scripts/vdr-rcu
===================================================================
--- vdr/vdr/trunk/debian/scripts/vdr-rcu 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/scripts/vdr-rcu 2005-02-27 00:37:23 UTC (rev 186)
@@ -0,0 +1,2 @@
+#! /bin/sh
+exec /usr/bin/vdr-kbd "$@" --rcu
Deleted: vdr/vdr/trunk/debian/vdr-daemon.install
===================================================================
--- vdr/vdr/trunk/debian/vdr-daemon.install 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-daemon.install 2005-02-27 00:37:23 UTC (rev 186)
@@ -1 +0,0 @@
-vdr-daemon usr/bin/
Deleted: vdr/vdr/trunk/debian/vdr-daemon.links
===================================================================
--- vdr/vdr/trunk/debian/vdr-daemon.links 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-daemon.links 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,2 +0,0 @@
-usr/share/doc/vdr usr/share/doc/vdr-daemon
-usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-daemon.1.gz
Deleted: vdr/vdr/trunk/debian/vdr-daemon.postinst
===================================================================
--- vdr/vdr/trunk/debian/vdr-daemon.postinst 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-daemon.postinst 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,14 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
- abort-upgrade)
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-daemon 100
- ;;
- configure)
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-daemon 100
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: vdr/vdr/trunk/debian/vdr-daemon.prerm
===================================================================
--- vdr/vdr/trunk/debian/vdr-daemon.prerm 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-daemon.prerm 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,11 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
- remove)
- update-alternatives --remove vdr /usr/bin/vdr-daemon
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: vdr/vdr/trunk/debian/vdr-kbd.install
===================================================================
--- vdr/vdr/trunk/debian/vdr-kbd.install 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-kbd.install 2005-02-27 00:37:23 UTC (rev 186)
@@ -1 +0,0 @@
-vdr-kbd usr/bin/
Deleted: vdr/vdr/trunk/debian/vdr-kbd.links
===================================================================
--- vdr/vdr/trunk/debian/vdr-kbd.links 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-kbd.links 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,2 +0,0 @@
-usr/share/doc/vdr usr/share/doc/vdr-kbd
-usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-kbd.1.gz
Deleted: vdr/vdr/trunk/debian/vdr-kbd.postinst
===================================================================
--- vdr/vdr/trunk/debian/vdr-kbd.postinst 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-kbd.postinst 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,14 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
- abort-upgrade)
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-kbd 110
- ;;
- configure)
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-kbd 110
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: vdr/vdr/trunk/debian/vdr-kbd.prerm
===================================================================
--- vdr/vdr/trunk/debian/vdr-kbd.prerm 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-kbd.prerm 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,11 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
- remove)
- update-alternatives --remove vdr /usr/bin/vdr-kbd
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: vdr/vdr/trunk/debian/vdr-lirc.install
===================================================================
--- vdr/vdr/trunk/debian/vdr-lirc.install 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-lirc.install 2005-02-27 00:37:23 UTC (rev 186)
@@ -1 +0,0 @@
-vdr-lirc usr/bin/
Deleted: vdr/vdr/trunk/debian/vdr-lirc.links
===================================================================
--- vdr/vdr/trunk/debian/vdr-lirc.links 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-lirc.links 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,2 +0,0 @@
-usr/share/doc/vdr usr/share/doc/vdr-lirc
-usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-lirc.1.gz
Deleted: vdr/vdr/trunk/debian/vdr-lirc.postinst
===================================================================
--- vdr/vdr/trunk/debian/vdr-lirc.postinst 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-lirc.postinst 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,14 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
- abort-upgrade)
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-lirc 120
- ;;
- configure)
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-lirc 120
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: vdr/vdr/trunk/debian/vdr-lirc.prerm
===================================================================
--- vdr/vdr/trunk/debian/vdr-lirc.prerm 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-lirc.prerm 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,11 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
- remove)
- update-alternatives --remove vdr /usr/bin/vdr-lirc
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: vdr/vdr/trunk/debian/vdr-rcu.install
===================================================================
--- vdr/vdr/trunk/debian/vdr-rcu.install 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-rcu.install 2005-02-27 00:37:23 UTC (rev 186)
@@ -1 +0,0 @@
-vdr-rcu usr/bin/
Deleted: vdr/vdr/trunk/debian/vdr-rcu.links
===================================================================
--- vdr/vdr/trunk/debian/vdr-rcu.links 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-rcu.links 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,2 +0,0 @@
-usr/share/doc/vdr usr/share/doc/vdr-rcu
-usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-rcu.1.gz
Deleted: vdr/vdr/trunk/debian/vdr-rcu.postinst
===================================================================
--- vdr/vdr/trunk/debian/vdr-rcu.postinst 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-rcu.postinst 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,14 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
- abort-upgrade)
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-rcu 105
- ;;
- configure)
- update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-rcu 105
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Deleted: vdr/vdr/trunk/debian/vdr-rcu.prerm
===================================================================
--- vdr/vdr/trunk/debian/vdr-rcu.prerm 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr-rcu.prerm 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,11 +0,0 @@
-#! /bin/sh -e
-
-case "$1" in
- remove)
- update-alternatives --remove vdr /usr/bin/vdr-rcu
- ;;
-esac
-
-#DEBHELPER#
-
-exit 0
Modified: vdr/vdr/trunk/debian/vdr.NEWS
===================================================================
--- vdr/vdr/trunk/debian/vdr.NEWS 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr.NEWS 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,3 +1,19 @@
+vdr (1.2.6-9) experimental; urgency=low
+
+ This release adds a patch which allows us to have just one binary-
+ package for all four control-methods, so we do not need the
+ packages vdr-daemon, vdr-kbd, vdr-lirc and vdr-rcu anymore.
+ You can run vdr with the control-method you want by calling
+ /usr/bin/vdr-{daemon,kbd,lirc,rcu} or by using
+
+ update-alternatives --config vdr
+
+ and setting it to the desired control-method. (lirc is default)
+ After this a call of /usr/bin/vdr will allways use the control-
+ method you selected with update-alternatives.
+
+ -- Thomas Schmidt <tschmidt@debian.org> Sun, 27 Feb 2005 00:44:05 +0100
+
vdr (1.2.6-6) unstable; urgency=low
The most important change in this release is that vdr from now on
Modified: vdr/vdr/trunk/debian/vdr.install
===================================================================
--- vdr/vdr/trunk/debian/vdr.install 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr.install 2005-02-27 00:37:23 UTC (rev 186)
@@ -1,3 +1,8 @@
+vdr-kbd usr/bin/
+debian/scripts/vdr-daemon usr/bin/
+debian/scripts/vdr-lirc usr/bin/
+debian/scripts/vdr-rcu usr/bin/
+
epg2html.pl usr/lib/vdr/
svdrpsend.pl usr/lib/vdr/
@@ -30,4 +35,3 @@
debian/S90.custom etc/vdr/shutdown-hooks/
debian/lintian/vdr usr/share/lintian/overrides/
-
Modified: vdr/vdr/trunk/debian/vdr.links
===================================================================
--- vdr/vdr/trunk/debian/vdr.links 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr.links 2005-02-27 00:37:23 UTC (rev 186)
@@ -12,3 +12,8 @@
/etc/vdr/recording-hooks/R90.custom /usr/share/vdr/recording-hooks/R90.custom
/etc/vdr/shutdown-hooks/S90.custom /usr/share/vdr/shutdown-hooks/S90.custom
+
+usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-daemon.1.gz
+usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-kbd.1.gz
+usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-lirc.1.gz
+usr/share/man/man1/vdr.1.gz usr/share/man/man1/vdr-rcu.1.gz
Modified: vdr/vdr/trunk/debian/vdr.postinst
===================================================================
--- vdr/vdr/trunk/debian/vdr.postinst 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr.postinst 2005-02-27 00:37:23 UTC (rev 186)
@@ -127,6 +127,12 @@
[ ! -e /usr/lib/vdr/vdr-shutdown.wrapper ] || \
chown root:$GROUP /usr/lib/vdr/vdr-shutdown.wrapper && \
chmod 6750 /usr/lib/vdr/vdr-shutdown.wrapper
+
+ # Install alternatives for the different control methods
+ update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-lirc 120
+ update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-kbd 110
+ update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-rcu 105
+ update-alternatives --install /usr/bin/vdr vdr /usr/bin/vdr-daemon 100
;;
abort-upgrade|abort-remove|abort-deconfigure)
Added: vdr/vdr/trunk/debian/vdr.prerm
===================================================================
--- vdr/vdr/trunk/debian/vdr.prerm 2005-02-26 19:35:37 UTC (rev 185)
+++ vdr/vdr/trunk/debian/vdr.prerm 2005-02-27 00:37:23 UTC (rev 186)
@@ -0,0 +1,19 @@
+#! /bin/sh
+# prerm script for vdr
+#
+# see: dh_installdeb(1)
+
+set -e
+
+case "$1" in
+ remove)
+ update-alternatives --remove vdr /usr/bin/vdr-daemon
+ update-alternatives --remove vdr /usr/bin/vdr-kbd
+ update-alternatives --remove vdr /usr/bin/vdr-lirc
+ update-alternatives --remove vdr /usr/bin/vdr-rcu
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0