Prepare for 0.6.1 release

Changes

@@ -1,4 +1,33 @@
+0.6.1  2019-02-21
+  * IMPORTANT *
+
+  tv_grab_eu_dotmedia and tv_grab_se_tvzon are deprecated and will be
+  removed in the next release of XMLTV. Please switch to the new
+  tv_grab_eu_xmltvse grabber as soon as possible.
+
+  + tv_grab_eu_xmltvse:  new grabber for Europe
+  + tv_grab_pt_vodafone: new grabber for Portugal
+
+  - tv_grab_es_laguiatv: disable broken grabber
+  - tv_grab_fr_kazer:    disable broken grabber
+  - tv_grab_in_toi:      disable broken grabber
+  - tv_grab_nl:          disable broken grabber
+
+  * tv_grab_eu_epgdata:  include fanart URLs in output
+  * tv_grab_fi:          add new ampparit and telsu sources
+  * tv_grab_il:          update grabber due to upstream changes
+  * tv_grab_is:          now only provides RUV channels
+  * tv_grab_zz_sdjson_sqlite:
+                         improvements to lineup management
+                         add support for TheTVDB metadata
+  * tv_augment:          new rules to improve episode numbering
+                         logging must now be enabled explicitly
+  * tv_count/tv_merge:   mandatory command line options for files
+  * tv_imdb:             migrate to new URL for archived IMDB data
+
 0.6.0  2019-02-18
+  * TRIAL RELEASE *
+
   - tv_grab_pt_vodafone: new grabber for Portugal
   - tv_grab_es_laguiatv: disable broken grabber
   - tv_grab_fr_kazer:    disable broken grabber

Makefile.PL

@@ -57,7 +57,7 @@ GetOptions('strict-deps'  => \$opt_strictdeps,  # be strict about dependencies
           );
 
 our $VERSION;
-$VERSION = '0.6.0';
+$VERSION = '0.6.1';
 
 # Fragment of Makefile text to give the directory where files should
 # be installed.  The extra '.' in the middle of the path is to avoid

README

@@ -1,4 +1,4 @@
-XMLTV 0.6.0
+XMLTV 0.6.1
 
 Gather television listings, process them and organize your viewing.
 XMLTV is a file format for storing TV listings, defined in xmltv.dtd.
@@ -7,25 +7,33 @@ Then there are several tools to produce and process these listings.
 Please see doc/QuickStart for documentation on what each program does,
 and xmltv.dtd for documentation on the file format.
 
-* Major Changes in this release (0.6.0)
+* Major Changes in this release (0.6.1)
 
-tv_grab_pt_vodafone - new grabber for Portugal
+* IMPORTANT *
 
-tv_grab_eu_epgdata  - include fanart URLs in output
-tv_grab_fi          - add new ampparit and telsu sources
-tv_grab_il          - update grabber due to upstream changes
-tv_grab_is          - now only provides RUV channels
-tv_grab_zz_sdjson_sqlite
-                    - improvements to lineup management
-                    - add support for TheTVDB metadata
+tv_grab_eu_dotmedia and tv_grab_se_tvzon are deprecated and will be
+removed in the next release of XMLTV. Please switch to the new
+tv_grab_eu_xmltvse grabber as soon as possible.
 
-tv_grab_es_laguiatv - disable broken grabber
-tv_grab_fr_kazer    - disable broken grabber
-tv_grab_in_toi      - disable broken grabber
-tv_grab_nl          - disable broken grabber
+tv_grab_eu_xmltvse:  new grabber for Europe
+tv_grab_pt_vodafone: new grabber for Portugal
 
-tv_augment          - new rules to improve episode numbering
-tv_imdb             - migrate to new URL for archived data
+tv_grab_es_laguiatv: disable broken grabber
+tv_grab_fr_kazer:    disable broken grabber
+tv_grab_in_toi:      disable broken grabber
+tv_grab_nl:          disable broken grabber
+
+tv_grab_eu_epgdata:  include fanart URLs in output
+tv_grab_fi:          add new ampparit and telsu sources
+tv_grab_il:          update grabber due to upstream changes
+tv_grab_is:          now only provides RUV channels
+tv_grab_zz_sdjson_sqlite:
+                     improvements to lineup management
+                     add support for TheTVDB metadata
+tv_augment:          new rules to improve episode numbering
+                     logging must now be enabled explicitly
+tv_count/tv_merge:   mandatory command line options for files
+tv_imdb:             migrate to new URL for archived IMDB data
 
 And lots of other changes (see git log for details)
 
