diff -u xmame-0.106/debian/control xmame-0.106/debian/control --- xmame-0.106/debian/control +++ xmame-0.106/debian/control @@ -35,6 +35,7 @@ Architecture: any Depends: ${shlibs:Depends} Recommends: xmame-common (>= ${source:Version}) +Conflicts: sdlmame-tools Description: Tools for xmame and xmess Various tools distributed with the xmame sources. . diff -u xmame-0.106/debian/changelog xmame-0.106/debian/changelog --- xmame-0.106/debian/changelog +++ xmame-0.106/debian/changelog @@ -1,3 +1,10 @@ +xmame (0.106-3.1ubuntu2) jaunty; urgency=low + + * Add xmame-tools conflict with sdlmame-tools since both ship chdman + (LP: #363676) + + -- Brian Murray Sun, 19 Apr 2009 17:06:27 -0700 + xmame (0.106-3.1ubuntu1) jaunty; urgency=low * Merge from debian unstable (LP: #nnn), Ubuntu remaining changes: