Some touchups for version 1.2.0

10 files changed, 34 insertions, 17 deletions

diff --git a/HISTORY b/HISTORY
index ad868398..e1dc2941 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2209,7 +2209,7 @@ Video Disk Recorder Revision History
 - It is now possible to directly delete a timer that is currently recording
   (thanks to Alexander Damhuis for reporting this one).
 
-2003-05-27: Version 1.1.34
+2003-05-29: Version 1.2.0pre1
 
 - Some corrections to the French OSD texts (thanks to Olivier Jacques).
 - Fixed some missing commas in i18n.c (thanks to Dimitrios Dimitrakos for
diff --git a/INSTALL b/INSTALL
index 11efa224..cf66c5d3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,9 @@
 Installation of the Video Disk Recorder
 ---------------------------------------
 
+Version 1.2
+-----------
+
 Compiling and running the program:
 ----------------------------------
 
@@ -15,7 +18,7 @@ If you have the DVB driver source in a different location
 you will have to change the definition of DVBDIR in the
 Makefile (see the file Make.config.template).
 
-VDR requires the Linux-DVB card driver version dated 2002-11-01 or higher
+VDR requires the Linux-DVB card driver version dated 2003-05-24 or higher
 to work properly.
 
 After extracting the package, change into the VDR directory
diff --git a/MANUAL b/MANUAL
index a8ebee21..742b743b 100644
--- a/MANUAL
+++ b/MANUAL
@@ -1,6 +1,9 @@
 Video Disk Recorder User's Manual
 ---------------------------------
 
+Version 1.2
+-----------
+
 * Remote Control Keys
 
   The following remote control keys are used to control the VDR
diff --git a/PLUGINS.html b/PLUGINS.html
index 9a97b000..913a9914 100644
--- a/PLUGINS.html
+++ b/PLUGINS.html
@@ -6,6 +6,14 @@
 
 <center><h1>The VDR Plugin System</h1></center>
 
+<center><b>Version 1.2</b></center>
+<p>
+<center>
+Copyright &copy; 2003 Klaus Schmidinger<br>
+<a href="mailto:kls@cadsoft.de">kls@cadsoft.de</a><br>
+<a href="http://www.cadsoft.de/vdr">www.cadsoft.de/vdr</a>
+</center>
+<p>
 VDR provides an easy to use plugin interface that allows additional functionality
 to be added to the program by implementing a dynamically loadable library file.
 This interface allows programmers to develop additional functionality for VDR completely
diff --git a/README b/README
index 809034ff..738fe3de 100644
--- a/README
+++ b/README
@@ -14,6 +14,9 @@ this program on your computer.
 
 The MANUAL file describes how to operate the VDR.
 
+The CONTRIBUTORS file lists all the people who have contributed to the
+development of VDR.
+
 The author can be contacted at kls@cadsoft.de.
 
 Yet another "set-top-box"?
diff --git a/config.h b/config.h
index 18e11bf3..e34534b7 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.161 2003/05/26 15:49:23 kls Exp $
+ * $Id: config.h 1.162 2003/05/29 12:17:37 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "device.h"
 #include "tools.h"
 
-#define VDRVERSION "1.1.34"
-#define VDRVERSNUM   10134  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.2.0pre1"
+#define VDRVERSNUM   10200  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/genfontfile.c b/genfontfile.c
index a98f8012..41d87b79 100644
--- a/genfontfile.c
+++ b/genfontfile.c
@@ -7,7 +7,7 @@
 /* X compile line: cc -o gentexfont gentexfont.c -lX11 */
 
 /* 2000-10-01: Stripped down the original code to get a simple bitmap C-code generator  */
-/*             for use with the VDR project (see http://www.cadsoft.de/people/kls/vdr)  */
+/*             for use with the VDR project (see http://www.cadsoft.de/vdr)             */
 /*             Renamed the file 'genfontfile.c' since it no longer generates 'tex' data */
 /*             Klaus Schmidinger (kls@cadsoft.de)                                       */
 
diff --git a/vdr.1 b/vdr.1
index 86af51c6..ca49acdf 100644
--- a/vdr.1
+++ b/vdr.1
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr
 .\"
-.\" Copyright (C) 2002 Klaus Schmidinger
+.\" Copyright (C) 2003 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.1 1.7 2003/05/03 16:16:05 kls Exp $
+.\" $Id: vdr.1 1.8 2003/05/29 11:58:28 kls Exp $
 .\"
-.TH vdr 1 "3 May 2003" "1.1.30" "Video Disk Recorder"
+.TH vdr 1 "1 June 2003" "1.2.0" "Video Disk Recorder"
 .SH NAME
 vdr - the Video Disk Recorder
 .SH SYNOPSIS
@@ -185,7 +185,7 @@ See the file \fICONTRIBUTORS\fR in the \fBvdr\fR source distribution.
 .SH REPORTING BUGS
 Report bugs to <vdr-bugs@cadsoft.de>.
 .SH COPYRIGHT
-Copyright \(co 2002 Klaus Schmidinger.
+Copyright \(co 2003 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.5 b/vdr.5
index 5fbac311..67bdc37b 100644
--- a/vdr.5
+++ b/vdr.5
@@ -2,15 +2,15 @@
 .\" ** The above line should force tbl to be a preprocessor **
 .\" Man page for vdr file formats
 .\"
-.\" Copyright (C) 2002 Klaus Schmidinger
+.\" Copyright (C) 2003 Klaus Schmidinger
 .\"
 .\" You may distribute under the terms of the GNU General Public
 .\" License as specified in the file COPYING that comes with the
 .\" vdr distribution.
 .\"
-.\" $Id: vdr.5 1.19 2003/05/29 11:06:07 kls Exp $
+.\" $Id: vdr.5 1.20 2003/05/29 11:58:57 kls Exp $
 .\"
-.TH vdr 5 "6 Dec 2002" "1.2.0" "Video Disk Recorder Files"
+.TH vdr 5 "1 Jun 2003" "1.2.0" "Video Disk Recorder Files"
 .SH NAME
 vdr file formats - the Video Disk Recorder Files
 .SH DESCRIPTION
@@ -562,7 +562,7 @@ Written by Klaus Schmidinger.
 .SH REPORTING BUGS
 Report bugs to <vdr-bugs@cadsoft.de>.
 .SH COPYRIGHT
-Copyright \(co 2002 Klaus Schmidinger.
+Copyright \(co 2003 Klaus Schmidinger.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
diff --git a/vdr.c b/vdr.c
index 8bb907cf..6a6c35dc 100644
--- a/vdr.c
+++ b/vdr.c
@@ -1,7 +1,7 @@
 /*
  * vdr.c: Video Disk Recorder main program
  *
- * Copyright (C) 2000 Klaus Schmidinger
+ * Copyright (C) 2000, 2003 Klaus Schmidinger
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -20,9 +20,9 @@
  *
  * The author can be reached at kls@cadsoft.de
  *
- * The project's page is at http://www.cadsoft.de/people/kls/vdr
+ * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.159 2003/05/24 15:17:38 kls Exp $
+ * $Id: vdr.c 1.160 2003/05/29 12:27:26 kls Exp $
  */
 
 #include <getopt.h>