7 files changed, 27 insertions, 10 deletions
diff --git a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
index a6e94bab75f..87162ffaa7c 100644
--- a/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
+++ b/Master/texmf-dist/doc/latex/moderncv/CHANGELOG
@@ -1,8 +1,16 @@
+version 0.10 (13 June 2010)
+  - fixed a compatibility issue with the natbib package (natbib uses \section*
+  to format the bibliography title, while only \section was defined by moderncv),
+  as reported on launchpad (bug #393920).
+  - fixed a compatibility issues with (any package relying on) the etoolbox package,
+  due to the double definition of \AtEndPreamble, as reported by D. Becker.
+
 version 0.9 (31 May 2010)
   - added support for the itemize, enumerate and description environments.
 
 version 0.8 (24 May 2010)
-  - added support for multibib.
+  - added support for multibib. Also modified the template to illustrate how to show
+  labels in the bibliography, as requested by Tom D. R. and Stefan K.
   - added a command to indicate your personal homepage (\homepage{url}), as
   requested by J. de Jong and A. Pairet.
   - corrected an alignment bug for text following a \quote with no immediate
@@ -13,7 +21,8 @@ version 0.8 (24 May 2010)
   as reported by M. Bana.
   - corrected the missplacement of pdf bookmarks as noticed by L. Fortunato.
   - corrected several bugs linked to the code for checking for empty arguments in
-  \cventry, as reported by B. Ekran, L. Păncescu and E. Gregorio.
+  \cventry, as reported by B. Ekran (launchpad bug #268768), L. Păncescu and
+  E. Gregorio.
 
 version 0.7 (17 June 2008)
   - corrected an outstanding spacing bug (space between cvlines longer
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/letter.tex b/Master/texmf-dist/doc/latex/moderncv/examples/letter.tex
index a4aa825cbc2..50e87475426 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/letter.tex
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/letter.tex
@@ -1,4 +1,4 @@
-%% start of file `template_en.tex'.
+%% start of file `letter.tex'.
 %% Copyright 2006-2010 Xavier Danaux (xdanaux@gmail.com).
 %
 % This work may be distributed and/or modified under the
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf
index 5c376ae89cb..52489604e5e 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template.pdf
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf
index 9244d437d85..80a0c1d0d3d 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_casual_orange.pdf
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf
index 64d4811c1ba..1d5d2121866 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_classic_green.pdf
diff --git a/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf b/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf
index e1cda007c20..2d2136101ca 100644
--- a/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf
+++ b/Master/texmf-dist/doc/latex/moderncv/examples/template_multibib.pdf
diff --git a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
index 28101252ecd..816527c82e2 100644
--- a/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
+++ b/Master/texmf-dist/tex/latex/moderncv/moderncv.cls
@@ -83,12 +83,12 @@
 %-------------------------------------------------------------------------------
 %                required packages
 %-------------------------------------------------------------------------------
-% \AtEndPreamble hook (could load package etoolbox instead of defining it)
-%\RequirePackage{etoolbox}
-\let\@endpreamblehook\@empty
-\def\AtEndPreamble{\g@addto@macro\@endpreamblehook}
-\let\moderncv@document\document
-\def\document{\endgroup\@endpreamblehook\begingroup\moderncv@document}
+% \AtEndPreamble hook (loading tetoolbox instead of defining the macro, as to avoid incompatibilities with etoolbox (and packages relying on it) defining the macro too)
+\RequirePackage{etoolbox}
+%\let\@endpreamblehook\@empty
+%\def\AtEndPreamble{\g@addto@macro\@endpreamblehook}
+%\let\moderncv@document\document
+%\def\document{\endgroup\@endpreamblehook\begingroup\moderncv@document}
 
 % if... then... else... constructs
 \RequirePackage{ifthen}
@@ -165,7 +165,7 @@
   \RequirePackage[dvips]{graphicx}\fi
 
 % headers and footers
-\usepackage{fancyhdr}
+\RequirePackage{fancyhdr}
 \fancypagestyle{plain}{
   \renewcommand{\headrulewidth}{0pt}
   \renewcommand{\footrulewidth}{0pt}
@@ -329,6 +329,14 @@
   \hspace{\separatorcolumnwidth}%
   \parbox[m]{\maincolumnwidth}{\sectionstyle{#1}}\\[1ex]}
 %  \cvline[1ex]{\color{sectionrectanglecolor}\rule[0]{\hintscolumnwidth}{1ex}}{\sectionstyle{#1}}}% gives bad alignment of rectangle; too bad m{width} columns seem not to work as a valid column definition for tabular environments
+% starred variant, which is identical but defined to allow its use (e.g. for natbib compatibility, who uses \section*{} for the bibliography header)
+\AtEndPreamble{%
+  \@ifpackageloaded{natbib}
+    {
+      \RequirePackage{suffix}
+      \WithSuffix\newcommand\section*{\section}
+    }{}
+}
 
 % usage: \subsection{title}
 \newcommand*{\subsection}[1]{%