summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-03-14 17:06:34 +0000
committerKarl Berry <karl@freefriends.org>2008-03-14 17:06:34 +0000
commit122f6092f44728c5308a3efb16830e6f1f255bc1 (patch)
treeb8be7c2ce6e67686f1ef5ca110b085d6b64bde1f
parentfa6b5eddacadba68e0ea025dbbe1ed578f4ef838 (diff)
symlink ppower4, merge in bin-ppower4 package
git-svn-id: svn://tug.org/texlive/trunk@6968 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tetex/ChangeLog2
-rw-r--r--Build/source/texk/tetex/Makefile.in1
-rw-r--r--Build/source/texk/texlive/ChangeLog6
-rw-r--r--Build/source/texk/texlive/Makefile.in2
-rwxr-xr-xBuild/source/texk/texlive/ppower427
-rw-r--r--Master/tlpkg/tlpsrc/bin-ppower4.tlpsrc12
-rw-r--r--Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc1
-rw-r--r--Master/tlpkg/tlpsrc/ppower4.tlpsrc2
8 files changed, 12 insertions, 41 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index a602b221433..ffcb8036d24 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,5 +1,7 @@
2008-03-14 Karl Berry <karl@tug.org>
+ * Makefile.in (LINKEDSCRIPTS): add ppower4, no longer in tetex.
+
* fmtutil: check for infinite loops.
From Stepan Kasal, http://bugzilla.redhat.com/show_bug.cgi?id=437008.
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index 0fb40c5d8f1..8d01d5623b3 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -25,6 +25,7 @@ LINKEDSCRIPTS = \
texmf/scripts/tetex/e2pall.pl \
texmf/scripts/tetex/texdoctk.pl \
texmf-dist/scripts/glossaries/makeglossaries \
+ texmf-dist/scripts/ppower4/ppower4 \
texmf-dist/scripts/perltex/perltex.pl \
texmf-dist/scripts/texcount/TeXcount.pl \
texmf-dist/scripts/thumbpdf/thumbpdf.pl \
diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog
index 13816cbd6f1..9d0b3319504 100644
--- a/Build/source/texk/texlive/ChangeLog
+++ b/Build/source/texk/texlive/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-14 Karl Berry <karl@tug.org>
+
+ * ppower4: remove.
+ * Makefile: don't install it. (Symlink installed in
+ tetex/Makefile.in instead.)
+
2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de>
* configure.in: added AC_CONFIG_HEADERS (moved
diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in
index 5c487a2cfad..94e062f020c 100644
--- a/Build/source/texk/texlive/Makefile.in
+++ b/Build/source/texk/texlive/Makefile.in
@@ -8,7 +8,7 @@ kpse_include ../make/programs.mk
LIVESCRIPTS = simpdftex \
ebong getnonfreefonts giftopng \
- pdfthumb ppower4 wordcount.sh \
+ pdfthumb wordcount.sh \
texlua-perl-runner
TEXLUARUNNERS = generate-updmap generate-language generate-fmtutil
diff --git a/Build/source/texk/texlive/ppower4 b/Build/source/texk/texlive/ppower4
deleted file mode 100755
index 77b9f61337f..00000000000
--- a/Build/source/texk/texlive/ppower4
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-#
-# PPower4 shell script file last update: 30oct05 (tl2005)
-#
-# minimal usage:
-# ppower4 input.pdf output.pdf
-#
-# Note: input.pdf and output.pdf must be different.
-#
-# It is assumed that you have at least Java 1.2.x installed
-# and can call it with the command java. Otherwise specify the
-# path for your Java runtime system.
-#
-# Modify this script such that jarfile contains the full path
-# of the pp4p.jar file.
-#
-# jarfile=/common/Java/lib/ppower4/pp4p.jar
-#
-# If you use a web2c distribution, you can place pp4p.jar
-# e.g. into the directory texmf/java/ppower4, run mktexlsr,
-# comment the assignment above and uncomment the assignment below.
-# Thanks to Reinhard Kotucha for contributing this suggestion.
-#
-jarfile=`kpsewhich -format=texmfscripts pp4p.jar`
-#
-#
-java -jar ${jarfile} "$@"
diff --git a/Master/tlpkg/tlpsrc/bin-ppower4.tlpsrc b/Master/tlpkg/tlpsrc/bin-ppower4.tlpsrc
deleted file mode 100644
index 273eb51dfe4..00000000000
--- a/Master/tlpkg/tlpsrc/bin-ppower4.tlpsrc
+++ /dev/null
@@ -1,12 +0,0 @@
-name bin-ppower4
-category TLCore
-runpattern f texmf/java/*
-runpattern f texmf/tex/latex/ppower4/*
-docpattern f texmf/doc/ppower4/*
-docpattern f texmf/doc/ppower4/demo/*
-docpattern f texmf/doc/ppower4/edemo/*
-docpattern f texmf/doc/ppower4/exampled/*
-docpattern f texmf/doc/ppower4/examplee/*
-docpattern f texmf/doc/ppower4/leveldemo/*
-binpattern f bin/${ARCH}/pdfthumb
-binpattern f bin/${ARCH}/ppower4
diff --git a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
index 41f4d2bba79..dfa6e14d644 100644
--- a/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-latexextra.tlpsrc
@@ -572,5 +572,4 @@ depend yafoot
depend yplan
depend zed-csp
depend ziffer
-depend bin-ppower4
depend collection-latex
diff --git a/Master/tlpkg/tlpsrc/ppower4.tlpsrc b/Master/tlpkg/tlpsrc/ppower4.tlpsrc
index d7a0442b58f..38ff32edf4c 100644
--- a/Master/tlpkg/tlpsrc/ppower4.tlpsrc
+++ b/Master/tlpkg/tlpsrc/ppower4.tlpsrc
@@ -1,2 +1,4 @@
name ppower4
category Package
+binpattern bin/${ARCH}/pdfthumb
+binpattern bin/${ARCH}/ppower4