diff -U1 vdr-1.6.0/PLUGINS/src/sky/HISTORY~ vdr-1.6.0/PLUGINS/src/sky/HISTORY

--- vdr-1.6.0/PLUGINS/src/sky/HISTORY~	2008-03-22 12:20:10.000000000 +0200

+++ vdr-1.6.0/PLUGINS/src/sky/HISTORY	2008-03-23 15:56:00.000000000 +0200

@@ -23,3 +23,3 @@

 - Switched EPG data retrieval to http://www.bleb.org.

-- Added automatic DST detection to getskyepg.pl.

+- Added automatic DST detection to getskyepg.

 - Fixed handling receivers, so that a recording on the same channel

@@ -50,8 +50,8 @@

-- Made the getskyepg.pl script send a user agent message to

+- Made the getskyepg script send a user agent message to

   the server, according to the rules at http://bleb.org/tv/data/listings.

   If your version of 'wget' doesn't support the -U option to set the user agent,

-  use the new option -U of getskyepg.pl to have the information added to the URL

+  use the new option -U of getskyepg to have the information added to the URL

   as a query string.

-- The getskyepg.pl script now replaces "&" with "&".

+- The getskyepg script now replaces "&" with "&".

@@ -64,3 +64,3 @@

-- Removed the full path from the 'logger' call in the getskyepg.pl script (this

+- Removed the full path from the 'logger' call in the getskyepg script (this

   program is apparently "on the move" through the file system...).

diff -U1 vdr-1.6.0/PLUGINS/src/sky/README~ vdr-1.6.0/PLUGINS/src/sky/README

--- vdr-1.6.0/PLUGINS/src/sky/README~	2007-08-12 14:08:16.000000000 +0300

+++ vdr-1.6.0/PLUGINS/src/sky/README	2008-03-23 15:55:40.000000000 +0200

@@ -42,8 +42,8 @@

 The Sky EPG is available on the Internet at http://www.bleb.org.

-The Perl script getskyepg.pl extracts the EPG data from these pages

+The Perl script getskyepg extracts the EPG data from these pages

 and sends it to VDR via an SVDRP connection. The channel names as

 used on the bleb.org pages are defined in the channels.conf.sky file.

-You can keep your EPG data up-to-date by entering a call to getskyepg.pl

-into your /etc/crontab. Call 'getskyepg.pl -h' for a list of options.

-The getskyepg.pl script requires the programs /usr/bin/wget and /usr/bin/logger

+You can keep your EPG data up-to-date by entering a call to getskyepg

+into your /etc/crontab. Call 'getskyepg -h' for a list of options.

+The getskyepg script requires the programs /usr/bin/wget and /usr/bin/logger

 to be installed on your system.

diff -U1 vdr-1.6.0/PLUGINS/src/sky/getskyepg.pl~ vdr-1.6.0/PLUGINS/src/sky/getskyepg.pl

--- vdr-1.6.0/PLUGINS/src/sky/getskyepg.pl~	2008-03-22 12:17:42.000000000 +0200

+++ vdr-1.6.0/PLUGINS/src/sky/getskyepg.pl	2008-03-23 15:55:28.000000000 +0200

@@ -2,3 +2,3 @@

-# getskyepg.pl: Get EPG data for Sky channels from the Internet

+# getskyepg: Get EPG data for Sky channels from the Internet

 #

@@ -10,3 +10,3 @@

 #

-# $Id: getskyepg.pl 1.7 2008/03/22 10:17:42 kls Exp $

+# $Id: getskyepg 1.7 2008/03/22 10:17:42 kls Exp $

@@ -40,3 +40,3 @@

 # who runs that web site, can contact you in case of problems.

-$IDENT = "VDR::getskyepg.pl, http://www.cadsoft.de/vdr - vdrbugs\@cadsoft.de";

+$IDENT = "VDR::getskyepg, http://www.cadsoft.de/vdr - vdrbugs\@cadsoft.de";

 $GAP = 2;

diff -U1 vdr-1.6.0/epg2html.pl~ vdr-1.6.0/epg2html.pl

--- vdr-1.6.0/epg2html.pl~	2006-04-17 15:19:08.000000000 +0300

+++ vdr-1.6.0/epg2html.pl	2008-03-23 15:54:40.000000000 +0200

@@ -9,3 +9,3 @@

 #

-# Usage: epg2html.pl < /video/epg.data

+# Usage: epg2html < /video/epg.data

 #

@@ -14,3 +14,3 @@

 #

-# $Id: epg2html.pl 1.7 2006/04/17 12:19:08 kls Exp $

+# $Id: epg2html 1.7 2006/04/17 12:19:08 kls Exp $

diff -U1 vdr-1.6.0/HISTORY~ vdr-1.6.0/HISTORY

--- vdr-1.6.0/HISTORY~	2008-03-23 12:26:08.000000000 +0200

+++ vdr-1.6.0/HISTORY	2008-03-23 15:54:59.000000000 +0200

@@ -327,3 +327,3 @@

 - The EPG data is now dumped into the file /video/epg.data every ten minutes.

-  Use the Perl script 'epg2html.pl' to convert the raw EPG data into a simple

+  Use the Perl script 'epg2html' to convert the raw EPG data into a simple

   HTML programme listing.

@@ -397,3 +397,3 @@

 - New SVDRP command MESG to display a short message on the OSD.

-- The Perl script 'svdrpsend.pl' can be used to send SVDRP commands to VDR.

+- The Perl script 'svdrpsend' can be used to send SVDRP commands to VDR.

 - SVDRP can now immediately reuse the same port if VDR is restarted.

@@ -1054,3 +1054,3 @@

-- Fixed parsing 'E' records in epg2html.pl.

+- Fixed parsing 'E' records in epg2html.

 - Fixed a deadlock when switching channels via Schedule/Now|Next/Switch (reported

@@ -1325,3 +1325,3 @@

 - Added Swedish language texts (thanks to Tomas Prybil).

-- Fixed parsing 'E' records in epg2html.pl (thanks to Matthias Fechner for pointing

+- Fixed parsing 'E' records in epg2html (thanks to Matthias Fechner for pointing

   out this one).

@@ -2760,3 +2760,3 @@

   available for plugins.

-- The epg2html.pl script now handles '|' in description texts.

+- The epg2html script now handles '|' in description texts.

 - The new setup option "OSD/Use small font" can be used to control the use of

@@ -4031,3 +4031,3 @@

-  svdrpsend.pl -d <hostname> 'grab -' | sed -n -e 's/^216-//p' -e '1ibegin-base64 644 -' -e '$a====' | uudecode | display -

+  svdrpsend -d <hostname> 'grab -' | sed -n -e 's/^216-//p' -e '1ibegin-base64 644 -' -e '$a====' | uudecode | display -

diff -U1 vdr-1.6.0/CONTRIBUTORS~ vdr-1.6.0/CONTRIBUTORS

--- vdr-1.6.0/CONTRIBUTORS~	2008-03-18 19:34:00.000000000 +0200

+++ vdr-1.6.0/CONTRIBUTORS	2008-03-23 15:54:07.000000000 +0200

@@ -546,3 +546,3 @@

 Matthias Fechner <matthiasfechner@web.de>

- for pointing out a bug in parsing 'E' records in epg2html.pl

+ for pointing out a bug in parsing 'E' records in epg2html

  for suggesting to add a note about LANG having to be set to a valid locale in INSTALL