[SCM] Debian packaging of texlive-bin) branch, master, updated. upstream/2012.20120628-18-g8823373
The following commit has been merged in the master branch:
commit 2e1f326d94a6f047d92307e82a95ef46b02101fd
Author: Norbert Preining <preining@debian.org>
Date: Tue Nov 20 13:15:37 2012 +0900
another updated to real 20121120 sources
diff --git a/texk/texlive/linked_scripts/Makefile.am b/texk/texlive/linked_scripts/Makefile.am
index b5fbd71..86a3f9d 100644
--- a/texk/texlive/linked_scripts/Makefile.am
+++ b/texk/texlive/linked_scripts/Makefile.am
@@ -38,14 +38,18 @@ installdirs-local:
#
## We distinguish several classes of scripts according to their
## destination in texmf/scripts/ or texmf-dist/scripts/ and their
-## type: `shell', `context', or `other'. On Unix systems a symlink
-## from $(bindir) to the script is installed for all of them;
-## on Windows nothing is installed in $(bindir) for `shell' scripts
-## whereas for `other' (usually perl, lua, ...) scripts the standard
-## wrapper ../w32_wrapper/runscript.exe is installed or the ConTeXt
-## wrapper ../w32_wrapper/context/mtxrun.exe for `context' scripts.
-## Note that some /bin/sh scripts are listed as `other' or `context'
+## type: `shell', `context', or `other'.
+##
+## On Unix systems a symlink from $(bindir) to the script is installed
+## for all of them; on Windows nothing is installed in $(bindir) for
+## `shell' scripts whereas for `other' (usually perl, lua, ...) scripts
+## the standard wrapper ../w32_wrapper/runscript.exe is installed or the
+## ConTeXt wrapper ../w32_wrapper/context/mtxrun.exe for `context'
+## scripts.
+##
+## Some /bin/sh scripts are listed as `other' or `context'
## scripts because they are correctly handled by the wrapper binaries.
+##
texmf_scriptsdir = $(datarootdir)/texmf/scripts
texmf_shell_scripts = \
tetex/fmtutil.sh \
@@ -149,6 +153,7 @@ texmf_dist_other_scripts = \
perltex/perltex.pl \
pkfix/pkfix.pl \
pkfix-helper/pkfix-helper \
+ pmx/pmx2pdf.lua \
pst2pdf/pst2pdf \
purifyeps/purifyeps \
splitindex/perl/splitindex.pl \
diff --git a/utils/pmx/pmx2pdf.lua b/texk/texlive/linked_scripts/pmx/pmx2pdf.lua
similarity index 95%
copy from utils/pmx/pmx2pdf.lua
copy to texk/texlive/linked_scripts/pmx/pmx2pdf.lua
index 3779084..5d257cf 100755
--- a/utils/pmx/pmx2pdf.lua
+++ b/texk/texlive/linked_scripts/pmx/pmx2pdf.lua
@@ -27,6 +27,7 @@ VERSION = "0.2.1"
--[[
ChangeLog:
+
version 0.2.1 2012-05-15 RDT
renamed to avoid possible name clashes
@@ -119,9 +120,9 @@ repeat
err = tonumber(linebuf)
pmxaerr:close()
if ( err == 0 ) and
- ((tex == "") or os.execute(tex .. " " .. filename) == 0) and
- ((tex == "") or os.execute(musixflx .. " " .. filename) == 0) and
- ((tex == "") or os.execute(tex .. " " .. filename) == 0) and
+ (tex == "" or os.execute(tex .. " " .. filename) == 0) and
+ (tex == "" or os.execute(musixflx .. " " .. filename) == 0) and
+ (tex == "" or os.execute(tex .. " " .. filename) == 0) and
((tex ~= "latex" and tex ~= "pdflatex")
or (os.execute(tex .. " " .. filename) == 0)) and
(dvi == "" or (os.execute(dvi .. " " .. filename) == 0)) and
--
Debian packaging of texlive-bin)
Reply to: