[Debian-tex-commits] SVN tex-common commit + diffs: r3957 - in tex-common/branches/for-tl2008: conf/language.d debian scripts

[Frank Küster]

Author: frank
Date: 2009-05-26 09:22:39 +0000 (Tue, 26 May 2009)
New Revision: 3957

Removed:
   tex-common/branches/for-tl2008/conf/language.d/00tex.cnf
Modified:
   tex-common/branches/for-tl2008/debian/changelog
   tex-common/branches/for-tl2008/scripts/update-fontlang
Log:
revert the changes intended for upgrading, we use breaks instead


Deleted: tex-common/branches/for-tl2008/conf/language.d/00tex.cnf
===================================================================
--- tex-common/branches/for-tl2008/conf/language.d/00tex.cnf	2009-05-26 09:05:39 UTC (rev 3956)
+++ tex-common/branches/for-tl2008/conf/language.d/00tex.cnf	2009-05-26 09:22:39 UTC (rev 3957)
@@ -1,30 +0,0 @@
-% 00tex.cnf: header of the configuration file for language.dat
-%
-% In Debian, language.dat is a file that is generated from
-% configuration files in /etc/texmf/language.d/.  This file, 00tex.cnf, 
-% contains only some comments on how to edit these files.
-%
-% The text of the comments is Copyright 1998, 1999 by Thomas Esser, it
-% is in the Public domain.
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%  To make it possible for package scripts to parse this file, 
-%%  please use only "%! " to comment out hyphenation patterns!
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% CAUTION: the first language will be the default if no style-file
-%          (e.g. german.sty) is used.
-% Since version 3.0 of TeX, hyphenation patterns for multiple languages are
-% possible. Unless you know what you are doing, please let the american
-% english patterns be the first ones. The babel system allows you to
-% easily change the active language for your texts. For more information,
-% have a look to the documentation in texmf/doc/generic/babel.
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% The hyphenation pattern files are in the directory:
-%       texmf/tex/generic/hyphen
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-

Modified: tex-common/branches/for-tl2008/debian/changelog
===================================================================
--- tex-common/branches/for-tl2008/debian/changelog	2009-05-26 09:05:39 UTC (rev 3956)
+++ tex-common/branches/for-tl2008/debian/changelog	2009-05-26 09:22:39 UTC (rev 3957)
@@ -1,3 +1,10 @@
+tex-common (2.01~5) experimental; urgency=low
+
+  * Revert the changes made in ~1; we don't want that type of upgrading
+    path 
+
+ -- Frank Küster <frank at debian.org>  Tue, 26 May 2009 11:21:37 +0200
+
 tex-common (2.01~4) experimental; urgency=low
 
   * fix hyphenation handling 

Modified: tex-common/branches/for-tl2008/scripts/update-fontlang
===================================================================
--- tex-common/branches/for-tl2008/scripts/update-fontlang	2009-05-26 09:05:39 UTC (rev 3956)
+++ tex-common/branches/for-tl2008/scripts/update-fontlang	2009-05-26 09:22:39 UTC (rev 3957)
@@ -29,34 +29,9 @@
 HYPHENMODE=nohyphen
 
 if [ "$progname" = "update-language" ] ; then
-    CNFDIR=hyphen.d
-    HYPHENMODE=etex
-    # System-wide configuration directory
-    SYSWIDE_CONFDIR=/etc/texmf/$CNFDIR
-    CHECKFILE="$SYSWIDE_CONFDIR/00tex.cnf"
-    if [ -r "$CHECKFILE" ] ; then
-        update-language-dat
-	update-language-def
-	exit 0
-    else
-    # no hyphen.d yet.
-    # Missing: we need to properly check whether we are upgrading, or something is amiss.
-        HYPHENMODE="nohyphen"
-        CNFDIR=language.d
-	# System-wide configuration directory
-	SYSWIDE_CONFDIR=/etc/texmf/$CNFDIR
-        CHECKFILE="$SYSWIDE_CONFDIR/00tex.cnf"
-        EXT="cnf"
-        MEMORY_DIR=/var/lib/tex-common/language-cnf
-        PATH_COMPONENT=tex/generic/config
-        SYSWIDE_VARD="$SYSPATH_BASE/$PATH_COMPONENT"
-        DEFAULT_OUTPUTFILE_BASENAME=language.dat
-        SYSWIDE_DEFAULT_OUTPUTFILE="$SYSWIDE_VARD/$DEFAULT_OUTPUTFILE_BASENAME"
-        CC="%"                      # for COMMENTCHAR
-        # in printf, %% is one %
-        PCC="%%"                    # for printfCOMMENTCHAR
-        SHORT_DESC="Generate language.dat, the hyphenation configuration file for LaTeX"
-    fi
+    update-language-dat
+    update-language-def
+    exit 0
 elif [ "$progname" = "update-language-def" ] ; then
     CNFDIR=hyphen.d
     HYPHENMODE=etex
@@ -249,7 +224,6 @@
         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
@@ -352,6 +326,7 @@
 handle_file()
 {
     file="$1"
+
     # Does the file have a dpkg-new sister?
     if [ -f "${file}.dpkg-new" ]; then
       do_not_include_file "$file"
@@ -463,6 +438,7 @@
     fi
 
     if ! [ -r "$CHECKFILE" ] ; then
+        echo "$progname: cannot read $CHECKFILE" >&2
         exit 1
     fi
 
@@ -787,7 +763,6 @@
 # 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
@@ -795,11 +770,8 @@
 fi | swap_basename_and_dirname | LC_COLLATE=C sort | merge_files
 
 #
-# 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
+# for language.def we have to select the right language at the end
+if [ "$HYPHENMODE" = "etex" ] ; then
     printf "
 ${PCC}${PCC}${PCC} No changes may be made beyond this point.