[SM-Commit] GIT changes to master grimoire by Florian Franzmann (3ef5335d91817d296510ce5c2f453b9e69e4c83c)

Florian Franzmann scm at sourcemage.org
Thu Jan 5 13:32:49 EST 2012


GIT changes to master grimoire by Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>:

 video-libs/libmpeg2/CONFLICTS |    3 ++-
 video-libs/libmpeg2/HISTORY   |    4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 3ef5335d91817d296510ce5c2f453b9e69e4c83c
Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>

    video-libs/libmpeg2: added conflict with electricsheep

diff --git a/video-libs/libmpeg2/CONFLICTS b/video-libs/libmpeg2/CONFLICTS
index 34f1450..7565348 100755
--- a/video-libs/libmpeg2/CONFLICTS
+++ b/video-libs/libmpeg2/CONFLICTS
@@ -1 +1,2 @@
-conflicts mpeg2dec y
+conflicts mpeg2dec      y &&
+conflicts electricsheep y
diff --git a/video-libs/libmpeg2/HISTORY b/video-libs/libmpeg2/HISTORY
index 4d5e140..529020c 100644
--- a/video-libs/libmpeg2/HISTORY
+++ b/video-libs/libmpeg2/HISTORY
@@ -1,3 +1,7 @@
+2012-01-05 Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
+	* CONFLICTS: added conflict with electricsheep since
+	  libmpeg2 as well as electricsheep install mpeg2.h
+
 2011-10-14 Bor Kraljič <pyrobor at ver.si>
 	* DETAILS: fixed long description wrap (scripted)
 


More information about the SM-Commit mailing list