[vdr] 02/05: Removed the VDR_CHARSET_OVERRIDE from /etc/default/vdr - replaced with the --chartab command line argument

[Tobias Grimm]

This is an automated email from the git hooks/post-receive script.

tiber-guest pushed a commit to branch master
in repository vdr.

commit bd3b6ba3f4cee8d456d4e87338949ab228c80416
Author: etobi <git at e-tobi.net>
Date:   Sat Mar 14 13:35:43 2015 +0100

    Removed the VDR_CHARSET_OVERRIDE from /etc/default/vdr - replaced with the --chartab command line argument
---
 debian/README.Debian         | 10 ----------
 debian/changelog             |  2 ++
 debian/migrate-old-config.sh |  5 +++++
 debian/runvdr                |  3 ---
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index cde5897..499b373 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -96,16 +96,6 @@ LIRC=<lirc_device>
     setting it to "" which might be required if you use a
     different frontend, like XBMC or xineliboutput.
 
-VDR_CHARSET_OVERRIDE=<CHARSET>
-
-    Default: not set
-
-    Workaround for broadcasters not correctly implementing the standard.
-    According to "ETSI EN 300 468" the default character set is ISO-6937. But
-    unfortunately some broadcasters actually use ISO-8859-9, but fail to
-    correctly announce that. If you set VDR_CHARSET_OVERRIDE=ISO-8859-9, then VDR
-    uses ISO-8859-9 as default.
-
 VDR_LANG=<LANG>
 
     Default: read from LANG or LC_ALL in /etc/default/locale or /etc/environment,
diff --git a/debian/changelog b/debian/changelog
index fda06c4..1d1a367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ vdr (2.2.0-1) UNRELEASED; urgency=medium
     /etc/vdr/conf.d/ in order to be loaded
   * Install a debhelper addon in vdr-dev which supports the plugin packaging
   * Delete /etc/vdr/conf.d on purge
+  * Removed the VDR_CHARSET_OVERRIDE from /etc/default/vdr - replaced with the
+   --chartab command line argument
 
  -- Tobias Grimm <etobi at debian.org>  Sat, 07 Mar 2015 13:02:02 +0100
 
diff --git a/debian/migrate-old-config.sh b/debian/migrate-old-config.sh
index 60e43db..cb1d086 100644
--- a/debian/migrate-old-config.sh
+++ b/debian/migrate-old-config.sh
@@ -16,3 +16,8 @@ sed -e "s|\(--video\)=.*|\1=$VIDEO_DIR|g" \
     -e "s|.*\(--shutdown\)|$([ "$ENABLE_SHUTDOWN" != "1" ] && echo '#')\1|g" \
     -e "s|.*--lirc.*|$([ -n "$LIRC" ] && echo "--lirc=$LIRC" || echo '#--lirc')|g" \
     -i /etc/vdr/conf.d/00-vdr.conf
+
+
+if [ -n "$VDR_CHARSET_OVERRIDE" ]; then
+  echo "--chartab=$VDR_CHARSET_OVERRIDE" >> /etc/vdr/conf.d/00-vdr.conf
+fi
diff --git a/debian/runvdr b/debian/runvdr
index 5e8dc47..29ac360 100644
--- a/debian/runvdr
+++ b/debian/runvdr
@@ -3,9 +3,6 @@
 . /usr/lib/vdr/config-loader.sh
 
 VDR_ENV="LANG=$VDR_LANG LC_ALL=$VDR_LANG"
-if [ -n "$VDR_CHARSET_OVERRIDE" ] ; then
-   VDR_ENV="$VDR_ENV VDR_CHARSET_OVERRIDE=$VDR_CHARSET_OVERRIDE"
-fi
 
 VDRCMD="$VDR_ENV /usr/bin/vdr $*"
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-vdr-dvb/vdr.git