[SCM] oomidi/master: Update changelog and control file.

[js at users.alioth.debian.org]

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

    Update changelog and control file.

diff --git a/debian/changelog b/debian/changelog
index daba653..5ca8331 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 oomidi (0.0+git20110329.1-1) unstable; urgency=low
 
-FIXME: clashes with muse: both include grepmidi.
 FIXME: Solve binary locating its shared libraries.
 
   * Initial release.
diff --git a/debian/control b/debian/control
index 3755486..cbc49b6 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Build-Depends: cdbs (>= 0.4.69~),
  dssi-dev,
  liblash-dev,
  context
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/oomidi
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/oomidi.git
 Homepage: http://www.openoctave.org/
@@ -24,6 +24,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