[SCM] collaborative maintenance of the dopewars package branch, master, updated. debian/1.5.12-10-3-g01a9b5a

[Francois Marier]

The following commit has been merged in the master branch:
commit bb42e8d6556fb6afd2cd727fed9338d38a2f257a
Author: Francois Marier <francois at debian.org>
Date:   Wed Dec 22 15:59:48 2010 +1300

    Remove old conflicts on suidmanager
    
    * Remove old conflicts on suidmanager
    * Replace Conflicts/Replaces with Breaks/Replaces (lintian notice)

diff --git a/debian/changelog b/debian/changelog
index 9e21032..f579159 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
 dopewars (1.5.12-11) unstable; urgency=low
 
+  * Remove old conflicts on suidmanager
+  * Replace Conflicts/Replaces with Breaks/Replaces (lintian notice)
   * Bump Standards-Version up to 3.9.1
   * Bump debhelper compatibility to 8
 
- -- Francois Marier <francois at debian.org>  Wed, 22 Dec 2010 15:54:51 +1300
+ -- Francois Marier <francois at debian.org>  Wed, 22 Dec 2010 15:59:02 +1300
 
 dopewars (1.5.12-10) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 5e33a9a..3048b52 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Package: dopewars
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, dopewars-data (= ${source:Version})
 Recommends: pulseaudio-esound-compat | esound
-Conflicts: suidmanager (<< 0.50)
 Description: drug-dealing game set in streets of New York City
  UNIX rewrite of the MS-DOS program of the same name, which in turn was
  inspired by John E. Dell's "Drug Wars" game. You have one month to buy and
@@ -26,7 +25,7 @@ Package: dopewars-data
 Architecture: all
 Depends: ${misc:Depends}
 Replaces: dopewars (<< 1.5.12-4)
-Conflicts: suidmanager (<< 0.50), dopewars (<< 1.5.12-4)
+Breaks: dopewars (<< 1.5.12-4)
 Description: drug-dealing game set in streets of New York City - data files
  UNIX rewrite of the MS-DOS program of the same name, which in turn was
  inspired by John E. Dell's "Drug Wars" game. You have one month to buy and

-- 
collaborative maintenance of the dopewars package