Source Mage code commit list

[Thomas Orgis <scm AT mail.sourcemage.org>]

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

 audio-players/mpg321/BUILD     |    5 +++++
 audio-players/mpg321/CONFLICTS |    1 +
 audio-players/mpg321/HISTORY   |    4 ++++
 3 files changed, 10 insertions(+)

New commits:
commit a08b73127c99cef950326048db5542c1e364b698
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

    make mpg321 conflict with mpg123 but omit the conflicting symlink for 
future

diff --git a/audio-players/mpg321/BUILD b/audio-players/mpg321/BUILD
new file mode 100755
index 0000000..053bb19
--- /dev/null
+++ b/audio-players/mpg321/BUILD
@@ -0,0 +1,5 @@
+message "Note that the mpg123 symlink is not created by the install 
anymore." &&
+message "That way the conflict of mpg123 and mpg321 can be lifted in 
future..." &&
+message "Feel free to create that symlink yourself if you really want it, 
though." &&
+OPTS="$OPTS --disable-mpg123-symlink" &&
+default_build
diff --git a/audio-players/mpg321/CONFLICTS b/audio-players/mpg321/CONFLICTS
new file mode 100755
index 0000000..a4dc34c
--- /dev/null
+++ b/audio-players/mpg321/CONFLICTS
@@ -0,0 +1 @@
+conflicts mpg123
diff --git a/audio-players/mpg321/HISTORY b/audio-players/mpg321/HISTORY
index 9e51149..63e3e0c 100644
--- a/audio-players/mpg321/HISTORY
+++ b/audio-players/mpg321/HISTORY
@@ -1,3 +1,7 @@
+2006-08-31 Thomas Orgis <sobukus AT sourcemage.org>
+       * BUILD, CONFLICTS: playing safe with mpg123 - conflict and
+         avoiding the mpg123 symlink for the future
+
 2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
        * DETAILS: (automated) Add KEYWORDS