[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian packaging of tex-common) branch, master, updated. debian/4.02-1-gcf97d08



The following commit has been merged in the master branch:
commit cf97d08a3eea1feaa1903f18558bd266d88be346
Author: Norbert Preining <preining@debian.org>
Date:   Sun May 12 19:10:33 2013 +0900

    allow working with TL2013

diff --git a/debian/changelog b/debian/changelog
index ae2e264..15b31b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+tex-common (4.03) unstable; urgency=low
+
+  * update-fmtlang: make sure we find the head files in both the old
+    (<= TL2012, ie texlive/texmf/) and new (>= TL2013, ie texlive/texmf-dist)
+
+ -- Norbert Preining <preining@debian.org>  Sun, 12 May 2013 19:09:17 +0900
+
 tex-common (4.02) unstable; urgency=low
 
   * dh_installtex: properly deal with already existing format links
diff --git a/scripts/update-fmtlang b/scripts/update-fmtlang
index fb43c14..eebdfd4 100755
--- a/scripts/update-fmtlang
+++ b/scripts/update-fmtlang
@@ -28,6 +28,7 @@ SYSPATH_BASE=/var/lib/texmf
 
 HYPHENMODE=nohyphen
 HEADFILE=/not/a/real/file/we/ever/will/see/on/a/system
+HEADBACK=/not/a/real/file/we/ever/will/see/on/a/system
 
 if [ "$progname" = "update-language" ] ; then
     update-language-dat
@@ -36,7 +37,8 @@ if [ "$progname" = "update-language" ] ; then
     exit 0
 elif [ "$progname" = "update-language-lua" ] ; then
     CNFDIR=hyphen.d
-    HEADFILE=/usr/share/texlive/texmf/tex/generic/config/language.us.lua
+    HEADFILE=/usr/share/texlive/texmf-dist/tex/generic/config/language.us.lua
+    HEADBACK=/usr/share/texlive/texmf/tex/generic/config/language.us.lua
     HYPHENMODE=luatex
     # System-wide configuration directory
     SYSWIDE_CONFDIR=/etc/texmf/$CNFDIR
@@ -54,7 +56,8 @@ elif [ "$progname" = "update-language-lua" ] ; then
     SHORT_DESC="Generate language.dat.lua, the hyphenation configuration file for luaTeX and friends"
 elif [ "$progname" = "update-language-def" ] ; then
     CNFDIR=hyphen.d
-    HEADFILE=/usr/share/texlive/texmf/tex/generic/config/language.us.def
+    HEADFILE=/usr/share/texlive/texmf-dist/tex/generic/config/language.us.def
+    HEADBACK=/usr/share/texlive/texmf/tex/generic/config/language.us.def
     HYPHENMODE=etex
     # System-wide configuration directory
     SYSWIDE_CONFDIR=/etc/texmf/$CNFDIR
@@ -72,7 +75,8 @@ elif [ "$progname" = "update-language-def" ] ; then
     SHORT_DESC="Generate language.def, the hyphenation configuration file for eTeX and friends"
 elif [ "$progname" = "update-language-dat" ] ; then
     CNFDIR=hyphen.d
-    HEADFILE=/usr/share/texlive/texmf/tex/generic/config/language.us
+    HEADFILE=/usr/share/texlive/texmf-dist/tex/generic/config/language.us
+    HEADBACK=/usr/share/texlive/texmf/tex/generic/config/language.us
     HYPHENMODE=latex
     # System-wide configuration directory
     SYSWIDE_CONFDIR=/etc/texmf/$CNFDIR
@@ -801,6 +805,8 @@ if [ ! "$HYPHENMODE" = "nohyphen" ] ; then
     # we are creating a hyphenation file, include the head file
     if [ -r "$HEADFILE" ] ; then
         cat "$HEADFILE" >> "$tempfile"
+    elif [ -r "$HEADBACK" ] ; then
+        cat "$HEADBACK" >> "$tempfile"
     else
         echo "${WRITECC} HEADFILE $deffile not found" >> "$tempfile"
     fi

-- 
Debian packaging of tex-common)


Reply to: