r9952 - packages/trunk/chocolate-doom/debian

[Jon Dowland]

Author: jmtd-guest
Date: 2009-07-02 19:30:00 +0000 (Thu, 02 Jul 2009)
New Revision: 9952

Modified:
   packages/trunk/chocolate-doom/debian/changelog
   packages/trunk/chocolate-doom/debian/control
Log:
conflicts: freedoom,freedm

Modified: packages/trunk/chocolate-doom/debian/changelog
===================================================================
--- packages/trunk/chocolate-doom/debian/changelog	2009-07-02 19:29:50 UTC (rev 9951)
+++ packages/trunk/chocolate-doom/debian/changelog	2009-07-02 19:30:00 UTC (rev 9952)
@@ -5,5 +5,8 @@
       Thanks to Cyril Brulebois, Barry deFreese, Miriam Ruiz,
       Ansgar Burchardt and Linas Žvirblis for their work on
       it during this time!
+  * Conflict with freedoom and freedm. They install doom2.wad
+    alternatives that we cannot use. I hope to resolve this in
+    the near future so that these packages can co-exist.
 
- -- Jon Dowland <jmtd at debian.org>  Thu, 02 Jul 2009 18:47:45 +0100
+ -- Jon Dowland <jmtd at debian.org>  Thu, 02 Jul 2009 20:30:59 +0100

Modified: packages/trunk/chocolate-doom/debian/control
===================================================================
--- packages/trunk/chocolate-doom/debian/control	2009-07-02 19:29:50 UTC (rev 9951)
+++ packages/trunk/chocolate-doom/debian/control	2009-07-02 19:30:00 UTC (rev 9952)
@@ -13,6 +13,7 @@
 Package: chocolate-doom
 Architecture: any
 Depends: ${shlibs:Depends}, doom-wad
+Conflicts: freedoom, freedm
 Description: Doom engine closely-compatible with vanilla doom
  Chocolate doom is a modern, cross-platform doom engine with
  the major design goal of emulating the behaviour of vanilla