summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-06-05 06:19:23 +0000
committerNorbert Preining <preining@logic.at>2008-06-05 06:19:23 +0000
commit2e8ad93896669345ef50f28b7219ff9acbb009c1 (patch)
tree85544bb371e4c36e65c774f037f3112987aaa97e /Master
parent1248e7b1d39209796917be27543b955c76b316f3 (diff)
merge texlive.infra and texlive.support into texlive.infra, there is no
need to have two packages always installed together anyway. git-svn-id: svn://tug.org/texlive/trunk@8578 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/tlpkg/tlpsrc/bin-texlive.tlpsrc2
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc12
-rw-r--r--Master/tlpkg/tlpsrc/texlive.support.tlpsrc15
3 files changed, 12 insertions, 17 deletions
diff --git a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
index c471ae5b86c..ec90e4149c9 100644
--- a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
@@ -2,8 +2,6 @@ name bin-texlive
category TLCore
shortdesc executables internal to TeX Live
depend texlive.infra
-# texlive.support ships the lzmadec, and for win32 tar, wget etc
-depend texlive.support
runpattern f texmf/fmtutil/fmtutil-hdr.cnf
runpattern f texmf/scripts/texlive/uninstall-win32.pl
runpattern f texmf/scripts/texlive/tlmgr.pl
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index 26665ca6e92..ed93018d27d 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -1,6 +1,18 @@
name texlive.infra
category TLCore
+shortdesc basic TeX Live infrastructure
+longdesc This package contains the most important files for getting the
+longdesc TeX Live tools (like tlmgr) running. That comprises the perl
+longdesc modules, documentation, and the lzma binaries (plus for win32
+longdesc tar and wget).
docpattern f tlpkg/man/*
docpattern f tlpkg/doc/*
docpattern f tlpkg/README
runpattern f tlpkg/TeXLive/*
+runpattern f tlpkg/installer/wgetrc
+binpattern f/win32 tlpkg/installer/tar.exe
+binpattern f/win32 tlpkg/installer/lzma/lzmadec.win32.exe
+binpattern f/win32 tlpkg/installer/wget.exe
+binpattern f/win32 tlpkg/installer/lzma/lzma.exe
+binpattern f tlpkg/installer/lzma/lzmadec.${ARCH}
+binpattern f tlpkg/installer/lzma/lzma.${ARCH}
diff --git a/Master/tlpkg/tlpsrc/texlive.support.tlpsrc b/Master/tlpkg/tlpsrc/texlive.support.tlpsrc
deleted file mode 100644
index 9b34e5b7151..00000000000
--- a/Master/tlpkg/tlpsrc/texlive.support.tlpsrc
+++ /dev/null
@@ -1,15 +0,0 @@
-name texlive.support
-category TLCore
-shortdesc Supporting binaries for TeX Live
-longdesc This package contains necessary binaries for the proper operation
-longdesc of some TeX Live components, currently the lzma binaries for all
-longdesc architectures, and additional binaries for win32 (tar, wget).
-depend texlive.infra
-# package installer
-runpattern f tlpkg/installer/wgetrc
-binpattern f/win32 tlpkg/installer/tar.exe
-binpattern f/win32 tlpkg/installer/lzma/lzmadec.win32.exe
-binpattern f/win32 tlpkg/installer/wget.exe
-binpattern f/win32 tlpkg/installer/lzma/lzma.exe
-binpattern f tlpkg/installer/lzma/lzmadec.${ARCH}
-binpattern f tlpkg/installer/lzma/lzma.${ARCH}