Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (ed80e642b80999822cad12ec73e3859b2ad2cd55)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (ed80e642b80999822cad12ec73e3859b2ad2cd55)
  • Date: Tue, 29 Sep 2009 00:49:46 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

latex/texlive-texmf/CONFLICTS | 2 +-
latex/texlive-texmf/HISTORY | 4 ++++
latex/texlive/CONFLICTS | 2 +-
latex/texlive/HISTORY | 4 ++++
4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit ed80e642b80999822cad12ec73e3859b2ad2cd55
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

texlive-texmf: conflict -> conflicts and add auto-conflict for packages

commit 0e6b506bf130f96ead0f640adca8627cb6590fd3
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

texlive: conflict -> conflicts and add auto-conflict for packages

diff --git a/latex/texlive-texmf/CONFLICTS b/latex/texlive-texmf/CONFLICTS
index 5db0c93..2515409 100755
--- a/latex/texlive-texmf/CONFLICTS
+++ b/latex/texlive-texmf/CONFLICTS
@@ -4,5 +4,5 @@ for conflicts in cd musixlyr musixtex \
latex-beamer pgf xcolor koma-script \
ifxetex europecv psfig jadetex \
unicode tetex tetex-texmf ; do
-conflict $conflicts
+conflicts $conflicts y
done
diff --git a/latex/texlive-texmf/HISTORY b/latex/texlive-texmf/HISTORY
index 2f2a999..9888d44 100644
--- a/latex/texlive-texmf/HISTORY
+++ b/latex/texlive-texmf/HISTORY
@@ -1,3 +1,7 @@
+2009-09-28 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: conflict -> conflicts
+ Auto-conflict with old packages
+
2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* CONFLICTS: hopefully everything is now there

diff --git a/latex/texlive/CONFLICTS b/latex/texlive/CONFLICTS
index 5db0c93..2515409 100755
--- a/latex/texlive/CONFLICTS
+++ b/latex/texlive/CONFLICTS
@@ -4,5 +4,5 @@ for conflicts in cd musixlyr musixtex \
latex-beamer pgf xcolor koma-script \
ifxetex europecv psfig jadetex \
unicode tetex tetex-texmf ; do
-conflict $conflicts
+conflicts $conflicts y
done
diff --git a/latex/texlive/HISTORY b/latex/texlive/HISTORY
index 26b727c..ce098b0 100644
--- a/latex/texlive/HISTORY
+++ b/latex/texlive/HISTORY
@@ -1,3 +1,7 @@
+2009-09-28 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: conflict -> conflicts
+ Auto-conflict with old packages
+
2009-09-24 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
* CONFLICTS: added from texlive-texmf, second sync




  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (ed80e642b80999822cad12ec73e3859b2ad2cd55), Eric Sandall, 09/29/2009

Archive powered by MHonArc 2.6.24.

Top of Page