r10007 - packages/trunk/chocolate-doom/debian

[Jon Dowland]

Author: jmtd
Date: 2009-07-11 11:42:29 +0000 (Sat, 11 Jul 2009)
New Revision: 10007

Modified:
   packages/trunk/chocolate-doom/debian/changelog
   packages/trunk/chocolate-doom/debian/control
Log:
adjust conflicts: so it is versioned

Modified: packages/trunk/chocolate-doom/debian/changelog
===================================================================
--- packages/trunk/chocolate-doom/debian/changelog	2009-07-11 11:35:35 UTC (rev 10006)
+++ packages/trunk/chocolate-doom/debian/changelog	2009-07-11 11:42:29 UTC (rev 10007)
@@ -5,8 +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.
+  * Conflict with freedoom and freedm prior to 0.6.4-4, which
+    installed an alternative for doom2.wad. chocolate-doom
+    cannot be used in conjunction with freedoom.
 
- -- Jon Dowland <jmtd at debian.org>  Fri, 03 Jul 2009 19:48:31 +0100
+ -- Jon Dowland <jmtd at debian.org>  Sat, 11 Jul 2009 12:43:59 +0100

Modified: packages/trunk/chocolate-doom/debian/control
===================================================================
--- packages/trunk/chocolate-doom/debian/control	2009-07-11 11:35:35 UTC (rev 10006)
+++ packages/trunk/chocolate-doom/debian/control	2009-07-11 11:42:29 UTC (rev 10007)
@@ -13,7 +13,7 @@
 Package: chocolate-doom
 Architecture: any
 Depends: ${shlibs:Depends}, doom-wad
-Conflicts: freedoom, freedm
+Conflicts: freedoom (<< 0.6.4-4), freedm (<< 0.6.4-4)
 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