diff -up vdr-1.6.0/HISTORY.orig vdr-1.6.0/HISTORY --- vdr-1.6.0/HISTORY.orig 2008-03-23 12:26:08.000000000 +0200 +++ vdr-1.6.0/HISTORY 2008-04-04 22:34:13.000000000 +0300 @@ -1140,7 +1140,7 @@ Video Disk Recorder Revision History important if this takes some time. - Fixed scrolling the "Channels" menu in case the cursor ends up on a group delimiter (thanks to Bernd Zierath for helping to debug this one). -- Added manual pages vdr(1) and vdr(5) (which made the FORMATS file obsolete). +- Added manual pages vdr(8) and vdr(5) (which made the FORMATS file obsolete). - New command command line option '-V' to display the VDR version. - Adjusting column width for channel numbers in case there are more than 999 channels. @@ -1250,7 +1250,7 @@ Video Disk Recorder Revision History - Begin of the 1.1 development branch. THIS IS NOT A STABLE VERSION! The current stable version for every day use is still the 1.0 branch. - First step towards a universal plugin interface. See the file PLUGINS.html - for a detailed description. The man page vdr(1) describes the new options '-L' + for a detailed description. The man page vdr(8) describes the new options '-L' and '-P' used to load plugins. This first step implements the complete "outer" shell for plugins. The "inner" access to VDR data structures will follow. - The VDR version number is now displayed in the title line of the "Setup" menu. @@ -3892,7 +3892,7 @@ Video Disk Recorder Revision History - Added '__attribute__' to functions that use printf() like parameters (thanks to Darren Salt). - Updated the Finnish OSD texts (thanks to Rolf Ahrenberg). -- Fixed a leftover 'summary.vdr' in vdr.1 (reported by Christoph Hermanns). +- Fixed a leftover 'summary.vdr' in vdr.8 (reported by Christoph Hermanns). - Added more error messages and line numbers when reading EPG data and info.vdr (thanks to Peter Bieringer). - Updated the Danish OSD texts (thanks to Mogens Elneff). @@ -4163,7 +4163,7 @@ Video Disk Recorder Revision History - Key macros can now be defined for all non-modeless keys (suggested by Mirko Dölle). - Adjusted the "KEY MACROS" section of vdr.5 to the new plugin calling mechanism introduced in version 1.3.32. -- Removed the now obsolete "ca.conf" section from vdr.1 (thanks to Ville Skyttä). +- Removed the now obsolete "ca.conf" section from vdr.8 (thanks to Ville Skyttä). - Added missing description of L and R circular polarization to 'diseqc.conf'. - Added a note about "modprobe capability" to INSTALL (suggested by Patrick Cernko). - Fixed canonicalizing the file name in the SVDRP command GRAB to allow full path @@ -4520,7 +4520,7 @@ Video Disk Recorder Revision History - Added a missing "Key$" in skincurses.c (reported by Darren Salt). - Reintroduced the log message "deleting plugin: ..." when shutting down VDR (upon request by Ville Skyttä, as in the initial patch from Christoph Haubrich). -- Fixed the vdr.1 man page (a single DVB card can record and do live tv). +- Fixed the vdr.8 man page (a single DVB card can record and do live tv). - The preferred audio language is now automatically selected when starting replay. - Updated the Danish OSD texts (thanks to Mogens Elneff). - The new function cPlugin::Active() can be used by a plugin to indicate that it @@ -4810,7 +4810,7 @@ Video Disk Recorder Revision History Note to all plugin developers: a plugin's Makefile *must* define the PLUGIN macro, even if it doesn't use it itself! - Added a comment regarding the PLUGIN macro to the 'newplugin' script. -- Added '--vfat' to the vdr.1 man page (reported by Udo Richter). +- Added '--vfat' to the vdr.8 man page (reported by Udo Richter). - Removed a double fdopen() in cPipe::Open() (reported by Stefan Huelswitt). - Fixed handling the running status of EPG events before the currently running one, in case they are added after the current event. diff -up vdr-1.6.0/vdr.5.orig vdr-1.6.0/vdr.5 --- vdr-1.6.0/vdr.5.orig 2008-03-09 17:46:57.000000000 +0200 +++ vdr-1.6.0/vdr.5 2008-04-04 22:34:13.000000000 +0300 @@ -663,7 +663,7 @@ just 16 bit wide. The internal represent be used, so that external tools can generate EPG data that is guaranteed not to collide with the ids of existing data. .SH SEE ALSO -.BR vdr (1) +.BR vdr (8) .SH AUTHOR Written by Klaus Schmidinger. .SH REPORTING BUGS diff -up vdr-1.6.0/Makefile.orig vdr-1.6.0/Makefile --- vdr-1.6.0/Makefile.orig 2008-02-29 23:43:03.000000000 +0200 +++ vdr-1.6.0/Makefile 2008-04-04 22:36:05.000000000 +0300 @@ -181,10 +181,8 @@ install-conf: # Documentation: install-doc: - @mkdir -p $(DESTDIR)$(MANDIR)/man1 - @mkdir -p $(DESTDIR)$(MANDIR)/man5 - @gzip -c vdr.1 > $(DESTDIR)$(MANDIR)/man1/vdr.1.gz - @gzip -c vdr.5 > $(DESTDIR)$(MANDIR)/man5/vdr.5.gz + install -Dpm 644 vdr.1 $(DESTDIR)$(MANDIR)/man8/vdr.8 + install -Dpm 644 vdr.5 $(DESTDIR)$(MANDIR)/man5/vdr.5 # Plugins: diff -up vdr-1.6.0/vdr.1.orig vdr-1.6.0/vdr.1 --- vdr-1.6.0/vdr.1.orig 2008-03-09 18:07:06.000000000 +0200 +++ vdr-1.6.0/vdr.1 2008-04-04 22:34:13.000000000 +0300 @@ -8,9 +8,9 @@ .\" License as specified in the file COPYING that comes with the .\" vdr distribution. .\" -.\" $Id: vdr.1 1.33 2008/03/09 16:07:06 kls Exp $ +.\" $Id: vdr.8 1.33 2008/03/09 16:07:06 kls Exp $ .\" -.TH vdr 1 "10 Feb 2008" "1.6" "Video Disk Recorder" +.TH vdr 8 "10 Feb 2008" "1.6" "Video Disk Recorder" .SH NAME vdr \- the Video Disk Recorder .SH SYNOPSIS diff -up vdr-1.6.0/UPDATE-1.2.0.orig vdr-1.6.0/UPDATE-1.2.0 --- vdr-1.6.0/UPDATE-1.2.0.orig 2003-05-30 16:46:54.000000000 +0300 +++ vdr-1.6.0/UPDATE-1.2.0 2008-04-04 22:34:13.000000000 +0300 @@ -8,7 +8,7 @@ See the file HISTORY for a detailed list Plugins: - Implemented a universal plugin interface. See the file PLUGINS.html - for a detailed description. The man page vdr(1) describes the new options '-L' + for a detailed description. The man page vdr(8) describes the new options '-L' and '-P' used to load plugins. See http://www.cadsoft.de/vdr/plugins.htm for a list of available plugins. - Rearranged the remote control key handling to allow plugins to implement