[arch-commits] Commit in texlive-core/repos (3 files)

[François Charette]

    Date: Monday, September 15, 2008 @ 14:44:42
  Author: francois
Revision: 12601

Merged revisions 12506-12600 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/texlive-core/trunk

........
  r12600 | francois | 2008-09-15 20:44:24 +0200 (Mon, 15 Sep 2008) | 2 lines
  
  upgpkg: texlive-core 2008.10548-2
      re-added missing ruhyphen and ukrhyph; improved install scriptlet
........

Modified:
  texlive-core/repos/extra-i686/	(properties)
  texlive-core/repos/extra-i686/PKGBUILD
  texlive-core/repos/extra-i686/texlive.install

-----------------+
 PKGBUILD        |    4 ++--
 texlive.install |   16 +++++++++-------
 2 files changed, 11 insertions(+), 9 deletions(-)


Property changes on: texlive-core/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /texlive-core/trunk:1-12505
   + /texlive-core/trunk:1-12600

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-09-15 18:44:24 UTC (rev 12600)
+++ extra-i686/PKGBUILD	2008-09-15 18:44:42 UTC (rev 12601)
@@ -2,7 +2,7 @@
 
 pkgname=texlive-core
 pkgver=2008.10548
-pkgrel=1
+pkgrel=2
 pkgdesc="TeX Live core distribution"
 license=('GPL')
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@
 source=("http://dev.archlinux.org/~francois/texlive/src/$pkgname-src.zip")
 install=texlive.install
 backup=(usr/share/texmf-config/tex/context/config/cont-usr.tex)
-md5sums=('c78476fdcf8ee51e9ec5ccec43d8136e')
+md5sums=('265c9b2f3c5a9257e5fc1acb352723dd')
 
 build() {
    cd $startdir/src

Modified: extra-i686/texlive.install
===================================================================
--- extra-i686/texlive.install	2008-09-15 18:44:24 UTC (rev 12600)
+++ extra-i686/texlive.install	2008-09-15 18:44:42 UTC (rev 12601)
@@ -60,7 +60,7 @@
 	echo    " texlive: creating all formats ..."
 	fmtutil-sys --all 1>/dev/null
 	echo " done." 
-	echo "  (logs are under /usr/share/texmf-var/<engine>/<formatname>.log)"
+	echo "  (logs are under /usr/share/texmf-var/web2c/<engine>/<formatname>.log)"
 	echo "  ------------------------------------------------------------------"
 	echo "                   Welcome to TeXLive 2008!                        "
 	echo ""
@@ -75,7 +75,7 @@
 	# TODO 
 	updmapfile="/usr/share/texmf-config/web2c/updmap.cfg"
 	if [[ ! -f $updmapfile ]]; then
-		echo " WARNING: Can't find /usr/share/texmf-config/web2c/updmap.cfg !"
+		echo " WARNING: Can't find $updmapfile !"
 	else
 		noofmaps=`grep -c -e ^Map $updmapfile`
 		noofmixedmaps=`grep -c -e ^MixedMap $updmapfile`
@@ -83,7 +83,7 @@
 		if [[ $totalmaps == 0 ]] ; then
 			pre_install 
 		else
-			echo " NB: The file $updmap has not been changed"
+			echo " NB: The file $updmapfile has not been changed"
 		fi
 	fi
 }
@@ -91,10 +91,12 @@
 post_upgrade() {
 	echo    " texlive: updating the filename database..."
 	texconfig-sys rehash
-	echo    " texlive: updating the fontmap files with updmap..."
-	updmap-sys --quiet --nohash
-	echo    " done." 
-	echo    "    (see /usr/share/texmf-var/web2c/updmap.log)"
+	if [[ $totalmaps == 0 ]] ; then
+		echo    " texlive: updating the fontmap files with updmap..."
+		updmap-sys --quiet --nohash
+		echo    " done." 
+		echo    "    (see /usr/share/texmf-var/web2c/updmap.log)"
+	fi
 	nooffmt=`find /usr/share/texmf-var/web2c/ -name '*.fmt' | wc -w`
 	if [[ $nooffmt == 0 ]]; then
 		echo    " texlive: creating all formats ..."