[Debian-tex-commits] SVN tex-common commit + diffs: r3942 - in tex-common/branches/for-tl2008: debian scripts

[Frank Küster]

Author: frank
Date: 2009-05-20 18:37:02 +0000 (Wed, 20 May 2009)
New Revision: 3942

Modified:
   tex-common/branches/for-tl2008/debian/changelog
   tex-common/branches/for-tl2008/scripts/update-fontlang
Log:
don't include the default setting when there are no patterns to load


Modified: tex-common/branches/for-tl2008/debian/changelog
===================================================================
--- tex-common/branches/for-tl2008/debian/changelog	2009-05-20 17:51:14 UTC (rev 3941)
+++ tex-common/branches/for-tl2008/debian/changelog	2009-05-20 18:37:02 UTC (rev 3942)
@@ -1,3 +1,9 @@
+tex-common (2.01~4) experimental; urgency=low
+
+  * fix hyphenation handling 
+
+ -- Frank Küster <frank at debian.org>  Wed, 20 May 2009 20:36:44 +0200
+
 tex-common (2.01~3) experimental; urgency=low
 
   * switch dh_installtex from language to hyphen

Modified: tex-common/branches/for-tl2008/scripts/update-fontlang
===================================================================
--- tex-common/branches/for-tl2008/scripts/update-fontlang	2009-05-20 17:51:14 UTC (rev 3941)
+++ tex-common/branches/for-tl2008/scripts/update-fontlang	2009-05-20 18:37:02 UTC (rev 3942)
@@ -249,6 +249,7 @@
         cat "$file" >>"$tempfile"
     else
         include_hyphen_file_core "$file"
+	at_least_one_hyphen_file_included=1
     fi
     echo "${CC}${CC}${CC} End of file: $file" >>"$tempfile"
     case "$file" in
@@ -786,6 +787,7 @@
 # From now on, $tempfile must be deleted on exit; therefore, cleanup() should
 # be used.
 
+at_least_one_hyphen_file_included=0
 if [ $syswide_mode = 1 ]; then
     find "$SYSWIDE_CONFDIR"             -maxdepth 1 -type f -name '*.'${EXT}
 else
@@ -793,8 +795,11 @@
 fi | swap_basename_and_dirname | LC_COLLATE=C sort | merge_files
 
 #
-# for language.def we have to select the right language at the end
-if [ "$HYPHENMODE" = "etex" ] ; then
+# for language.def we have to select the right language at the
+# end. But we may only include this if it also has been defined. Since
+# our dependencies make sure that USenglish patterns will be installed
+# first, checking whether anything has been included is sufficient.
+if [ "$HYPHENMODE" = "etex" ] && [ $at_least_one_hyphen_file_included -eq 1 ] ; then
     printf "
 ${PCC}${PCC}${PCC} No changes may be made beyond this point.