@@ -192,4 +200,4 @@ Please subscribe to any/all lists at https://sourceforge.net/p/xmltv/mailman/
 
 Finally, we run an IRC channel #xmltv on Freenode. Please join us!
 
--- Nick Morrott, [email protected], 2019-02-18
+-- Nick Morrott, [email protected], 2019-02-21

doc/README.win32

@@ -1,4 +1,4 @@
-XMLTV 0.6.0, Windows binary release
+XMLTV 0.6.1, Windows binary release
 
 Gather television listings, process them and organize your viewing.
 XMLTV is a file format for storing TV listings, defined in xmltv.dtd.
@@ -25,25 +25,33 @@ tv_grab_se_swedb sometimes fails to work on Windows if there are spaces
 in the path to your home-directory. This can be avoided by setting
 the environment variable HOME to a path without spaces (e.g. c:\home).
 
-* Major Changes in this release (0.6.0)
+* Major Changes in this release (0.6.1)
 
-tv_grab_pt_vodafone - new grabber for Portugal
+* IMPORTANT *
 
-tv_grab_eu_epgdata  - include fanart URLs in output
-tv_grab_fi          - add new ampparit and telsu sources
-tv_grab_il          - update grabber due to upstream changes
-tv_grab_is          - now only provides RUV channels
-tv_grab_zz_sdjson_sqlite
-                    - improvements to lineup management
-                    - add support for TheTVDB metadata
+tv_grab_eu_dotmedia and tv_grab_se_tvzon are deprecated and will be
+removed in the next release of XMLTV. Please switch to the new
+tv_grab_eu_xmltvse grabber as soon as possible.
 
-tv_grab_es_laguiatv - disable broken grabber
-tv_grab_fr_kazer    - disable broken grabber
-tv_grab_in_toi      - disable broken grabber
-tv_grab_nl          - disable broken grabber
+tv_grab_eu_xmltvse:  new grabber for Europe
+tv_grab_pt_vodafone: new grabber for Portugal
 
-tv_augment          - new rules to improve episode numbering
-tv_imdb             - migrate to new URL for archived data
+tv_grab_es_laguiatv: disable broken grabber
+tv_grab_fr_kazer:    disable broken grabber
+tv_grab_in_toi:      disable broken grabber
+tv_grab_nl:          disable broken grabber
+
+tv_grab_eu_epgdata:  include fanart URLs in output
+tv_grab_fi:          add new ampparit and telsu sources
+tv_grab_il:          update grabber due to upstream changes
+tv_grab_is:          now only provides RUV channels
+tv_grab_zz_sdjson_sqlite:
+                     improvements to lineup management
+                     add support for TheTVDB metadata
+tv_augment:          new rules to improve episode numbering
+                     logging must now be enabled explicitly
+tv_count/tv_merge:   mandatory command line options for files
+tv_imdb:             migrate to new URL for archived IMDB data
 
 And lots of other changes (see git log for details)
 
@@ -132,4 +140,4 @@ Sourceforge hosts the following mailing lists:
     xmltv-users    - how to use XMLTV
     xmltv-devel    - detailed discussions among developers
 
--- Nick Morrott, [email protected], 2019-02-18
+-- Nick Morrott, [email protected], 2019-02-21

lib/Augment.pm

@@ -132,7 +132,7 @@ use XMLTV::Date 0.005066 qw( time_xmltv_to_epoch );
 
 use Encode;
 
-our $VERSION = 0.006000;
+our $VERSION = 0.006001;
 
 use base 'Exporter';
 our @EXPORT = qw(setEncoding inputChannel augmentProgramme printInfo end);

lib/XMLTV.pm.in

@@ -11,7 +11,7 @@ our @EXPORT_OK = qw(read_data parse parsefile parsefiles write_data
 # the xmltv package as a whole.  This number should be checked by the
 # mkdist tool.
 #
-our $VERSION = '0.6.0';
+our $VERSION = '0.6.1';
 
 # Work around changing behaviour of XML::Twig.  On some systems (like
 # mine) it always returns UTF-8 data unless KeepEncoding is specified.

lib/exe_wrap.pl

@@ -68,7 +68,7 @@
 $cmd = shift || "";
 
 # --version (and abbreviations thereof)
-my $VERSION = '0.6.0';
+my $VERSION = '0.6.1';
 if (index('--version', $cmd) == 0 and length $cmd >= 3) {
     print "xmltv $VERSION\n";
     exit;