[SCM] oomidi/master: Conflicts muse: both include grepmidi.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0c86f2ea5fce964126bbee835fa15da52eb21417
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Apr 12 19:32:28 2011 +0200

    Conflicts muse: both include grepmidi.

diff --git a/debian/control.in b/debian/control.in
index 0a9ea29..61af163 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,6 +12,7 @@ Homepage: http://www.openoctave.org/
 Package: oomidi
 Architecture: all
 Depends: ${misc:Depends}
+Conflicts: muse
 Description: MIDI/Audio sequencer with recording and editing capabilities
  Open Octave Midi and Audio Editor (OOMidi or OOM2) is a fork of MusE
  (Muse Sequencer)...

-- 
oom packaging