3 files changed, 37 insertions, 40 deletions
diff --git a/Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc b/Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc
deleted file mode 100644
index 2d1396f4489..00000000000
--- a/Master/tlpkg/tlpsrc/bin-texinfo.tlpsrc
+++ /dev/null
@@ -1,39 +0,0 @@
-name bin-texinfo
-category TLCore
-depend bin-kpathsea
-runpattern f texmf/perl/texi2html.pl
-docpattern f texmf/doc/info/fontname.info
-docpattern f texmf/doc/info/info-stnd.info
-docpattern f texmf/doc/info/info.info
-docpattern f texmf/doc/info/manual.info
-docpattern f texmf/doc/info/texdraw.info
-docpattern f texmf/doc/info/texi*.info
-docpattern f texmf/doc/man/man1/info.1
-docpattern f texmf/doc/man/man1/info.1.html
-docpattern f texmf/doc/man/man1/infokey.1
-docpattern f texmf/doc/man/man1/install-info.1
-docpattern f texmf/doc/man/man1/install-info.1.html
-docpattern f texmf/doc/man/man1/makeinfo.1
-docpattern f texmf/doc/man/man1/makeinfo.1.html
-docpattern f texmf/doc/man/man1/texi2dvi.1
-docpattern f texmf/doc/man/man1/texi2dvi.1.html
-docpattern f texmf/doc/man/man1/texi2html.1
-docpattern f texmf/doc/man/man1/texi2html.1.html
-docpattern f texmf/doc/man/man1/texi2pdf.1
-docpattern f texmf/doc/man/man1/texi2pdf.1.html
-docpattern f texmf/doc/man/man1/texindex.1
-docpattern f texmf/doc/man/man1/texindex.1.html
-docpattern f texmf/doc/man/man5/info.5
-docpattern f texmf/doc/man/man5/info.5.html
-docpattern f texmf/doc/man/man5/texinfo.5
-docpattern f texmf/doc/man/man5/texinfo.5.html
-docpattern f texmf/doc/texi2html/*
-docpattern f texmf/doc/texinfo/*
-binpattern f bin/${ARCH}/info
-binpattern f bin/${ARCH}/infokey
-binpattern f bin/${ARCH}/install-info
-binpattern f bin/${ARCH}/makeinfo
-binpattern f bin/${ARCH}/texi2dvi
-binpattern f bin/${ARCH}/texi2html
-binpattern f bin/${ARCH}/texi2pdf
-binpattern f bin/${ARCH}/texindex
diff --git a/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc b/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
index 3dbf191f2db..738e9d8a1e3 100644
--- a/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
+++ b/Master/tlpkg/tlpsrc/collection-texinfo.tlpsrc
@@ -3,5 +3,4 @@ category Collection
 shortdesc GNU Texinfo
 longdesc Programs and macros for the GNU Texinfo documentation system.
 depend texinfo
-depend bin-texinfo
 depend collection-basic
diff --git a/Master/tlpkg/tlpsrc/texinfo.tlpsrc b/Master/tlpkg/tlpsrc/texinfo.tlpsrc
index 9182ebee4c1..32688f138f6 100644
--- a/Master/tlpkg/tlpsrc/texinfo.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texinfo.tlpsrc
@@ -1,2 +1,39 @@
 name texinfo
 category Package
+depend bin-kpathsea
+docpattern f texmf/doc/info/fontname.info
+docpattern f texmf/doc/info/info-stnd.info
+docpattern f texmf/doc/info/info.info
+docpattern f texmf/doc/info/manual.info
+docpattern f texmf/doc/info/texdraw.info
+docpattern f texmf/doc/info/texi*.info
+docpattern f texmf/doc/man/man1/info.1
+docpattern f texmf/doc/man/man1/info.1.html
+docpattern f texmf/doc/man/man1/infokey.1
+docpattern f texmf/doc/man/man1/install-info.1
+docpattern f texmf/doc/man/man1/install-info.1.html
+docpattern f texmf/doc/man/man1/makeinfo.1
+docpattern f texmf/doc/man/man1/makeinfo.1.html
+docpattern f texmf/doc/man/man1/texi2dvi.1
+docpattern f texmf/doc/man/man1/texi2dvi.1.html
+docpattern f texmf/doc/man/man1/texi2html.1
+docpattern f texmf/doc/man/man1/texi2html.1.html
+docpattern f texmf/doc/man/man1/texi2pdf.1
+docpattern f texmf/doc/man/man1/texi2pdf.1.html
+docpattern f texmf/doc/man/man1/texindex.1
+docpattern f texmf/doc/man/man1/texindex.1.html
+docpattern f texmf/doc/man/man5/info.5
+docpattern f texmf/doc/man/man5/info.5.html
+docpattern f texmf/doc/man/man5/texinfo.5
+docpattern f texmf/doc/man/man5/texinfo.5.html
+docpattern f texmf/doc/texi2html/*
+docpattern f texmf/doc/texinfo/*
+binpattern f bin/${ARCH}/info
+binpattern f bin/${ARCH}/infokey
+binpattern f bin/${ARCH}/install-info
+binpattern f bin/${ARCH}/makeinfo
+binpattern f bin/${ARCH}/pdftexi2dvi
+binpattern f bin/${ARCH}/texi2dvi
+binpattern f bin/${ARCH}/texi2html
+binpattern f bin/${ARCH}/texi2pdf
+binpattern f bin/${ARCH}/texindex