r8392 - in /vdr/vdradmin-am/trunk/debian: changelog control patches/00list patches/09_Use-UTF-8-to-determine-required-encoding.dpatch patches/10_If-required-recode-commands-sent-to-VDR.dpatch rules vdradmin-am.init vdradmin-am.install
tiber-guest at users.alioth.debian.org
tiber-guest at users.alioth.debian.org
Tue Feb 23 19:46:03 UTC 2010
Author: tiber-guest
Date: Tue Feb 23 19:46:02 2010
New Revision: 8392
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8392
Log:
* Added 09_Use-UTF-8-to-determine-required-encoding.dpatch
* Added 10_If-required-recode-commands-sent-to-VDR.dpatch (Closes: #561834)
* Use libtemplate-plugin-javascript-perl (Closes: #571065)
* Standards-Version: 3.8.4
* Maded init script require $remote_fs (/usr/...)
Added:
vdr/vdradmin-am/trunk/debian/patches/09_Use-UTF-8-to-determine-required-encoding.dpatch
vdr/vdradmin-am/trunk/debian/patches/10_If-required-recode-commands-sent-to-VDR.dpatch
Modified:
vdr/vdradmin-am/trunk/debian/changelog
vdr/vdradmin-am/trunk/debian/control
vdr/vdradmin-am/trunk/debian/patches/00list
vdr/vdradmin-am/trunk/debian/rules
vdr/vdradmin-am/trunk/debian/vdradmin-am.init
vdr/vdradmin-am/trunk/debian/vdradmin-am.install
Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=8392&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Tue Feb 23 19:46:02 2010
@@ -1,3 +1,13 @@
+vdradmin-am (3.6.5-5) unstable; urgency=low
+
+ * Added 09_Use-UTF-8-to-determine-required-encoding.dpatch
+ * Added 10_If-required-recode-commands-sent-to-VDR.dpatch (Closes: #561834)
+ * Use libtemplate-plugin-javascript-perl (Closes: #571065)
+ * Standards-Version: 3.8.4
+ * Maded init script require $remote_fs (/usr/...)
+
+ -- Tobias Grimm <etobi at debian.org> Tue, 23 Feb 2010 20:45:41 +0100
+
vdradmin-am (3.6.5-4) unstable; urgency=low
* Added missing dependency to libwww-perl
Modified: vdr/vdradmin-am/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/control?rev=8392&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/control (original)
+++ vdr/vdradmin-am/trunk/debian/control Tue Feb 23 19:46:02 2010
@@ -4,7 +4,7 @@
Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>
Build-Depends: debhelper (>= 5), dpatch
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdradmin-am/trunk/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/
Homepage: http://andreas.vdr-developer.org/vdradmin-am/index.html
@@ -13,7 +13,8 @@
Architecture: all
Depends: ${perl:Depends}, ${misc:Depends}, libcompress-zlib-perl,
libtemplate-perl, liburi-perl, libio-socket-inet6-perl, libsocket6-perl,
- liblocale-gettext-perl | libintl-perl, libwww-perl, adduser, lsb-base
+ liblocale-gettext-perl | libintl-perl, libwww-perl, adduser, lsb-base,
+ libtemplate-plugin-javascript-perl
Suggests: vdr, libauthen-sasl-perl, vdr-plugin-epgsearch (>= 0.9.23)
Provides: vdradmin
Replaces: vdradmin
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=8392&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/00list (original)
+++ vdr/vdradmin-am/trunk/debian/patches/00list Tue Feb 23 19:46:02 2010
@@ -4,3 +4,5 @@
06_template-cache
07_fix-need-recoding-detection
08_fallback-to-ipv4
+09_Use-UTF-8-to-determine-required-encoding
+10_If-required-recode-commands-sent-to-VDR
Added: vdr/vdradmin-am/trunk/debian/patches/09_Use-UTF-8-to-determine-required-encoding.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/09_Use-UTF-8-to-determine-required-encoding.dpatch?rev=8392&op=file
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/09_Use-UTF-8-to-determine-required-encoding.dpatch (added)
+++ vdr/vdradmin-am/trunk/debian/patches/09_Use-UTF-8-to-determine-required-encoding.dpatch Tue Feb 23 19:46:02 2010
@@ -1,0 +1,561 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 09_Use-UTF-8-to-determine-required-encoding.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+ at DPATCH@
+diff -urNad vdradmin-am-3.6.5~/make.sh vdradmin-am-3.6.5/make.sh
+--- vdradmin-am-3.6.5~/make.sh 2008-12-05 19:34:09.000000000 +0100
++++ vdradmin-am-3.6.5/make.sh 2010-02-23 20:29:58.000000000 +0100
+@@ -17,8 +17,6 @@
+ echo " uninstall - uninstall VDRAdmin-AM"
+ echo " po - convert .po files to .mo files"
+ echo " dist - create distribution archive"
+- echo " utf8add - generate utf8 locales from existing locales"
+- echo " utf8clean - cleanup utf8 locales"
+ echo " cl - create ChangeLog file."
+ echo " check - check requirements"
+ exit 1
+@@ -80,63 +78,6 @@
+ mv $TMPDIR/$DIST_NAME.tar.bz2 .
+ }
+
+-# extract original character encoding
+-#
+-function getOrigEncoding()
+-{
+- local ENC=$(grep 'msgstr "ISO-8859' $1)
+- # strip away "ISO-", because sometimes we need it as "iso"
+- ENC=${ENC/'msgstr "ISO-'/}
+- ENC=${ENC/'"'/}
+- echo $ENC
+-}
+-
+-
+-# cleanup utf8 locales
+-#
+-function do_utf8_clean()
+-{
+- (cd po && rm -f *.utf8.po*)
+- [ -d locale ] && (cd locale && rm -rf *.utf8)
+-}
+-
+-# generate utf8 locales
+-#
+-function do_utf8_generate()
+-{
+- # start clean
+- do_utf8_clean
+-
+- ( cd po
+- local filename
+- local encoding
+- local newfilename
+-
+- # generate utf8 locales for existing translations
+- for file in *.po; do
+- [ -e $file ] || continue
+- filename=${file%.po}
+- encoding=iso$(getOrigEncoding $filename.po)
+- case $filename in
+- cs) newfilename=CZ;;
+- *) newfilename=$(echo $filename | tr [:lower:] [:upper:])
+- esac
+- # convert
+- iconv -f $encoding -t utf-8 $filename.po > ${filename}_$newfilename.utf8.po
+- done
+-
+- # generate us_US.utf8.po from POT template
+- msginit -i vdradmin.pot -o en_US.utf8.po -l en_US.utf8 --no-translator --no-wrap
+-
+- # map ISO-8859-1 encoding to UTF-8 instead of the respective "old" encodings
+- for file in $(ls *.utf8.po); do
+- encoding=ISO-$(getOrigEncoding $file)
+- sed -e 's:msgstr "'$encoding'":msgstr "UTF-8":g' -e 's#"Content-Type: text/plain; charset=.*#"Content-Type: text/plain; charset=UTF-8\\n"#g' $file > $file.tmp
+- mv $file.tmp $file
+- done
+- )
+-}
+-
+ # create ChangeLog file.
+ #
+ function do_cl()
+@@ -176,26 +117,16 @@
+
+ local)
+ do_cvs
+- do_utf8_generate
+ do_po
+ ;;
+
+ dist)
+ do_cvs
+- do_utf8_generate
+ do_po
+ do_cl
+ do_dist
+ ;;
+
+- utf8add)
+- do_utf8_generate
+- ;;
+-
+- utf8clean)
+- do_utf8_clean
+- ;;
+-
+ cl)
+ do_cl;
+ ;;
+diff -urNad vdradmin-am-3.6.5~/template/default/about.html vdradmin-am-3.6.5/template/default/about.html
+--- vdradmin-am-3.6.5~/template/default/about.html 2009-12-30 14:26:06.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/about.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/at_timer_list.html vdradmin-am-3.6.5/template/default/at_timer_list.html
+--- vdradmin-am-3.6.5~/template/default/at_timer_list.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/at_timer_list.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>"/>
+ <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.5~/template/default/at_timer_new.html vdradmin-am-3.6.5/template/default/at_timer_new.html
+--- vdradmin-am-3.6.5~/template/default/at_timer_new.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/at_timer_new.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>"/>
+ <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.5~/template/default/config.html vdradmin-am-3.6.5/template/default/config.html
+--- vdradmin-am-3.6.5~/template/default/config.html 2009-07-23 20:10:32.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/config.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/epgsearch_config.html vdradmin-am-3.6.5/template/default/epgsearch_config.html
+--- vdradmin-am-3.6.5~/template/default/epgsearch_config.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/epgsearch_config.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>"/>
+ <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.5~/template/default/epgsearch_list.html vdradmin-am-3.6.5/template/default/epgsearch_list.html
+--- vdradmin-am-3.6.5~/template/default/epgsearch_list.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/epgsearch_list.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>"/>
+ <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.5~/template/default/epgsearch_new.html vdradmin-am-3.6.5/template/default/epgsearch_new.html
+--- vdradmin-am-3.6.5~/template/default/epgsearch_new.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/epgsearch_new.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>"/>
+ <?% 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.5~/template/default/error.html vdradmin-am-3.6.5/template/default/error.html
+--- vdradmin-am-3.6.5~/template/default/error.html 2006-10-19 14:12:34.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/error.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>"/>
+ <title><?% gettext('Error!') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css"/>
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.5~/template/default/help_at_timer_list.html vdradmin-am-3.6.5/template/default/help_at_timer_list.html
+--- vdradmin-am-3.6.5~/template/default/help_at_timer_list.html 2006-10-20 09:57:06.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/help_at_timer_list.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/help_at_timer_new.html vdradmin-am-3.6.5/template/default/help_at_timer_new.html
+--- vdradmin-am-3.6.5~/template/default/help_at_timer_new.html 2008-12-26 08:15:22.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/help_at_timer_new.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/help_config.html vdradmin-am-3.6.5/template/default/help_config.html
+--- vdradmin-am-3.6.5~/template/default/help_config.html 2008-12-26 08:15:22.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/help_config.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/help_edit_epg.html vdradmin-am-3.6.5/template/default/help_edit_epg.html
+--- vdradmin-am-3.6.5~/template/default/help_edit_epg.html 2007-07-16 12:52:59.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/help_edit_epg.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/help_no.html vdradmin-am-3.6.5/template/default/help_no.html
+--- vdradmin-am-3.6.5~/template/default/help_no.html 2006-08-22 13:11:59.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/help_no.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/help_rec_list.html vdradmin-am-3.6.5/template/default/help_rec_list.html
+--- vdradmin-am-3.6.5~/template/default/help_rec_list.html 2006-10-20 09:57:30.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/help_rec_list.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/help_timer_list.html vdradmin-am-3.6.5/template/default/help_timer_list.html
+--- vdradmin-am-3.6.5~/template/default/help_timer_list.html 2006-10-20 09:57:33.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/help_timer_list.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/help_timer_new.html vdradmin-am-3.6.5/template/default/help_timer_new.html
+--- vdradmin-am-3.6.5~/template/default/help_timer_new.html 2006-10-20 09:57:35.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/help_timer_new.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/index.html vdradmin-am-3.6.5/template/default/index.html
+--- vdradmin-am-3.6.5~/template/default/index.html 2006-10-20 08:50:16.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/index.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/navigation.html vdradmin-am-3.6.5/template/default/navigation.html
+--- vdradmin-am-3.6.5~/template/default/navigation.html 2008-12-05 19:34:10.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/navigation.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <title>VDRAdmin-AM</title>
+ <link type="text/css" href="style.css" rel="stylesheet" media="screen" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.5~/template/default/noauth.html vdradmin-am-3.6.5/template/default/noauth.html
+--- vdradmin-am-3.6.5~/template/default/noauth.html 2006-10-18 13:18:40.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/noauth.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <title><?% gettext('Authorization Required') %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.5~/template/default/noperm.html vdradmin-am-3.6.5/template/default/noperm.html
+--- vdradmin-am-3.6.5~/template/default/noperm.html 2006-08-22 13:12:00.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/noperm.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <title><?% title %?></title>
+ <link href="style.css" rel="stylesheet" media="screen" type="text/css"/>
+ <?% IF usercss %?>
+diff -urNad vdradmin-am-3.6.5~/template/default/prog_detail.html vdradmin-am-3.6.5/template/default/prog_detail.html
+--- vdradmin-am-3.6.5~/template/default/prog_detail.html 2007-08-12 16:32:13.000000000 +0200
++++ vdradmin-am-3.6.5/template/default/prog_detail.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/prog_detail_form.html vdradmin-am-3.6.5/template/default/prog_detail_form.html
+--- vdradmin-am-3.6.5~/template/default/prog_detail_form.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/prog_detail_form.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/prog_list.html vdradmin-am-3.6.5/template/default/prog_list.html
+--- vdradmin-am-3.6.5~/template/default/prog_list.html 2008-12-20 08:00:28.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/prog_list.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/prog_list2.html vdradmin-am-3.6.5/template/default/prog_list2.html
+--- vdradmin-am-3.6.5~/template/default/prog_list2.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/prog_list2.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/prog_summary.html vdradmin-am-3.6.5/template/default/prog_summary.html
+--- vdradmin-am-3.6.5~/template/default/prog_summary.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/prog_summary.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/prog_summary2.html vdradmin-am-3.6.5/template/default/prog_summary2.html
+--- vdradmin-am-3.6.5~/template/default/prog_summary2.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/prog_summary2.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/prog_timeline.html vdradmin-am-3.6.5/template/default/prog_timeline.html
+--- vdradmin-am-3.6.5~/template/default/prog_timeline.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/prog_timeline.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/rc.html vdradmin-am-3.6.5/template/default/rc.html
+--- vdradmin-am-3.6.5~/template/default/rc.html 2008-12-05 19:34:10.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/rc.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/rec_edit.html vdradmin-am-3.6.5/template/default/rec_edit.html
+--- vdradmin-am-3.6.5~/template/default/rec_edit.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/rec_edit.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/rec_list.html vdradmin-am-3.6.5/template/default/rec_list.html
+--- vdradmin-am-3.6.5~/template/default/rec_list.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/rec_list.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/timer_list.html vdradmin-am-3.6.5/template/default/timer_list.html
+--- vdradmin-am-3.6.5~/template/default/timer_list.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/timer_list.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/timer_new.html vdradmin-am-3.6.5/template/default/timer_new.html
+--- vdradmin-am-3.6.5~/template/default/timer_new.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/timer_new.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/tv.html vdradmin-am-3.6.5/template/default/tv.html
+--- vdradmin-am-3.6.5~/template/default/tv.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/tv.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/template/default/vdr_cmds.html vdradmin-am-3.6.5/template/default/vdr_cmds.html
+--- vdradmin-am-3.6.5~/template/default/vdr_cmds.html 2008-12-20 08:00:29.000000000 +0100
++++ vdradmin-am-3.6.5/template/default/vdr_cmds.html 2010-02-23 20:29:58.000000000 +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=<?% charset %?>" />
+ <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.5~/vdradmind.pl vdradmin-am-3.6.5/vdradmind.pl
+--- vdradmin-am-3.6.5~/vdradmind.pl 2010-02-23 20:29:58.000000000 +0100
++++ vdradmin-am-3.6.5/vdradmind.pl 2010-02-23 20:29:58.000000000 +0100
+@@ -418,10 +418,14 @@
+ }
+ }
+
++ReadConfig();
++LoadTranslation();
++
+ #use Template::Constants qw( :debug );
+ # IMHO a better Template Modul ;-)
+ # some useful options (see below for full list)
+ my $Xtemplate_vars = { usercss => $UserCSS,
++ charset => $MY_ENCODING,
+ gettext => sub{ $_[0] =~ s/\n\s+//g; return gettext($_[0]); },
+ config => \%CONFIG,
+ features => \%FEATURES
+@@ -461,9 +465,6 @@
+
+ # ---- End new template section ----
+
+-ReadConfig();
+-LoadTranslation();
+-
+ if ($DAEMON && $CONFIG{LOGFILE} eq "syslog") {
+ require Sys::Syslog;
+ Sys::Syslog->import(qw(:standard));
+@@ -3341,8 +3342,13 @@
+ );
+
+ setlocale(LC_ALL, $CONFIG{LANG});
+- $LANG = $CONFIG{LANG};
+- $MY_ENCODING = gettext("ISO-8859-1");
++ if (! $CONFIG{LANG} eq '') {
++ setlocale(LC_ALL, $CONFIG{LANG});
++ chomp($MY_ENCODING = `LC_ALL=$CONFIG{LANG} locale charmap`);
++ }
++ else {
++ chomp($MY_ENCODING = `locale charmap`);
++ }
+ bind_textdomain_codeset("vdradmin", $MY_ENCODING) if($can_use_bind_textdomain_codeset);
+ CGI::charset($MY_ENCODING);
+ }
Added: vdr/vdradmin-am/trunk/debian/patches/10_If-required-recode-commands-sent-to-VDR.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/10_If-required-recode-commands-sent-to-VDR.dpatch?rev=8392&op=file
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/10_If-required-recode-commands-sent-to-VDR.dpatch (added)
+++ vdr/vdradmin-am/trunk/debian/patches/10_If-required-recode-commands-sent-to-VDR.dpatch Tue Feb 23 19:46:02 2010
@@ -1,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+## 10_If-required-recode-commands-sent-to-VDR.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+
+ at DPATCH@
+diff -urNad vdradmin-am-3.6.5~/vdradmind.pl vdradmin-am-3.6.5/vdradmind.pl
+--- vdradmin-am-3.6.5~/vdradmind.pl 2010-02-23 20:30:14.000000000 +0100
++++ vdradmin-am-3.6.5/vdradmind.pl 2010-02-23 20:30:14.000000000 +0100
+@@ -6780,6 +6780,7 @@
+ main::Log(LOG_DEBUG, sprintf("[SVDRP] Sending \"%s\"", $cmd));
+ $cmd = $cmd . CRLF;
+ if ($SOCKET && $SOCKET->connected()) {
++ Encode::from_to($cmd, $MY_ENCODING, $VDR_ENCODING) if ($need_recode);
+ my $result = send($SOCKET, $cmd, 0);
+ if ($result != length($cmd)) {
+ main::HTMLError(sprintf($ERROR_MESSAGE{send_command}, $CONFIG{VDR_HOST}));
Modified: vdr/vdradmin-am/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/rules?rev=8392&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/rules (original)
+++ vdr/vdradmin-am/trunk/debian/rules Tue Feb 23 19:46:02 2010
@@ -17,7 +17,6 @@
#-$(MAKE) clean
@rm -f debian/vdradmind debian/vdradmind.1
dh_clean
- #./make.sh utf8clean
if [ -d locale.backup ] ; then rm -rf locale; mv locale.backup locale; fi
if [ -d po.backup ] ; then rm -rf po; mv po.backup po; fi
@@ -26,7 +25,6 @@
# Note: all files are installed using dh_install
[ -d locale.backup ] || mv locale locale.backup
[ -d po.backup ] || cp -r po po.backup
- ./make.sh utf8add
./make.sh po
install: build
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=8392&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.init (original)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.init Tue Feb 23 19:46:02 2010
@@ -4,10 +4,8 @@
#
### BEGIN INIT INFO
# Provides: vdradmin-am
-# Required-Start: $network $syslog
-# Required-Stop: $network $syslog
-# Should-Start: $local_fs $remote_fs
-# Should-Stop: $local_fs $remote_fs
+# Required-Start: $remote_fs $network $syslog
+# Required-Stop: $remote_fs $network $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Starts vdradmin-am
Modified: vdr/vdradmin-am/trunk/debian/vdradmin-am.install
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/vdradmin-am.install?rev=8392&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/vdradmin-am.install (original)
+++ vdr/vdradmin-am/trunk/debian/vdradmin-am.install Tue Feb 23 19:46:02 2010
@@ -4,4 +4,3 @@
autotimer2searchtimer.pl usr/share/vdradmin-am/
debian/at2epgsearch usr/share/vdradmin-am/
debian/vdradmind usr/bin/
-lib/Template/Plugin/JavaScript.pm usr/share/perl5/vdradmin-am/Template/Plugin/
More information about the pkg-vdr-dvb-changes
mailing list