[subversion-commit] SVN tetex-bin commit + diffs: r1481 - tetex-bin/trunk/debian

[Frank Küster]

Author: frank
Date: 2006-07-06 18:22:41 +0000 (Thu, 06 Jul 2006)
New Revision: 1481

Modified:
   tetex-bin/trunk/debian/changelog
   tetex-bin/trunk/debian/control
   tetex-bin/trunk/debian/postinst.functions
   tetex-bin/trunk/debian/tetex-bin_install.in
Log:
 * Fix stupid error in the postinst script, thanks to Martin Pitt
   <martin.pitt at ubuntu.com> (closes: #376117) [frank]
 * Fix dangling symlink of mfw.base, thanks to Ian Zimmerman
   <nobrowser at gmail.com> (closes: #377093) [frank]
 * Remove tetex-base from Build-Depends.  Yes, it's actually not needed!
   It is probably there because the upstream README says that the texmf
   tarball must be unpacked first; but this is because upstream creates
   the formats with "make install".  Funny that nobody ever noticed this
   for years... [frank]


Modified: tetex-bin/trunk/debian/changelog
===================================================================
--- tetex-bin/trunk/debian/changelog	2006-07-04 17:00:02 UTC (rev 1480)
+++ tetex-bin/trunk/debian/changelog	2006-07-06 18:22:41 UTC (rev 1481)
@@ -1,3 +1,17 @@
+tetex-bin (3.0-17.1) UNRELEASED; urgency=low
+
+  * Fix stupid error in the postinst script, thanks to Martin Pitt
+    <martin.pitt at ubuntu.com> (closes: #376117) [frank]
+  * Fix dangling symlink of mfw.base, thanks to Ian Zimmerman
+    <nobrowser at gmail.com> (closes: #377093) [frank]
+  * Remove tetex-base from Build-Depends.  Yes, it's actually not needed!
+    It is probably there because the upstream README says that the texmf
+    tarball must be unpacked first; but this is because upstream creates
+    the formats with "make install".  Funny that nobody ever noticed this
+    for years... [frank]
+
+ -- Frank Küster <frank at debian.org>  Thu,  6 Jul 2006 20:21:32 +0200
+
 tetex-bin (3.0-17) unstable; urgency=medium
 
   * Do not link statically against the included libgd, instead use the one

Modified: tetex-bin/trunk/debian/control
===================================================================
--- tetex-bin/trunk/debian/control	2006-07-04 17:00:02 UTC (rev 1480)
+++ tetex-bin/trunk/debian/control	2006-07-06 18:22:41 UTC (rev 1481)
@@ -4,7 +4,7 @@
 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>, Florent Rougon <frn at debian.org>
 Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.1.16), ed, libpng12-dev, zlib1g-dev, libxaw7-dev, flex, bison, tetex-base (>= 2.95), libt1-dev (>= 5.0.0-3), po-debconf, autotools-dev, libpaper-dev, texinfo, eperl, debiandoc-sgml, quilt, libpoppler-dev, libjpeg62-dev | libjpeg-dev, libgd2-xpm-dev
+Build-Depends: debhelper (>= 4.1.16), ed, libpng12-dev, zlib1g-dev, libxaw7-dev, flex, bison, libt1-dev (>= 5.0.0-3), po-debconf, autotools-dev, libpaper-dev, texinfo, eperl, debiandoc-sgml, quilt, libpoppler-dev, libjpeg62-dev | libjpeg-dev, libgd2-xpm-dev
 
 Package: tetex-bin
 Priority: optional

Modified: tetex-bin/trunk/debian/postinst.functions
===================================================================
--- tetex-bin/trunk/debian/postinst.functions	2006-07-04 17:00:02 UTC (rev 1480)
+++ tetex-bin/trunk/debian/postinst.functions	2006-07-06 18:22:41 UTC (rev 1481)
@@ -76,7 +76,7 @@
 my (\$found, \$written) = (0,0);
 while (<MYFILE>){
 print;
-if (! \$found && /^%%% From file: /etc/texmf/texmf.d/05TeXMF.cnf/){\$found=1}
+if (! \$found && m!^%%% From file: /etc/texmf/texmf.d/05TeXMF.cnf!){\$found=1}
 if (\$found && ! \$written && /^\$/){
 \$written=1;
 print qq(\$insertedtext);

Modified: tetex-bin/trunk/debian/tetex-bin_install.in
===================================================================
--- tetex-bin/trunk/debian/tetex-bin_install.in	2006-07-04 17:00:02 UTC (rev 1480)
+++ tetex-bin/trunk/debian/tetex-bin_install.in	2006-07-06 18:22:41 UTC (rev 1481)
@@ -8,7 +8,8 @@
 # assign static variables
 package=<:=$PACKAGE:>
 sharedir=debian/$package/usr/share
-txmfvardir=debian/$package/var/lib/texmf
+vardir=/var/lib/texmf
+txmfvardir=debian/$package$vardir
 txmfdir=$sharedir/texmf-tetex
 txmfmaindir=$sharedir/texmf
 etcdir=/etc/texmf
@@ -66,7 +67,7 @@
     ;;
   --format-links)
     if [ $ACTION = install ]; then
-      ln -sf mf.base $txmfdir/web2c/mfw.base
+      ln -sf $vardir/mf.base $txmfdir/web2c/mfw.base
       mv debian/$package/usr/bin/mf debian/$package/usr/bin/mfw
       ln -sf mfw debian/$package/usr/bin/mf
       ln -sf $main_engine debian/$package/usr/bin/amstex