biber (29mar11)

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

20 files changed, 7 insertions, 6 deletions

diff --git a/Build/source/utils/biber/bin/amd64-freebsd/biber b/Build/source/utils/biber/bin/amd64-freebsd/biber
index 950f7277306..219c31d1e72 100755
--- a/Build/source/utils/biber/bin/amd64-freebsd/biber
+++ b/Build/source/utils/biber/bin/amd64-freebsd/biber
diff --git a/Build/source/utils/biber/bin/i386-cygwin/biber.exe b/Build/source/utils/biber/bin/i386-cygwin/biber.exe
index d3046749dc6..77a44072be4 100755
--- a/Build/source/utils/biber/bin/i386-cygwin/biber.exe
+++ b/Build/source/utils/biber/bin/i386-cygwin/biber.exe
diff --git a/Build/source/utils/biber/bin/i386-freebsd/biber b/Build/source/utils/biber/bin/i386-freebsd/biber
index da0226a7829..d5fb20b1219 100755
--- a/Build/source/utils/biber/bin/i386-freebsd/biber
+++ b/Build/source/utils/biber/bin/i386-freebsd/biber
diff --git a/Build/source/utils/biber/bin/i386-linux/biber b/Build/source/utils/biber/bin/i386-linux/biber
index 39b2b2bb3d6..62691d9902b 100755
--- a/Build/source/utils/biber/bin/i386-linux/biber
+++ b/Build/source/utils/biber/bin/i386-linux/biber
diff --git a/Build/source/utils/biber/bin/universal-darwin/biber b/Build/source/utils/biber/bin/universal-darwin/biber
index 1d75171736b..b0ba8873d3e 100755
--- a/Build/source/utils/biber/bin/universal-darwin/biber
+++ b/Build/source/utils/biber/bin/universal-darwin/biber
diff --git a/Build/source/utils/biber/bin/win32/biber.exe b/Build/source/utils/biber/bin/win32/biber.exe
index 5d46d4d458f..24e9f8f096d 100755
--- a/Build/source/utils/biber/bin/win32/biber.exe
+++ b/Build/source/utils/biber/bin/win32/biber.exe
diff --git a/Build/source/utils/biber/bin/x86_64-darwin/biber b/Build/source/utils/biber/bin/x86_64-darwin/biber
index 278ae1616c8..a67525a946b 100755
--- a/Build/source/utils/biber/bin/x86_64-darwin/biber
+++ b/Build/source/utils/biber/bin/x86_64-darwin/biber
diff --git a/Build/source/utils/biber/bin/x86_64-linux/biber b/Build/source/utils/biber/bin/x86_64-linux/biber
index d630d258976..add9840b0ce 100755
--- a/Build/source/utils/biber/bin/x86_64-linux/biber
+++ b/Build/source/utils/biber/bin/x86_64-linux/biber
diff --git a/Master/bin/amd64-freebsd/biber b/Master/bin/amd64-freebsd/biber
index 950f7277306..219c31d1e72 100755
--- a/Master/bin/amd64-freebsd/biber
+++ b/Master/bin/amd64-freebsd/biber
diff --git a/Master/bin/i386-cygwin/biber.exe b/Master/bin/i386-cygwin/biber.exe
index d3046749dc6..77a44072be4 100755
--- a/Master/bin/i386-cygwin/biber.exe
+++ b/Master/bin/i386-cygwin/biber.exe
diff --git a/Master/bin/i386-freebsd/biber b/Master/bin/i386-freebsd/biber
index da0226a7829..d5fb20b1219 100755
--- a/Master/bin/i386-freebsd/biber
+++ b/Master/bin/i386-freebsd/biber
diff --git a/Master/bin/i386-linux/biber b/Master/bin/i386-linux/biber
index 39b2b2bb3d6..62691d9902b 100755
--- a/Master/bin/i386-linux/biber
+++ b/Master/bin/i386-linux/biber
diff --git a/Master/bin/universal-darwin/biber b/Master/bin/universal-darwin/biber
index 1d75171736b..b0ba8873d3e 100755
--- a/Master/bin/universal-darwin/biber
+++ b/Master/bin/universal-darwin/biber
diff --git a/Master/bin/win32/biber.exe b/Master/bin/win32/biber.exe
index 5d46d4d458f..24e9f8f096d 100755
--- a/Master/bin/win32/biber.exe
+++ b/Master/bin/win32/biber.exe
diff --git a/Master/bin/x86_64-darwin/biber b/Master/bin/x86_64-darwin/biber
index 278ae1616c8..a67525a946b 100755
--- a/Master/bin/x86_64-darwin/biber
+++ b/Master/bin/x86_64-darwin/biber
diff --git a/Master/bin/x86_64-linux/biber b/Master/bin/x86_64-linux/biber
index d630d258976..add9840b0ce 100755
--- a/Master/bin/x86_64-linux/biber
+++ b/Master/bin/x86_64-linux/biber
diff --git a/Master/texmf-dist/doc/bibtex/biber/biber.pdf b/Master/texmf-dist/doc/bibtex/biber/biber.pdf
index 64999d66923..165a4fb023c 100644
--- a/Master/texmf-dist/doc/bibtex/biber/biber.pdf
+++ b/Master/texmf-dist/doc/bibtex/biber/biber.pdf
diff --git a/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz b/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz
index 81beec7a107..900384a42cd 100644
--- a/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz
+++ b/Master/texmf-dist/source/bibtex/biber/biblatex-biber.tar.gz
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 4e98608fa69..a3cda786b03 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -35,7 +35,7 @@ my @TLP_working = qw(
     alg algorithm2e algorithmicx algorithms allrunes alnumsec alterqcm
     altfont ametsoc amsaddr amscls amsfonts amslatex-primer
     amsldoc-it amsldoc-vn
-    amsmath amsrefs amstex amsthdoc-it 
+    amsmath amsmath-it amsrefs amstex amsthdoc-it 
     animate anonchap antt answers ANUfinalexam anyfontsize anysize
     aomart apa apa6e apacite apalike2 appendix apprends-latex
     ar arabi arabtex arabxetex archaic arcs arev
@@ -142,7 +142,8 @@ my @TLP_working = qw(
     expdlist expl3 export expressg extarrows exteps
     extpfeil extract extsizes
   facsimile faktor
-    fancybox fancyhdr fancynum fancypar fancyref fancytooltips fancyvrb
+    fancybox fancyhdr fancyhdr-it fancynum fancypar
+    fancyref fancytooltips fancyvrb
     FAQ-en fbithesis fbs featpost fenixpar
     feyn feynmf fge fig4latex figbas figbib figflow figsize
     filecontents filehook fileinfo filemod
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index a361032e69e..90eaa15c671 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -4171,8 +4171,8 @@ sub POSTbiber {
   );
 
   # handle the prebuilt binaries, which are zipped or tarred.
-  for my $archive (sort (<biber[-.]*>)) {
-    next if $archive =~ /biber-solaris|freebsd[68]\./;  # we only want freebsd7
+  for my $archive (sort (<biber-*>)) {
+    next if $archive =~ /freebsd[68]\./;  # we only want freebsd7
 
     my $unarchiver = &unarchiver ($archive);
     &SYSTEM ("$unarchiver $archive");
@@ -4185,7 +4185,7 @@ sub POSTbiber {
     # Put the executable in both the
     # (a) Master bin directory and
     # (b) Build source directory.
-    (my $biber_platform = $archive) =~ s/biber[-.](.*?)\..*/$1/;
+    (my $biber_platform = $archive) =~ s/biber-(.*?)\..*/$1/;
     my $tl_platform = $tl_platform{$biber_platform};
     die "unknown biber platform $biber_platform, goodbye" if ! $tl_platform;
 
@@ -4199,7 +4199,7 @@ sub POSTbiber {
     &SYSTEM ("$MV $biber_binary $bindir/"); # bindir should already exist    
   }
 
-  # don't keep binary archive around in Master tree.
+  # don't keep binary archives around in Master tree.
   &SYSTEM ("$RM biber[-.]*");
 }