[SCM] musescore/master: B-D change not even necessary; report it to get rid of it later

[tg at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ffcab63842b9abca8cbeb394397d2cae73dce965
Author: mirabilos <tg at debian.org>
Date:   Sat Aug 5 03:09:10 2017 +0200

    B-D change not even necessary; report it to get rid of it later

diff --git a/debian/control b/debian/control
index e8e7498..7b963b9 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Toby Smithe <tsmithe at ubuntu.com>,
            Tiago Bortoletto Vaz <tiago at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               libasound2-dev (>= 1.0.6) | liboss4-salsa-dev,
+               libasound2-dev,
                libfreetype6-dev (>= 2.5.2),
                libjack-dev,
                libmp3lame-dev,
diff --git a/debian/patches/01-oss-salsa.patch b/debian/patches/01-oss-salsa.patch
index a86b660..c2ad999 100644
--- a/debian/patches/01-oss-salsa.patch
+++ b/debian/patches/01-oss-salsa.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/mscore/mididriver.cpp
 +++ b/mscore/mididriver.cpp
-@@ -101,6 +101,26 @@ bool Port::operator<(const Port& p) cons
+@@ -101,6 +101,28 @@ bool Port::operator<(const Port& p) cons
  #include "alsa.h"
  #include "alsamidi.h"
  
@@ -17,7 +17,9 @@ Forwarded: not-needed
 +// use, in Debian, the latter’s includes); one hackish way is
 +// to use the reported library version as salsa still reports
 +// version 1.0.5 whereas ALSA is much newer. Just inline the
-+// function if the ALSA version is too old.
++// function if the ALSA version is too old (this may also catch
++// on Linux, but even wheezy has 1.0.25, so we don’t care).
++// This is now https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=870787
 +#if (SND_LIB_MAJOR < 2) && (SND_LIB_MINOR < 1) && (SND_LIB_SUBMINOR < 6)
 +#define snd_seq_event_length(ev) __extension__({		\
 +	ssize_t snd_seq_event_length__len;			\
@@ -32,7 +34,7 @@ Forwarded: not-needed
  namespace Ms {
  static const unsigned int inCap  = SND_SEQ_PORT_CAP_SUBS_READ;
  static const unsigned int outCap = SND_SEQ_PORT_CAP_SUBS_WRITE;
-@@ -532,11 +552,11 @@ void AlsaMidiDriver::write(const Event&
+@@ -532,11 +554,11 @@ void AlsaMidiDriver::write(const Event&
  
  bool AlsaMidiDriver::putEvent(snd_seq_event_t* event)
        {
@@ -46,7 +48,7 @@ Forwarded: not-needed
              if (error == len) {
                    return false;
                    }
-@@ -551,7 +571,7 @@ bool AlsaMidiDriver::putEvent(snd_seq_ev
+@@ -551,7 +573,7 @@ bool AlsaMidiDriver::putEvent(snd_seq_ev
                          }
                    }
              else

-- 
musescore packaging