autoupdate

git-svn-id: svn://tug.org/texlive/trunk@30142 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 36 insertions, 18 deletions

diff --git a/Master/tlpkg/texlive.tlpdb b/Master/tlpkg/texlive.tlpdb
index 228d99f91ac..324544470cd 100644
--- a/Master/tlpkg/texlive.tlpdb
+++ b/Master/tlpkg/texlive.tlpdb
@@ -24,11 +24,11 @@ depend container_split_doc_files/1
 depend container_split_src_files/1
 depend minrelease/2013
 depend release/2013
-depend revision/30131
+depend revision/30141
 
 name 00texlive.image
 category TLCore
-revision 30111
+revision 30140
 shortdesc TeX Live files only in the source repository
 longdesc The files here are not copied by the installer and containers
 longdesc are not built for them; they exist only in the source
@@ -1780,6 +1780,7 @@ runfiles size=2588
  tlpkg/tlpsrc/nih.tlpsrc
  tlpkg/tlpsrc/nkarta.tlpsrc
  tlpkg/tlpsrc/nlctdoc.tlpsrc
+ tlpkg/tlpsrc/noconflict.tlpsrc
  tlpkg/tlpsrc/noitcrul.tlpsrc
  tlpkg/tlpsrc/nolbreaks.tlpsrc
  tlpkg/tlpsrc/nomencl.tlpsrc
@@ -2797,7 +2798,7 @@ depend opt_w32_multi_user:0
 
 name 00texlive.installer
 category TLCore
-revision 30054
+revision 30133
 shortdesc TeX Live standalone installer package
 longdesc This package defines the files to go into the installer
 longdesc archives (install-tl-unx.tar.gz, install-tl.zip) built by the
@@ -21045,7 +21046,7 @@ catalogue-version 2.2
 
 name bidi
 category Package
-revision 30108
+revision 30139
 shortdesc Support for bidirectional typesetting in plain TeX and LaTeX.
 longdesc A convenient interface for typesetting bidirectional texts with
 longdesc plain TeX and LaTeX. The package includes adaptations for use
@@ -37116,7 +37117,7 @@ depend tools
 
 name collection-latexextra
 category Collection
-revision 30109
+revision 30140
 shortdesc LaTeX supplementary packages
 longdesc A large collection of add-on packages for LaTeX.
 depend collection-latexrecommended
@@ -37659,6 +37660,7 @@ depend nicefilelist
 depend niceframe
 depend nicetext
 depend nlctdoc
+depend noconflict
 depend noitcrul
 depend nolbreaks
 depend nomencl
@@ -98319,20 +98321,20 @@ catalogue-version 1.09
 
 name luaotfload
 category Package
-revision 30026
+revision 30137
 shortdesc OpenType layout system for Plain TeX and LaTeX.
 longdesc The package adopts the TrueType/OpenType Font loader code
 longdesc provided in ConTeXt, and adapts it to use in Plain TeX and
 longdesc LaTeX.
 depend luaotfload.ARCH
-docfiles size=32
+docfiles size=28
  texmf-dist/doc/luatex/luaotfload/NEWS
  texmf-dist/doc/luatex/luaotfload/README details="Readme"
  texmf-dist/doc/luatex/luaotfload/luaotfload.pdf details="Package documentation"
 srcfiles size=12
  texmf-dist/source/luatex/luaotfload/Makefile
  texmf-dist/source/luatex/luaotfload/luaotfload.dtx
-runfiles size=122
+runfiles size=121
  texmf-dist/scripts/luaotfload/mkluatexfontdb.lua
  texmf-dist/tex/luatex/luaotfload/luaotfload.lua
  texmf-dist/tex/luatex/luaotfload/luaotfload.sty
@@ -98340,7 +98342,6 @@ runfiles size=122
  texmf-dist/tex/luatex/luaotfload/otfl-data-con.lua
  texmf-dist/tex/luatex/luaotfload/otfl-font-cid.lua
  texmf-dist/tex/luatex/luaotfload/otfl-font-clr.lua
