summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntti Ajanki <antti.ajanki@iki.fi>2012-01-29 15:04:37 +0200
committerAntti Ajanki <antti.ajanki@iki.fi>2012-01-29 15:04:37 +0200
commite7b1d17438e1ac8918680ce3b08daaf1aa4d3c33 (patch)
treebd5eec925adfc6fced1d80285d82b8a3095ecca0
parent9ec82abc0b9c4467bc48e5744f654886e73b10a4 (diff)
downloadvdr-plugin-webvideo-e7b1d17438e1ac8918680ce3b08daaf1aa4d3c33.tar.gz
vdr-plugin-webvideo-e7b1d17438e1ac8918680ce3b08daaf1aa4d3c33.tar.bz2
Bump version and copyright year
-rw-r--r--HISTORY4
-rw-r--r--README.webvi2
-rw-r--r--debian/changelog6
-rw-r--r--debian/copyright4
-rw-r--r--src/libwebvi/libwebvi.c2
-rw-r--r--src/libwebvi/libwebvi.h2
-rw-r--r--src/libwebvi/webvi/api.py2
-rw-r--r--src/libwebvi/webvi/asyncurl.py2
-rw-r--r--src/libwebvi/webvi/constants.py2
-rw-r--r--src/libwebvi/webvi/download.py2
-rw-r--r--src/libwebvi/webvi/json2xml.py26
-rw-r--r--src/libwebvi/webvi/request.py2
-rw-r--r--src/libwebvi/webvi/utils.py2
-rw-r--r--src/libwebvi/webvi/version.py4
-rw-r--r--src/unittest/testdownload.c2
-rw-r--r--src/unittest/testlibwebvi.c2
-rw-r--r--src/unittest/testwebvi.py2
-rw-r--r--src/vdr-plugin/webvideo.c2
-rwxr-xr-xsrc/webvicli/webvi2
-rw-r--r--src/webvicli/webvicli/client.py4
-rw-r--r--src/webvicli/webvicli/menu.py2
21 files changed, 57 insertions, 21 deletions
diff --git a/HISTORY b/HISTORY
index b163a43..3187065 100644
--- a/HISTORY
+++ b/HISTORY
@@ -251,3 +251,7 @@ Video site modules:
- Fixed Youtube support
- Minor improvements in Katsomo and ruutu.fi support
- Disabled broken Vimeo search
+
+2012-01-29: Version 0.4.5
+
+- Fixed Youtube breakage
diff --git a/README.webvi b/README.webvi
index 75c96f5..0248af9 100644
--- a/README.webvi
+++ b/README.webvi
@@ -1,6 +1,6 @@
webvi - command line web video downloader
-Copyright 2009-2011 Antti Ajanki <antti.ajanki@iki.fi>
+Copyright 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/changelog b/debian/changelog
index 869b1a1..4395d46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-webvideo (0.4.5-1) unstable; urgency=low
+
+ * Fixed Youtube support
+
+ -- Antti Ajanki <antti.ajanki@iki.fi> Sun, 29 Jan 2012 14:53:38 +0300
+
vdr-plugin-webvideo (0.4.4-1) unstable; urgency=low
* Fixed Youtube support
diff --git a/debian/copyright b/debian/copyright
index 72edd86..0ff5893 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,10 +10,10 @@ Debian Maintainers:
Thomas Günther <tom@toms-cafe.de>
Copyright:
- (C) 2008-2011 Antti Ajanki
+ (C) 2008-2012 Antti Ajanki
Copyright (Debian packaging):
- (C) 2008-2011 Antti Ajanki
+ (C) 2008-2012 Antti Ajanki
(C) 2009 Tobias Grimm, Thomas Günther
License:
diff --git a/src/libwebvi/libwebvi.c b/src/libwebvi/libwebvi.c
index 0f1c129..8c64534 100644
--- a/src/libwebvi/libwebvi.c
+++ b/src/libwebvi/libwebvi.c
@@ -1,7 +1,7 @@
/*
* libwebvi.c: C bindings for webvi Python module
*
- * Copyright (c) 2010, 2011 Antti Ajanki <antti.ajanki@iki.fi>
+ * Copyright (c) 2010-2012 Antti Ajanki <antti.ajanki@iki.fi>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/libwebvi/libwebvi.h b/src/libwebvi/libwebvi.h
index e80ce43..f8bd818 100644
--- a/src/libwebvi/libwebvi.h
+++ b/src/libwebvi/libwebvi.h
@@ -1,7 +1,7 @@
/*
* libwebvi.h: C bindings for webvi Python module
*
- * Copyright (c) 2010, 2011 Antti Ajanki <antti.ajanki@iki.fi>
+ * Copyright (c) 2010-2012 Antti Ajanki <antti.ajanki@iki.fi>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/libwebvi/webvi/api.py b/src/libwebvi/webvi/api.py
index 6dfa31e..9883349 100644
--- a/src/libwebvi/webvi/api.py
+++ b/src/libwebvi/webvi/api.py
@@ -1,6 +1,6 @@
# api.py - webvi API
#
-# Copyright (c) 2009-2011 Antti Ajanki <antti.ajanki@iki.fi>
+# Copyright (c) 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/libwebvi/webvi/asyncurl.py b/src/libwebvi/webvi/asyncurl.py
index 6b17893..36df9a5 100644
--- a/src/libwebvi/webvi/asyncurl.py
+++ b/src/libwebvi/webvi/asyncurl.py
@@ -1,6 +1,6 @@
# asyncurl.py - Wrapper class for using pycurl objects in asyncore
#
-# Copyright (c) 2009-2011 Antti Ajanki <antti.ajanki@iki.fi>
+# Copyright (c) 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/libwebvi/webvi/constants.py b/src/libwebvi/webvi/constants.py
index 16e1f92..aba11d6 100644
--- a/src/libwebvi/webvi/constants.py
+++ b/src/libwebvi/webvi/constants.py
@@ -1,6 +1,6 @@
# constants.py - Python definitions for constants in libwebvi.h
#
-# Copyright (c) 2009-2011 Antti Ajanki <antti.ajanki@iki.fi>
+# Copyright (c) 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/libwebvi/webvi/download.py b/src/libwebvi/webvi/download.py
index e004f80..2b5b5d8 100644
--- a/src/libwebvi/webvi/download.py
+++ b/src/libwebvi/webvi/download.py
@@ -1,6 +1,6 @@
# download.py - webvi downloader backend
#
-# Copyright (c) 2009-2011 Antti Ajanki <antti.ajanki@iki.fi>
+# Copyright (c) 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/libwebvi/webvi/json2xml.py b/src/libwebvi/webvi/json2xml.py
index d7c4acd..aa8226d 100644
--- a/src/libwebvi/webvi/json2xml.py
+++ b/src/libwebvi/webvi/json2xml.py
@@ -1,3 +1,29 @@
+# json2xml.py - Convert JSON into XML
+#
+# Copyright (c) 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""Convert a JSON-serialized object into XML.
+
+JSON strings and numbers are converted into nodes.
+
+JSON array [...] is converted into <list><li>...</li></list>
+
+JSON object {"key": "bar"} is converted into <dict><key>bar</key><dict>
+"""
+
import sys
import libxml2
diff --git a/src/libwebvi/webvi/request.py b/src/libwebvi/webvi/request.py
index 7d2a32d..246bcaa 100644
--- a/src/libwebvi/webvi/request.py
+++ b/src/libwebvi/webvi/request.py
@@ -1,6 +1,6 @@
# request.py - webvi request class
#
-# Copyright (c) 2009-2011 Antti Ajanki <antti.ajanki@iki.fi>
+# Copyright (c) 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/libwebvi/webvi/utils.py b/src/libwebvi/webvi/utils.py
index 0fddf17..05c6896 100644
--- a/src/libwebvi/webvi/utils.py
+++ b/src/libwebvi/webvi/utils.py
@@ -1,6 +1,6 @@
# utils.py - misc. utility functions
#
-# Copyright (c) 2009-2011 Antti Ajanki <antti.ajanki@iki.fi>
+# Copyright (c) 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/libwebvi/webvi/version.py b/src/libwebvi/webvi/version.py
index e312780..359b074 100644
--- a/src/libwebvi/webvi/version.py
+++ b/src/libwebvi/webvi/version.py
@@ -1,6 +1,6 @@
# version.py - webvi version
#
-# Copyright (c) 2009-2011 Antti Ajanki <antti.ajanki@iki.fi>
+# Copyright (c) 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -15,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-VERSION = '0.4.4'
+VERSION = '0.4.5'
diff --git a/src/unittest/testdownload.c b/src/unittest/testdownload.c
index 4f1abba..578ed74 100644
--- a/src/unittest/testdownload.c
+++ b/src/unittest/testdownload.c
@@ -1,7 +1,7 @@
/*
* testlibwebvi.c: unittest for webvi C bindings
*
- * Copyright (c) 2010, 2011 Antti Ajanki <antti.ajanki@iki.fi>
+ * Copyright (c) 2010-2012 Antti Ajanki <antti.ajanki@iki.fi>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/unittest/testlibwebvi.c b/src/unittest/testlibwebvi.c
index b922f3f..0b5ef1c 100644
--- a/src/unittest/testlibwebvi.c
+++ b/src/unittest/testlibwebvi.c
@@ -1,7 +1,7 @@
/*
* testlibwebvi.c: unittest for webvi C bindings
*
- * Copyright (c) 2010, 2011 Antti Ajanki <antti.ajanki@iki.fi>
+ * Copyright (c) 2010-2012 Antti Ajanki <antti.ajanki@iki.fi>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
diff --git a/src/unittest/testwebvi.py b/src/unittest/testwebvi.py
index 1d7be9a..74c18b4 100644
--- a/src/unittest/testwebvi.py
+++ b/src/unittest/testwebvi.py
@@ -3,7 +3,7 @@
# This file is part of vdr-webvideo-plugin.
#
-# Copyright 2009-2011 Antti Ajanki <antti.ajanki@iki.fi>
+# Copyright 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/vdr-plugin/webvideo.c b/src/vdr-plugin/webvideo.c
index 738f121..4c99af9 100644
--- a/src/vdr-plugin/webvideo.c
+++ b/src/vdr-plugin/webvideo.c
@@ -24,7 +24,7 @@
#include "common.h"
#include "timer.h"
-const char *VERSION = "0.4.4";
+const char *VERSION = "0.4.5";
static const char *DESCRIPTION = trNOOP("Download video files from the web");
static const char *MAINMENUENTRY = "Webvideo";
cMimeTypes *MimeTypes = NULL;
diff --git a/src/webvicli/webvi b/src/webvicli/webvi
index 87039a9..9ea3a4f 100755
--- a/src/webvicli/webvi
+++ b/src/webvicli/webvi
@@ -2,7 +2,7 @@
# webvi - starter script for webvicli
#
-# Copyright (c) 2010, 2011 Antti Ajanki <antti.ajanki@iki.fi>
+# Copyright (c) 2010-2012 Antti Ajanki <antti.ajanki@iki.fi>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/src/webvicli/webvicli/client.py b/src/webvicli/webvicli/client.py
index 6a145e1..b7b65f1 100644
--- a/src/webvicli/webvicli/client.py
+++ b/src/webvicli/webvicli/client.py
@@ -2,7 +2,7 @@
# client.py - webvi command line client
#
-# Copyright (c) 2009-2011 Antti Ajanki <antti.ajanki@iki.fi>
+# Copyright (c) 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ from urlparse import urlparse
from webvi.constants import WebviRequestType, WebviOpt, WebviInfo, WebviSelectBitmask, WebviConfig, WebviSelect
from . import menu
-VERSION = '0.4.4'
+VERSION = '0.4.5'
# Default options
DEFAULT_PLAYERS = ['mplayer -cache-min 10 "%s"',
diff --git a/src/webvicli/webvicli/menu.py b/src/webvicli/webvicli/menu.py
index 6ba91eb..61a5c92 100644
--- a/src/webvicli/webvicli/menu.py
+++ b/src/webvicli/webvicli/menu.py
@@ -1,6 +1,6 @@
# menu.py - menu elements for webvicli
#
-# Copyright (c) 2009-2011 Antti Ajanki <antti.ajanki@iki.fi>
+# Copyright (c) 2009-2012 Antti Ajanki <antti.ajanki@iki.fi>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by