oberdiek update (11feb10)

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

2 files changed, 8 insertions, 7 deletions

diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
index 0435e58b0ab..27721ad5b31 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf-base.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2001, 2006-2009 by
+%% Copyright (C) 2001, 2006-2010 by
 %%    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %% 
 %% This work may be distributed and/or modified under the
@@ -90,7 +90,7 @@
   \fi
 \expandafter\x\csname ver@epstopdf-base.sty\endcsname
 \ProvidesPackage{epstopdf-base}%
-  [2009/10/17 v2.4 Base part for package epstopdf]
+  [2010/02/09 v2.5 Base part for package epstopdf]
 \begingroup
   \catcode123 1 % {
   \catcode125 2 % }
@@ -144,7 +144,7 @@
   \ifx\Gin@driver\x
   \else
     \@PackageWarningNoLine{epstopdf}{%
-      Other drivers than `pdftex.def' are not supported%
+      Drivers other than `pdftex.def' are not supported%
     }%
     \endgroup
     \newcommand*{\epstopdfsetup}[1]{}%
@@ -296,7 +296,7 @@
     \expandafter\fi\if`#1\relax\else
   }%
 }
-\def\Gin@setfile#1#2#3{%
+\def\ETE@Gin@setfile#1#2#3{%
   \ifETE@disable
     \ETE@OrgGin@setfile{#1}{#2}{#3}%
   \else
@@ -392,6 +392,7 @@
     \fi
   \fi
 }
+\let\Gin@setfile\ETE@Gin@setfile
 \def\ETE@GenerateName#1#2{%
   #1\ETE@suffix#2%
 }
diff --git a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
index 6717fd341a0..40fdf757eef 100644
--- a/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
+++ b/Master/texmf-dist/tex/latex/oberdiek/epstopdf.sty
@@ -8,7 +8,7 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright (C) 2001, 2006-2009 by
+%% Copyright (C) 2001, 2006-2010 by
 %%    Heiko Oberdiek <oberdiek@uni-freiburg.de>
 %% 
 %% This work may be distributed and/or modified under the
@@ -90,7 +90,7 @@
   \fi
 \expandafter\x\csname ver@epstopdf.sty\endcsname
 \ProvidesPackage{epstopdf}%
-  [2009/10/17 v2.4 Conversion with epstopdf on the fly (HO)]
+  [2010/02/09 v2.5 Conversion with epstopdf on the fly (HO)]
 \begingroup
   \catcode123 1 % {
   \catcode125 2 % }
@@ -118,7 +118,7 @@
 \TMP@EnsureCode{45}{12}% -
 \TMP@EnsureCode{47}{12}% /
 \let\ETE@SavedAtEnd\ETE@AtEnd
-\RequirePackage{epstopdf-base}[2009/10/17]
+\RequirePackage{epstopdf-base}[2010/02/09]
 \let\ETE@AtEnd\ETE@SavedAtEnd
 \DeclareOption*{%
   \expandafter\epstopdfsetup\expandafter{\CurrentOption}%