2010-03-13: 3.6.6v3.6.6

- Added: Support new epgsearch v0.9.25-git settings "unmute" and "min. description match".
- Changed: Log to syslog by default (if logging is enabled) (Ville Skyttä).
- Changed: Fall back to stderr if setting up syslog fails (Ville Skyttä).
- Changed: Get character encoding from configured locale or environment variables (Submitted by Tobias Grimm).
- Fixed: Encode SVDRP commands sent to VDR if needed (Submitted by Tobias Grimm).
- Updated: Italian translation (Submitted by Diego Pierotto).
- Updated: Dutch translation (Submitted by Roel Koelewijn).
- Updated: Spanish translation (Submitted by Manuel Gomez).
- Improved: Default mail settings (Ville Skyttä).
- Fixed: Check if "GUI_POPUP_WIDTH" and "GUI_POPUP_HEIGHT" are numeric and set them to the defaults if they are not (Reported by Jan).
- Added: Support VDR 1.7.12+ commands.conf and reccmds.conf (means: skip lines ending in "{" and lines with only "}" in them).
- Added: check file and directory permissions on startup abort on error.
- Changed: Default directory for PID file to /var/run/vdradmin.
- Changed: Default directory for log file to /var/log/vdradmin.
- Changed: Use "cache" directory in the current directory if $SEARCH_FILES_IN_SYSTEM is not set.
- Changed: Hide "record" button in EPG lists there's already a timer for that broadcast (Based on patch by Dave Pickles).
- Added: New options to show or hide a broadcast's subtitle and/or summary in EPG lists (Based on patch by Dave Pickles).
- Added: New option to set a day's "start time" in "Playing today?" (Based on patch by Dave Pickles).
- Changed: Minimum required epgsearch version now is 0.9.24.
- Added: Support for new epgsearch search timer actions (Bug #557).
- Changed: "--ipv6" only enables IPv6 for connections to VDRAdmin-AM, to also use IPv6 for SVDRP connection one can use "--ipv6-all" (if he really knows what he's doing!).
- Fixed: Check encoding for every SVDRP connection (Submitted by Tobias Grimm).
- Changed: Warn about missing key or certificate if --ssl is used.
- Changed: Certificates for --ssl option must be located in $ETCDIR/certs.
- Fixed: Resizing browser window in "Timeline" showed "file not found" (Reported by tag @vdr-portal.de).
- Updated: Links to EPGSearch and Streamdev home pages (Ville Skyttä).
- Updated: Finnish translation (Ville Skyttä).

1 files changed, 3 insertions, 70 deletions

diff --git a/make.sh b/make.sh
index 120193f..b198b08 100755
--- a/make.sh
+++ b/make.sh
@@ -11,14 +11,14 @@ TMPDIR=/tmp
 #
 function Usage()
 {
-	echo "Usage: $0 cvs"
+	echo "Usage: $0 <action>"
+	echo
+	echo "Available actions:"
 	echo "  cvs       - always use this after a \"cvs update \" or \"cvs checkout\""
 	echo "  install   - install VDRAdmin-AM"
 	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 +80,6 @@ function do_dist()
 	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 +119,16 @@ do
 
 		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;
 			;;