r8284 - in /vdr/vdradmin-am/trunk/debian: changelog patches/00list patches/07_templates_utf8.dpatch vdradmin-am.init
tschmidt at users.alioth.debian.org
tschmidt at users.alioth.debian.org
Wed Dec 23 23:11:08 UTC 2009
Author: tschmidt
Date: Wed Dec 23 23:11:08 2009
New Revision: 8284
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8284
Log:
* Added 07_templates_utf8.dpatch - changes default encoding to UTF8
(closes: #561834)
* Removed debugging output from the initscript
Added:
vdr/vdradmin-am/trunk/debian/patches/07_templates_utf8.dpatch (with props)
Modified:
vdr/vdradmin-am/trunk/debian/changelog
vdr/vdradmin-am/trunk/debian/patches/00list
vdr/vdradmin-am/trunk/debian/vdradmin-am.init
Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=8284&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Wed Dec 23 23:11:08 2009
@@ -1,3 +1,11 @@
+vdradmin-am (3.6.4-2) UNRELEASED; urgency=low
+
+ * Added 07_templates_utf8.dpatch - changes default encoding to UTF8
+ (closes: #561834)
+ * Removed debugging output from the initscript
+
+ -- Thomas Schmidt <tschmidt at debian.org> Thu, 24 Dec 2009 00:06:22 +0100
+
vdradmin-am (3.6.4-1) unstable; urgency=low
* New upstream release
Modified: vdr/vdradmin-am/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/00list?rev=8284&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/00list (original)
+++ vdr/vdradmin-am/trunk/debian/patches/00list Wed Dec 23 23:11:08 2009
@@ -3,3 +3,4 @@
03_cfgfiles-fhs
#04_manpage-fixes
06_template-cache
+07_templates_utf8
Added: vdr/vdradmin-am/trunk/debian/patches/07_templates_utf8.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/07_templates_utf8.dpatch?rev=8284&op=file
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/07_templates_utf8.dpatch (added)
+++ vdr/vdradmin-am/trunk/debian/patches/07_templates_utf8.dpatch Wed Dec 23 23:11:08 2009
@@ -1,0 +1,427 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07_templates_utf8.dpatch by Thomas Schmidt <tschmidt at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Use UTF8 as default encoding (closes #561834)
+
+ at DPATCH@
+diff -urNad vdradmin-am-3.6.4~/template/default/about.html vdradmin-am-3.6.4/template/default/about.html
+--- vdradmin-am-3.6.4~/template/default/about.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/about.html 2009-12-23 23:59:02.726581072 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% gettext('About') %?></title>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/at_timer_list.html vdradmin-am-3.6.4/template/default/at_timer_list.html
+--- vdradmin-am-3.6.4~/template/default/at_timer_list.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/at_timer_list.html 2009-12-23 23:59:02.726581072 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/>
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>"/>
+ <title>VDRAdmin-AM - <?% gettext('AutoTimer') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css"/>
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/at_timer_new.html vdradmin-am-3.6.4/template/default/at_timer_new.html
+--- vdradmin-am-3.6.4~/template/default/at_timer_new.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/at_timer_new.html 2009-12-23 23:59:02.730591015 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/>
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>"/>
+ <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Add New AutoTimer') %?><?% ELSE %?><?% gettext('Edit AutoTimer') %?><?% END %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css"/>
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/config.html vdradmin-am-3.6.4/template/default/config.html
+--- vdradmin-am-3.6.4~/template/default/config.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/config.html 2009-12-23 23:59:02.730591015 +0100
+@@ -1,7 +1,7 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html id="scroller">
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% gettext('Configuration') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/epgsearch_config.html vdradmin-am-3.6.4/template/default/epgsearch_config.html
+--- vdradmin-am-3.6.4~/template/default/epgsearch_config.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/epgsearch_config.html 2009-12-23 23:59:02.730591015 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+ <?% USE JavaScript, HTML %?>
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/>
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>"/>
+ <title>VDRAdmin-AM - <?% gettext('EPG Search Blacklists') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css"/>
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/epgsearch_list.html vdradmin-am-3.6.4/template/default/epgsearch_list.html
+--- vdradmin-am-3.6.4~/template/default/epgsearch_list.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/epgsearch_list.html 2009-12-23 23:59:02.730591015 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+ <?% USE JavaScript, HTML %?>
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/>
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>"/>
+ <title>VDRAdmin-AM - <?% gettext('EPG search') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css"/>
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/epgsearch_new.html vdradmin-am-3.6.4/template/default/epgsearch_new.html
+--- vdradmin-am-3.6.4~/template/default/epgsearch_new.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/epgsearch_new.html 2009-12-23 23:59:02.730591015 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/>
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>"/>
+ <?% IF mode_blacklist %?>
+ <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Add New Blacklist') %?><?% ELSE %?><?% gettext('Edit Blacklist') %?><?% END %?></title>
+ <?% ELSE %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/error.html vdradmin-am-3.6.4/template/default/error.html
+--- vdradmin-am-3.6.4~/template/default/error.html 2006-10-19 14:12:34.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/error.html 2009-12-23 23:59:02.734578051 +0100
+@@ -2,7 +2,7 @@
+ <html>
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/>
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>"/>
+ <title><?% gettext('Error!') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css"/>
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/help_at_timer_list.html vdradmin-am-3.6.4/template/default/help_at_timer_list.html
+--- vdradmin-am-3.6.4~/template/default/help_at_timer_list.html 2006-10-20 09:57:06.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/help_at_timer_list.html 2009-12-23 23:59:02.734578051 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% gettext('AutoTimer') %?></title>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/help_at_timer_new.html vdradmin-am-3.6.4/template/default/help_at_timer_new.html
+--- vdradmin-am-3.6.4~/template/default/help_at_timer_new.html 2006-10-20 09:57:12.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/help_at_timer_new.html 2009-12-23 23:59:02.734578051 +0100
+@@ -8,7 +8,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% gettext('Edit AutoTimer') %?></title>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/help_config.html vdradmin-am-3.6.4/template/default/help_config.html
+--- vdradmin-am-3.6.4~/template/default/help_config.html 2008-07-18 10:07:04.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/help_config.html 2009-12-23 23:59:02.734578051 +0100
+@@ -5,7 +5,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% gettext('Configuration') %?></title>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/help_edit_epg.html vdradmin-am-3.6.4/template/default/help_edit_epg.html
+--- vdradmin-am-3.6.4~/template/default/help_edit_epg.html 2007-07-16 12:52:59.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/help_edit_epg.html 2009-12-23 23:59:02.738579613 +0100
+@@ -5,7 +5,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% gettext('Edit Timer') %?></title>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/help_no.html vdradmin-am-3.6.4/template/default/help_no.html
+--- vdradmin-am-3.6.4~/template/default/help_no.html 2006-08-22 13:11:59.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/help_no.html 2009-12-23 23:59:02.738579613 +0100
+@@ -2,7 +2,7 @@
+ <html>
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% gettext('No Help Available') %?></title>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/help_rec_list.html vdradmin-am-3.6.4/template/default/help_rec_list.html
+--- vdradmin-am-3.6.4~/template/default/help_rec_list.html 2006-10-20 09:57:30.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/help_rec_list.html 2009-12-23 23:59:02.738579613 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% gettext('Recordings') %?></title>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/help_timer_list.html vdradmin-am-3.6.4/template/default/help_timer_list.html
+--- vdradmin-am-3.6.4~/template/default/help_timer_list.html 2006-10-20 09:57:33.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/help_timer_list.html 2009-12-23 23:59:02.738579613 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% gettext('Timer') %?></title>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/help_timer_new.html vdradmin-am-3.6.4/template/default/help_timer_new.html
+--- vdradmin-am-3.6.4~/template/default/help_timer_new.html 2006-10-20 09:57:35.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/help_timer_new.html 2009-12-23 23:59:02.738579613 +0100
+@@ -5,7 +5,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% gettext('Edit Timer') %?></title>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/index.html vdradmin-am-3.6.4/template/default/index.html
+--- vdradmin-am-3.6.4~/template/default/index.html 2006-10-20 08:50:16.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/index.html 2009-12-23 23:59:02.738579613 +0100
+@@ -2,7 +2,7 @@
+ <html>
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM <?% version %?> (<?% host %?>)</title>
+ <link href="favicon.ico" rel="shortcut icon" />
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/navigation.html vdradmin-am-3.6.4/template/default/navigation.html
+--- vdradmin-am-3.6.4~/template/default/navigation.html 2008-12-05 19:34:10.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/navigation.html 2009-12-23 23:59:02.738579613 +0100
+@@ -1,7 +1,7 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html>
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM</title>
+ <link type="text/css" href="style.css" rel="stylesheet" media="screen" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/noauth.html vdradmin-am-3.6.4/template/default/noauth.html
+--- vdradmin-am-3.6.4~/template/default/noauth.html 2006-10-18 13:18:40.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/noauth.html 2009-12-23 23:59:02.738579613 +0100
+@@ -1,7 +1,7 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html>
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% gettext('Authorization Required') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/noperm.html vdradmin-am-3.6.4/template/default/noperm.html
+--- vdradmin-am-3.6.4~/template/default/noperm.html 2006-08-22 13:12:00.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/noperm.html 2009-12-23 23:59:02.742581175 +0100
+@@ -1,7 +1,7 @@
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+ <html>
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% title %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css"/>
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/prog_detail.html vdradmin-am-3.6.4/template/default/prog_detail.html
+--- vdradmin-am-3.6.4~/template/default/prog_detail.html 2007-08-12 16:32:13.000000000 +0200
++++ vdradmin-am-3.6.4/template/default/prog_detail.html 2009-12-23 23:59:02.742581175 +0100
+@@ -2,7 +2,7 @@
+ <html>
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% title %?></title>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/prog_detail_form.html vdradmin-am-3.6.4/template/default/prog_detail_form.html
+--- vdradmin-am-3.6.4~/template/default/prog_detail_form.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/prog_detail_form.html 2009-12-23 23:59:02.742581175 +0100
+@@ -2,7 +2,7 @@
+ <html>
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title><?% title %?></title>
+ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/prog_list.html vdradmin-am-3.6.4/template/default/prog_list.html
+--- vdradmin-am-3.6.4~/template/default/prog_list.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/prog_list.html 2009-12-23 23:59:02.742581175 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% gettext('Channels') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/prog_list2.html vdradmin-am-3.6.4/template/default/prog_list2.html
+--- vdradmin-am-3.6.4~/template/default/prog_list2.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/prog_list2.html 2009-12-23 23:59:02.742581175 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% gettext('Playing Today') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/prog_summary.html vdradmin-am-3.6.4/template/default/prog_summary.html
+--- vdradmin-am-3.6.4~/template/default/prog_summary.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/prog_summary.html 2009-12-23 23:59:02.742581175 +0100
+@@ -3,7 +3,7 @@
+
+ <head>
+ <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_summary" />
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% gettext('What\'s On Now?') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/prog_summary2.html vdradmin-am-3.6.4/template/default/prog_summary2.html
+--- vdradmin-am-3.6.4~/template/default/prog_summary2.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/prog_summary2.html 2009-12-23 23:59:02.742581175 +0100
+@@ -3,7 +3,7 @@
+
+ <head>
+ <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_summary" />
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% gettext('What\'s On Now?') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/prog_timeline.html vdradmin-am-3.6.4/template/default/prog_timeline.html
+--- vdradmin-am-3.6.4~/template/default/prog_timeline.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/prog_timeline.html 2009-12-23 23:59:02.742581175 +0100
+@@ -3,7 +3,7 @@
+
+ <head>
+ <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_timeline" />
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% gettext('Timeline') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/rc.html vdradmin-am-3.6.4/template/default/rc.html
+--- vdradmin-am-3.6.4~/template/default/rc.html 2008-12-05 19:34:10.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/rc.html 2009-12-23 23:59:02.742581175 +0100
+@@ -2,7 +2,7 @@
+ <html>
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% gettext('Remote Control') %?> (<?% host %?>)</title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/rec_edit.html vdradmin-am-3.6.4/template/default/rec_edit.html
+--- vdradmin-am-3.6.4~/template/default/rec_edit.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/rec_edit.html 2009-12-23 23:59:02.742581175 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% gettext('Rename Recording') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/rec_list.html vdradmin-am-3.6.4/template/default/rec_list.html
+--- vdradmin-am-3.6.4~/template/default/rec_list.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/rec_list.html 2009-12-23 23:59:02.746578547 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% gettext('Recordings') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/timer_list.html vdradmin-am-3.6.4/template/default/timer_list.html
+--- vdradmin-am-3.6.4~/template/default/timer_list.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/timer_list.html 2009-12-23 23:59:02.746578547 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% gettext('Timer') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/timer_new.html vdradmin-am-3.6.4/template/default/timer_new.html
+--- vdradmin-am-3.6.4~/template/default/timer_new.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/timer_new.html 2009-12-23 23:59:02.762579489 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Create New Timer') %?><?% ELSE %?><?% gettext('Edit Timer') %?><?% END %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/template/default/tv.html vdradmin-am-3.6.4/template/default/tv.html
+--- vdradmin-am-3.6.4~/template/default/tv.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/tv.html 2009-12-23 23:59:02.762579489 +0100
+@@ -3,7 +3,7 @@
+
+ <head>
+ <title>VDRAdmin-AM - <?% gettext('TV') %?> (<?% host %?>)</title>
+- <meta http-equiv="Content-Type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="Content-Type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+ <link href="user.css" rel="stylesheet" media="screen" type="text/css" />
+diff -urNad vdradmin-am-3.6.4~/template/default/vdr_cmds.html vdradmin-am-3.6.4/template/default/vdr_cmds.html
+--- vdradmin-am-3.6.4~/template/default/vdr_cmds.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.4/template/default/vdr_cmds.html 2009-12-23 23:59:02.762579489 +0100
+@@ -2,7 +2,7 @@
+ <html id="scroller">
+
+ <head>
+- <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
++ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('UTF-8') %?>" />
+ <title>VDRAdmin-AM - <?% gettext('VDR Commands') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.4~/vdradmind.pl vdradmin-am-3.6.4/vdradmind.pl
+--- vdradmin-am-3.6.4~/vdradmind.pl 2009-12-23 23:58:43.274580300 +0100
++++ vdradmin-am-3.6.4/vdradmind.pl 2009-12-23 23:59:02.770588759 +0100
+@@ -3285,7 +3285,7 @@
+
+ setlocale(LC_ALL, $CONFIG{LANG});
+ $LANG = $CONFIG{LANG};
+- $MY_ENCODING = gettext("ISO-8859-1");
++ $MY_ENCODING = gettext("UTF-8");
+ bind_textdomain_codeset("vdradmin", $MY_ENCODING) if($can_use_bind_textdomain_codeset);
+ CGI::charset($MY_ENCODING);
+ }
Propchange: vdr/vdradmin-am/trunk/debian/patches/07_templates_utf8.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: vdr/vdradmin-am/trunk/debian/vdradmin-am.init
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/vdradmin-am.init?rev=8284&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.init (original)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.init Wed Dec 23 23:11:08 2009
@@ -56,7 +56,6 @@
ENV_FILE="none"
[ -r /etc/environment ] && ENV_FILE="/etc/environment"
[ -r /etc/default/locale ] && ENV_FILE="/etc/default/locale"
- echo $ENV_FILE
if [ ! $ENV_FILE = none ] ; then
for var in LANG LC_ALL LC_CTYPE ; do
value=$(egrep "^[^#]*${var}=" $ENV_FILE | tail -n1 | cut -d= -f2)
More information about the pkg-vdr-dvb-changes
mailing list