Import 0.6.2 of xmltv-proc-nz

My patch has been merged upstream, I have no local changes now. Woohoo!

diff --git a/bin/xmltv-proc-nz b/bin/xmltv-proc-nz
index 2a7321daf5d62006afaa05a5e381f94abd5b92a9..c218782c8c767ba1938e0d7d352b831321b9892e 100644 (file)
--- a/bin/xmltv-proc-nz
+++ b/bin/xmltv-proc-nz
@@ -48,6 +48,9 @@ JSW = Stephen Worthington <stephen@jsw.gen.nz>
        - Make failure to access version update data a warning instead of a failure.  This was causing xmltv-proc-nz to fail as epg.org.nz
          is no longer working (although the site still exists).
        - Remove epg.org.nz as it is no longer working.
+0.6.2  JSW
+       - Add a file:/// URL to JSON_BASE_URLS to support the use of /etc/mythtv-epg-nz for configuring xmltv-proc-nz, as required for
+         Andrew Ruthven's .deb install.
 """
 #TODO: Find repeats
 #TODO: Regex replacements for categories
@@ -76,10 +79,10 @@ else:
 NAME = 'xmltv-proc-nz'
 #URL = 'http://nice.net.nz/xmltv-proc-nz'
 URL = 'http://www.jsw.gen.nz/mythtv/xmltv-proc-nz'
-VERSION = '0.6.1 JSW'
+VERSION = '0.6.2 JSW'
 #BASE_URL = 'http://epg.org.nz'
 BASE_URL = ''
-#JSON_BASE_URLS = ['http://epg.org.nz', 'http://localhost/json']
+#JSON_BASE_URLS = ['http://epg.org.nz', 'http://localhost/json', 'file:///etc/mythtv-epg-nz/xmltv-proc-nz/json']
 JSON_BASE_URLS = ['http://localhost/json', 'file:///etc/mythtv-epg-nz/xmltv-proc-nz/json']
 TIME_FORMAT = '%Y%m%d%H%M%S'
 LOG_LEVEL = logging.INFO