Hi,

I have NMU'ed this with the following patch (sorry for not sending
first, but I was offline the weekend).  Now the package cooperates
nicely with teTeX-3.0.

Regards, Frank
-- 
Frank Küster
Inst. f. Biochemie der Univ. Zürich
Debian Developer

diff -Nur thailatex-0.3.2.orig/debian/babel.sty thailatex-0.3.2/debian/babel.sty
--- thailatex-0.3.2.orig/debian/babel.sty	2003-03-30 06:54:49.000000000 +0200
+++ thailatex-0.3.2/debian/babel.sty	2005-12-23 20:03:23.000000000 +0100
@@ -5,35 +5,55 @@
 %% The original source files were:
 %%
 %% babel.dtx  (with options: `package')
-%% 
 %% This is a generated file.
 %% 
-%% Copyright 1989-2001 Johannes L. Braams and any individual authors
+%% Copyright 1989-2004 Johannes L. Braams and any individual authors
 %% listed elsewhere in this file.  All rights reserved.
 %% 
-%% This file is part of the Babel system release 3.7.
-%% --------------------------------------------------
+%% This file was generated from file(s) of the Babel system.
+%% ---------------------------------------------------------
+%% 
+%% It may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%%   http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%% 
+%% This work has the LPPL maintenance status "maintained".
+%% 
+%% The Current Maintainer of this work is Johannes Braams.
+%% 
+%% This file may only be distributed together with a copy of the Babel
+%% system. You may however distribute the Babel system without
+%% such generated files.
 %% 
-%% It may be distributed under the terms of the LaTeX Project Public
-%% License, as described in lppl.txt in the base LaTeX distribution.
-%% Either version 1.2 or, at your option, any later version.
+%% The list of all files belonging to the Babel distribution is
+%% given in the file `manifest.bbl'. See also `legal.bbl for additional
+%% information.
+%% 
+%% The list of derived (unpacked) files belonging to the distribution
+%% and covered by LPPL is defined by the unpacking scripts (with
+%% extension .ins) which are part of the distribution.
 %%
 \NeedsTeXFormat{LaTeX2e}[1998/06/01]
 %% File 'babel.dtx'
-%%\ProvidesFile{babel.dtx}[2001/03/01 v3.7h The Babel package]
+%%\ProvidesFile{babel.dtx}[2004/11/20 v3.8d The Babel package]
 %% Babel package for LaTeX2e.
-%% Copyright (C) 1989 -- 2001 by Johannes Braams,
+%% Copyright (C) 1989 -- 2004 by Johannes Braams,
 %%                            TeXniek
 %%                            all rights reserved.
 %% Please report errors to: J.L. Braams
-%%                          [EMAIL PROTECTED]
+%%                          babel at braams.cistron.nl
 \ProvidesPackage{babel}
-                [2001/03/01 v3.7h %
+                [2004/11/20 v3.8d %
      The Babel package]
 [EMAIL PROTECTED] babel.def\relax\fi
 \DeclareOption{acadian}{\input{frenchb.ldf}}
 \DeclareOption{afrikaans}{\input{dutch.ldf}}
 \DeclareOption{american}{\input{english.ldf}}
+\DeclareOption{australian}{\input{english.ldf}}
 \DeclareOption{austrian}{\input{germanb.ldf}}
 \DeclareOption{bahasa}{\input{bahasa.ldf}}
 \DeclareOption{basque}{\input{basque.ldf}}
@@ -55,11 +75,7 @@
 \DeclareOption{finnish}{\input{finnish.ldf}}
 \DeclareOption{francais}{\input{frenchb.ldf}}
 \DeclareOption{frenchb}{\input{frenchb.ldf}}
-\IfFileExists{french.ldf}{%
-  \DeclareOption{french}{\input{french.ldf}}%
-  }{%
-  \DeclareOption{french}{\input{frenchb.ldf}}%
-  }
+\DeclareOption{french}{\input{frenchb.ldf}}%
 \DeclareOption{galician}{\input{galician.ldf}}
 \DeclareOption{german}{\input{germanb.ldf}}
 \DeclareOption{germanb}{\input{germanb.ldf}}
@@ -72,12 +88,14 @@
   \input{hebrew.ldf}}
 \DeclareOption{hungarian}{\input{magyar.ldf}}
 \DeclareOption{icelandic}{\input{icelandic.ldf}}
+\DeclareOption{interlingua}{\input{interlingua.ldf}}
 \DeclareOption{irish}{\input{irish.ldf}}
 \DeclareOption{italian}{\input{italian.ldf}}
 \DeclareOption{latin}{\input{latin.ldf}}
 \DeclareOption{lowersorbian}{\input{lsorbian.ldf}}
 \DeclareOption{magyar}{\input{magyar.ldf}}
 \DeclareOption{naustrian}{\input{ngermanb.ldf}}
+\DeclareOption{newzealand}{\input{english.ldf}}
 \DeclareOption{ngerman}{\input{ngermanb.ldf}}
 \DeclareOption{norsk}{\input{norsk.ldf}}
 \DeclareOption{samin}{\input{samin.ldf}}
@@ -126,7 +144,7 @@
   \input{babel.def}
 \fi
 \def\substitutefontfamily#1#2#3{%
-  \immediate\openout15=#1#2.fd\relax
+  \lowercase{\immediate\openout15=#1#2.fd\relax}%
   \immediate\write15{%
     \string\ProvidesFile{#1#2.fd}%
     [\the\year/[EMAIL PROTECTED]/[EMAIL PROTECTED]
@@ -162,24 +180,26 @@
   }
 \AtBeginDocument{%
   [EMAIL PROTECTED]
-    [EMAIL PROTECTED]@@vpageref#1[#2]#3{%
+    [EMAIL PROTECTED]@@vpageref#1[#2]#3{%
       [EMAIL PROTECTED]@activestrue
       \org@@@vpageref{#1}[#2]{#3}%
       [EMAIL PROTECTED]@activesfalse}%
+    [EMAIL PROTECTED]
+      [EMAIL PROTECTED]@activestrue
+      [EMAIL PROTECTED]
+      [EMAIL PROTECTED]@activesfalse}%
     }{}%
   }
 \AtBeginDocument{%
   [EMAIL PROTECTED]
-    {\expandafter\ifx\csname [EMAIL PROTECTED]:\endcsname\relax
+    {\expandafter\ifx\csname [EMAIL PROTECTED]:\endcsname\relax
      \else
        \makeatletter
        [EMAIL PROTECTED]
      \fi}%
     {}}
-\AtBeginDocument{%
-  [EMAIL PROTECTED]
-    \DeclareRobustCommand{\FOREIGNLANGUAGE}[1]{%
-      \lowercase{\foreignlanguage{#1}}}}{}}
+\DeclareRobustCommand{\FOREIGNLANGUAGE}[1]{%
+  \lowercase{\foreignlanguage{#1}}}
 %%
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
diff -Nur thailatex-0.3.2.orig/debian/changelog thailatex-0.3.2/debian/changelog
--- thailatex-0.3.2.orig/debian/changelog	2004-03-25 08:00:46.000000000 +0100
+++ thailatex-0.3.2/debian/changelog	2005-12-23 20:08:10.000000000 +0100
@@ -1,3 +1,16 @@
+thailatex (0.3.2-0.1) unstable; urgency=low
+
+  * NMU to fix RC bug: closes: #318384
+  * Fix upstream Makefile to not call install-data-hook
+  * Invoke updmap-sys instead of updmap, but fall back to updmap if
+    updmap-sys is not found (only needed for sarge backports).
+  * Update debian/babel.sty so that all new languages provided by
+    teTeX-3.0 are still available when thailatex is installed.
+    dpkg-diverting the file is no longer necessary, since teTeX's file is
+    at a different place (closes: #338619).
+
+ -- Frank Küster <[EMAIL PROTECTED]>  Fri, 23 Dec 2005 20:07:32 +0100
+
 thailatex (0.3.2) unstable; urgency=low
 
   * New upstream release.
diff -Nur thailatex-0.3.2.orig/debian/postinst thailatex-0.3.2/debian/postinst
--- thailatex-0.3.2.orig/debian/postinst	2003-03-29 14:26:02.000000000 +0100
+++ thailatex-0.3.2/debian/postinst	2005-12-23 20:23:39.000000000 +0100
@@ -30,9 +30,11 @@
       if [ -x /usr/bin/texhash ] ; then \
          /usr/bin/texhash ; \
       fi
-      if [ -x /usr/bin/updmap ] ; then \
-         /usr/bin/updmap ; \
+      UPDMAP=updmap
+      if [ -x /usr/bin/updmap-sys ]; then
+	UPDMAP=updmap-sys
       fi
+      $UPDMAP
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
diff -Nur thailatex-0.3.2.orig/debian/postrm thailatex-0.3.2/debian/postrm
--- thailatex-0.3.2.orig/debian/postrm	2003-07-08 08:41:54.000000000 +0200
+++ thailatex-0.3.2/debian/postrm	2005-12-23 20:23:33.000000000 +0100
@@ -18,9 +18,6 @@
 
 case "$1" in
     remove)
-         dpkg-divert --package thailatex  --remove --rename \
-             --divert /usr/share/texmf/tex/generic/babel/babel.sty.real \
-	     /usr/share/texmf/tex/generic/babel/babel.sty
 
          if [ -x /usr/bin/texhash ] ; then \
            /usr/bin/texhash ; \
@@ -35,8 +32,14 @@
          if [ -x /usr/bin/texhash ] ; then \
            /usr/bin/texhash ; \
          fi
-         if [ -x /usr/bin/updmap ] ; then \
-            /usr/bin/updmap ; \
+	 UPDMAP=""
+	 if [ -f "`which updmap-sys`" updmap-sys ]; then
+	   UPDMAP=updmap-sys
+	 elif [ -f "`which updmap`" ]
+	   UPDMAP=updmap
+	 fi
+         if [ -n "$UPDMAP" ] ; then 
+            $UPDMAP
          fi
 
 	;;
diff -Nur thailatex-0.3.2.orig/debian/preinst thailatex-0.3.2/debian/preinst
--- thailatex-0.3.2.orig/debian/preinst	2003-03-29 14:26:02.000000000 +0100
+++ thailatex-0.3.2/debian/preinst	2005-12-23 19:34:49.000000000 +0100
@@ -15,7 +15,11 @@
 
 case "$1" in
     install|upgrade)
-        dpkg-divert --package thailatex --add --rename \
+#         dpkg-divert --package thailatex --add --rename \
+#              --divert /usr/share/texmf/tex/generic/babel/babel.sty.real \
+# 	     /usr/share/texmf/tex/generic/babel/babel.sty
+    # remove old diversion
+         dpkg-divert --package thailatex  --remove --rename \
              --divert /usr/share/texmf/tex/generic/babel/babel.sty.real \
 	     /usr/share/texmf/tex/generic/babel/babel.sty
     ;;
diff -Nur thailatex-0.3.2.orig/fonts/Makefile.in thailatex-0.3.2/fonts/Makefile.in
--- thailatex-0.3.2.orig/fonts/Makefile.in	2004-03-25 08:00:20.000000000 +0100
+++ thailatex-0.3.2/fonts/Makefile.in	2005-12-23 19:28:57.000000000 +0100
@@ -290,7 +290,7 @@
 		install-dvipsconfigDATA install-tfmDATA \
 		install-type1DATA install-vfDATA
 	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+#	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-data: install-data-am
 
 install-am: all-am

Reply via email to