[mupen64plus] 18/262: Don't conflict with unrelated packages

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch master
in repository mupen64plus.

commit f4d656f73667cb5734bd108e46958fa7c56c048f
Author: Sven Eckelmann <sven.eckelmann at gmx.de>
Date:   Mon Jun 1 12:53:25 2009 +0200

    Don't conflict with unrelated packages
---
 debian/changelog | 1 +
 debian/control   | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 264ae6b..be25f56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ mupen64plus (1.5-2) UNRELEASED; urgency=low
   * Add debian/watch
   * Use dh_prep instead of dh_clean -k in debian/rules
   * Move git repository to git.debian.org
+  * Don't conflict with unrelated packages
 
  -- Sven Eckelmann <sven.eckelmann at gmx.de>  Mon, 01 Jun 2009 12:27:41 +0200
 
diff --git a/debian/control b/debian/control
index e043a67..798f794 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,6 @@ XS-Autobuild: true
 Package: mupen64plus
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: mupen64, mupen64-bin
-Replaces: mupen64, mupen64-bin
 Description: Multi Platform Emulator for the N64
  N64 Emulator for Linux - GTK 2.0 GUI
  .

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus.git