- texmf-dist/tex/luatex/luaotfload/otfl-font-com.lua
  texmf-dist/tex/luatex/luaotfload/otfl-font-def.lua
  texmf-dist/tex/luatex/luaotfload/otfl-font-dum.lua
  texmf-dist/tex/luatex/luaotfload/otfl-font-ini.lua
@@ -102628,7 +102629,7 @@ catalogue-version 1.5
 
 name memdesign
 category Package
-revision 20237
+revision 30138
 shortdesc Notes on book design
 longdesc "A Few Notes on Book Design" provides an introduction to the
 longdesc business of book design. It is an extended version of what used
@@ -112817,6 +112818,23 @@ catalogue-date 2012-07-20 01:08:10 +0200
 catalogue-license lppl
 catalogue-version 1.02
 
+name noconflict
+category Package
+revision 30140
+shortdesc Resolve macro name conflict between packages.
+longdesc The package provides several commands to prefix (and hence
+longdesc obscure) a macro's (or a sequence of macros') name, and to
+longdesc restore the original macro(s) at places in a document where
+longdesc they are needed.
+docfiles size=1
+ texmf-dist/doc/latex/noconflict/README details="Readme"
+runfiles size=1
+ texmf-dist/tex/latex/noconflict/noconflict.sty
+catalogue-ctan /macros/latex/contrib/noconflict
+catalogue-date 2013-04-27 00:34:43 +0200
+catalogue-license lppl1.3
+catalogue-version 1.0
+
 name noitcrul
 category Package
 revision 15878
@@ -113431,7 +113449,7 @@ catalogue-version 1.39
 
 name oberdiek
 category Package
-revision 29803
+revision 30141
 shortdesc A bundle of packages submitted by Heiko Oberdiek.
 longdesc The bundle comprises packages to provide: - accsupp: better
 longdesc accessibility support for PDF files; - aliascnt: 'alias
@@ -148747,7 +148765,7 @@ catalogue-version 1.1
 
 name tetex
 category TLCore
-revision 30119
+revision 30135
 shortdesc scripts and files originally written for or included in teTeX
 longdesc teTeX was a comprehensive distribution of TeX, LaTeX and
 longdesc family, designed for ease of compilation, installation and
@@ -156379,7 +156397,7 @@ docfiles size=371
 
 name texlive-docindex
 category TLCore
-revision 30118
+revision 30133
 shortdesc top-level TeX Live doc.html, etc.
 longdesc These files are regenerated as needed, which is often, so we
 longdesc make them a separate package.  See the tl-update-auto script
@@ -156732,7 +156750,7 @@ docfiles size=230
 
 name texlive.infra
 category TLCore
-revision 30127
+revision 30133
 shortdesc basic TeX Live infrastructure
 longdesc This package contains the files needed to get the TeX Live
 longdesc tools (notably tlmgr) running: perl modules, xz binaries, plus
@@ -158082,7 +158100,7 @@ binfiles arch=x86_64-solaris size=44
 
 name texworks
 category TLCore
-revision 29774
+revision 30136
 shortdesc Cross-platform friendly front end.
 longdesc See http://tug.org/texworks for information and downloads. TeX
 longdesc Live includes executables only for Windows.
@@ -158094,7 +158112,7 @@ postaction fileassoc extension=.sty filetype=TL.TeXworks.edit
 postaction fileassoc extension=.cls filetype=TL.TeXworks.edit
 docfiles size=1
  texmf-dist/doc/texworks/README
-runfiles size=3743
+runfiles size=3745
  tlpkg/texworks/COPYING
  tlpkg/texworks/README.txt
  tlpkg/texworks/share/fonts/type1/gsfonts/README
@@ -158445,9 +158463,9 @@ runfiles size=3743
 
 name texworks.win32
 category TLCore
-revision 26438
+revision 30136
 shortdesc win32 files of texworks
-binfiles arch=win32 size=5380
+binfiles arch=win32 size=5440
  bin/win32/texworks.exe
  tlpkg/texworks/texworks.exe