The branch, 2.0.x, has been updated.
- Log -----------------------------------------------------------------
commit 9b9145432f58a192edc6585b825456fd8cccb58f
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Mon Oct 15 16:02:50 2012 +0200
Beamer provides [x]color (#8103)
diff --git a/lib/layouts/article-beamer.layout
b/lib/layouts/article-beamer.layout
index c879a49..34bb9e8 100644
--- a/lib/layouts/article-beamer.layout
+++ b/lib/layouts/article-beamer.layout
@@ -10,6 +10,8 @@ Input beamer.layout
# override settings inherited from beamer.layout (Paul Rubin <ru...@msu.edu>)
Provides geometry 0
Provides hyperref 0
+Provides color 0
+Provides xcolor 0
Preamble
\usepackage{beamerarticle,pgf}
diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index fdd7e70..28c5284 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -18,6 +18,8 @@ TocDepth 2
DefaultStyle Standard
Provides hyperref 1
Provides geometry 1
+Provides color 1
+Provides xcolor 1
DefaultFont
Family Sans
diff --git a/lib/layouts/scrarticle-beamer.layout
b/lib/layouts/scrarticle-beamer.layout
index e8463a0..5386ed5 100644
--- a/lib/layouts/scrarticle-beamer.layout
+++ b/lib/layouts/scrarticle-beamer.layout
@@ -10,6 +10,8 @@ Input beamer.layout
# override settings inherited from beamer.layout
Provides geometry 0
Provides hyperref 0
+Provides color 0
+Provides xcolor 0
Preamble
\usepackage{beamerarticle,pgf}
diff --git a/status.20x b/status.20x
index 42cf0d6..51b2a26 100644
--- a/status.20x
+++ b/status.20x
@@ -147,6 +147,9 @@ What's new
- Fix failure of lyxknitr.R to move files when /tmp was on a different
file system (e.g. an encrypted home partition).
+- Do not load the color or xcolor package with the beamer class, since
+ beamer already loads it itself (bug 8103).
+
- Do not suppress the loading of geometry and hyperref if the class
"article (koma + beamer)".
-----------------------------------------------------------------------
Summary of changes:
lib/layouts/article-beamer.layout | 2 ++
lib/layouts/beamer.layout | 2 ++
lib/layouts/scrarticle-beamer.layout | 2 ++
status.20x | 3 +++
4 files changed, 9 insertions(+), 0 deletions(-)
hooks/post-receive
--
The LyX Source Repository
