[subversion-commit] SVN tetex commit + diffs: r117 - in tex-common/trunk: conf/texmf.d debian doc

[Frank Küster]

Author: frank
Date: 2005-08-05 08:18:07 +0000 (Fri, 05 Aug 2005)
New Revision: 117

Modified:
   tex-common/trunk/conf/texmf.d/95NonPath.cnf
   tex-common/trunk/debian/changelog
   tex-common/trunk/debian/control
   tex-common/trunk/debian/postinst.functions
   tex-common/trunk/doc/Makefile
Log:
* Refine the updmap transition code (actuall still not properly working)
* Increase hyph_size to 10000, to make the inclusion of current
  hyphenation exception files (e.g. dehyphtex.tex) possible
* Also build a pdf version of the Policy draft, and Build-Depend on
  tetex-bin.


Modified: tex-common/trunk/conf/texmf.d/95NonPath.cnf
===================================================================
--- tex-common/trunk/conf/texmf.d/95NonPath.cnf	2005-08-04 16:52:39 UTC (rev 116)
+++ tex-common/trunk/conf/texmf.d/95NonPath.cnf	2005-08-05 08:18:07 UTC (rev 117)
@@ -137,7 +137,7 @@
 % handled within a tenth of this size.
 buf_size = 200000
 
-hyph_size = 1000        % number of hyphenation exceptions, >610 and <32767.
+hyph_size = 10000       % number of hyphenation exceptions, >610 and <32767.
 nest_size = 500		% simultaneous semantic levels (e.g., groups)
 max_in_open = 15	% simultaneous input files and error insertions
 param_size = 5000	% simultaneous macro parameters

Modified: tex-common/trunk/debian/changelog
===================================================================
--- tex-common/trunk/debian/changelog	2005-08-04 16:52:39 UTC (rev 116)
+++ tex-common/trunk/debian/changelog	2005-08-05 08:18:07 UTC (rev 117)
@@ -1,3 +1,13 @@
+tex-common (0.5.1) unstable; urgency=low
+
+  * Refine the updmap transition code
+  * Increase hyph_size to 10000, to make the inclusion of current
+    hyphenation exception files (e.g. dehyphtex.tex) possible
+  * Also build a pdf version of the Policy draft, and Build-Depend on
+    tetex-bin.
+
+ -- Frank Küster <frank at debian.org>  Thu,  4 Aug 2005 12:02:16 +0200
+
 tex-common (0.5) unstable; urgency=low
 
   * Merge update-fmtutil into update-fontlang  (closes: #319651)

Modified: tex-common/trunk/debian/control
===================================================================
--- tex-common/trunk/debian/control	2005-08-04 16:52:39 UTC (rev 116)
+++ tex-common/trunk/debian/control	2005-08-05 08:18:07 UTC (rev 117)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: teTeX maintainers <debian-tetex-maint at lists.debian.org>
 Uploaders: Julian Gilbey <jdg at debian.org>, C.M. Connelly <cmc at debian.org>, Atsuhito KOHDA <kohda at debian.org>, Frank Küster <frank at debian.org>
-Build-Depends: debhelper (>= 4.0.0), debiandoc-sgml, eperl
+Build-Depends: debhelper (>= 4.0.0), debiandoc-sgml, eperl, tetex-bin
 Build-Depends-Indep: debiandoc-sgml
 Standards-Version: 3.6.1
 

Modified: tex-common/trunk/debian/postinst.functions
===================================================================
--- tex-common/trunk/debian/postinst.functions	2005-08-04 16:52:39 UTC (rev 116)
+++ tex-common/trunk/debian/postinst.functions	2005-08-05 08:18:07 UTC (rev 117)
@@ -22,20 +22,37 @@
 }
 
 updmap_extract(){
-  # we extract the settings from an existing 00updmap.cfg that belong to us
-  # to the new version.  If the settings are unchanged from tetex-base's defaults 
+  # we extract the settings from an existing 00updmap.cfg that belonged to
+  # tetex-base.  If the settings are unchanged from tetex-base's defaults 
   # (2.0.2), ucf will know the md5sum and make the changes 2.0.2->3.0
   # 
   # The file itself is stored, so that tetex-base can also extract its settings.
   conffile=/etc/texmf/updmap.d/00updmap.cfg
   dfltfile=/usr/share/tex-common/00updmap.cfg
-  keepfile=/etc/texmf/updmap.d/00updmap.cfg_keep-for-tetex-base
+  keepfile=/etc/texmf/updmap.d/10tetex-base.cfg.postinst-old
+  tetex_base_file=/etc/texmf/updmap.d/10tetex-base.cfg
+  oldmd5sum="82884281d955998e22141cf67b45209d"
   options="dvipsPreferOutline pdftexDownloadBase14 dvipdfmDownloadBase14 dvipsDownloadBase35 LW35"
 
   # is no old version installed?
   test ! -f "$conffile" && return 0 || true
-  test -f $keepfile || cp $conffile $keepfile
+  
+  # is it changed?
+  if [ ! "$oldmd5sum" = "`md5sum $conffile | cut -d ' ' -f 1`" ]; then
+    # changed, stow away a copy for tetex-base
+    if [ ! -f $keepfile ]; then
+      cat > $keepfile <<EOF
+This file contains the parts of what was called 00updmap.cfg in 
+teTeX-2.0.2 that now are handled by tetex-base in 10tetex-base.cfg
 
+If you have local changes, please transfer them manually
+
+EOF
+      sed -e '0,/^# Map files should be marked by/ d; 1,/^$/ d' \
+	$conffile >> $keepfile
+    fi
+  fi
+
   # get the new defaults
   for option in $options; do
     eval dflt_$option=`cfgval $dfltfile $option`
@@ -61,10 +78,11 @@
   done
   if [ "$SETTING_CHANGED" = "true" ]; then
     mv $tempfile1 $conffile
+    # this mv command will give a "conffile changed by you or a script" message next time
+    # we change it - but that is exactly what has happened: The user has changed options, 
+    # and the script has just transferred them to a new file.
   fi
-  # the true is needed, because the last command likely was the failed [ above!
-  true; rm -rf "$tempdir"
-  return 0
+  rm -rf "$tempdir"
 }
 
 #################################################################

Modified: tex-common/trunk/doc/Makefile
===================================================================
--- tex-common/trunk/doc/Makefile	2005-08-04 16:52:39 UTC (rev 116)
+++ tex-common/trunk/doc/Makefile	2005-08-05 08:18:07 UTC (rev 117)
@@ -2,7 +2,7 @@
 
 CLEANFILES=Debian-TeX-Policy.txt Debian-TeX-Policy.pdf Debian-TeX-Policy.html Debian-TeX-Policy.tpt 
 
-all: policy-txt policy-html
+all: policy-txt policy-html policy-pdf
 
 policy-txt: Debian-TeX-Policy.sgml  version.ent
 	debiandoc2text Debian-TeX-Policy.sgml