r9940 - packages/trunk/freedoom/debian

[Jon Dowland]

Author: jmtd-guest
Date: 2009-07-02 17:14:52 +0000 (Thu, 02 Jul 2009)
New Revision: 9940

Modified:
   packages/trunk/freedoom/debian/changelog
   packages/trunk/freedoom/debian/control
Log:
update conflicts:

Modified: packages/trunk/freedoom/debian/changelog
===================================================================
--- packages/trunk/freedoom/debian/changelog	2009-07-02 16:54:47 UTC (rev 9939)
+++ packages/trunk/freedoom/debian/changelog	2009-07-02 17:14:52 UTC (rev 9940)
@@ -2,8 +2,10 @@
 
   * Bump debhelper dependency to match compat level
   * .desktop files reference "boom" not "doom"
+  * conflicts prboom that provides: boom-engine but does not
+    provide a /usr/games/boom alternative
 
- -- Jon Dowland <jon at alcopop.org>  Sun, 28 Jun 2009 16:17:09 +0100
+ -- Jon Dowland <jmtd at debian.org>  Thu, 02 Jul 2009 18:14:22 +0100
 
 freedoom (0.6.4-2) experimental; urgency=low
 

Modified: packages/trunk/freedoom/debian/control
===================================================================
--- packages/trunk/freedoom/debian/control	2009-07-02 16:54:47 UTC (rev 9939)
+++ packages/trunk/freedoom/debian/control	2009-07-02 17:14:52 UTC (rev 9940)
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Moritz Muehlenhoff <jmm at debian.org>, Jon Dowland <jon at alcopop.org>
+Uploaders: Moritz Muehlenhoff <jmm at debian.org>, Jon Dowland <jmtd at debian.org>
 Build-Depends: debhelper (>= 5), quilt
 Build-Depends-Indep: deutex, imagemagick, gsfonts, python (>= 2.4)
 Standards-Version: 3.8.2
@@ -15,7 +15,7 @@
 Architecture: all
 Depends: boom-engine
 Provides: boom-wad
-Conflicts: prboom (<< 2:2.4.7+dfsg-3)
+Conflicts: prboom (<< 2:2.5.0+dfsg1-5)
 Description: free game files for the 3D game DOOM
  Freedoom is a project to create a complete Doom II-compatible IWAD file
  which is Free Software.
@@ -32,7 +32,7 @@
 Architecture: all
 Depends: boom-engine
 Provides: boom-wad
-Conflicts: prboom (<< 2:2.4.7+dfsg-3)
+Conflicts: prboom (<< 2:2.5.0+dfsg1-5)
 Description: multiplayer-oriented maps for Doom
  Freedoom is a project to create a complete Doom II-compatible IWAD file
  which is Free Software.