[Pkg-sdl-commits] [libsdl2-mixer] 06/11: d/patches: remove fix-750706-upstream-8ef083375857.patch, backported from upstream

[Manuel A. Fernandez Montecelo]

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

mafm pushed a commit to branch master
in repository libsdl2-mixer.

commit 3709a5c1d25297dd888563b6435f505d30df86a1
Author: Manuel A. Fernandez Montecelo <mafm at debian.org>
Date:   Tue Jan 26 16:13:59 2016 +0000

    d/patches: remove fix-750706-upstream-8ef083375857.patch, backported from upstream
---
 debian/changelog                                   |  2 ++
 .../patches/fix-750706-upstream-8ef083375857.patch | 35 ----------------------
 2 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7a17648..8b47aa3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ libsdl2-mixer (2.0.1+dfsg1-1) UNRELEASED; urgency=medium
   * New upstream release
   * d/examples/Makefile: link against SDL2_mixer.  Thanks Riku Saikkonen.
     (Closes: #774717)
+  * d/patches:
+    - Remove fix-750706-upstream-8ef083375857.patch, backported from upstream
 
  -- Manuel A. Fernandez Montecelo <mafm at debian.org>  Tue, 26 Jan 2016 16:08:39 +0000
 
diff --git a/debian/patches/fix-750706-upstream-8ef083375857.patch b/debian/patches/fix-750706-upstream-8ef083375857.patch
deleted file mode 100644
index 6781c49..0000000
--- a/debian/patches/fix-750706-upstream-8ef083375857.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Sam Lantinga <slouken at libsdl.org>
-# Date 1383514401 28800
-# Node ID 8ef0833758572b84317ba19cc5a1eb2719552da3
-# Parent  c166c70fc52a33324945156318ad7454a366eb30
-Fixed bug 2140 - Track is played back with the wrong tempo
-
-ny00
-
-It seems like the test against MAXCHAN can safely be relocated after the check if (meep->event.type==ME_TEMPO), with no risk of memory corruption, at least in this function.
-
-diff -r c166c70fc52a -r 8ef083375857 timidity/readmidi.c
---- a/timidity/readmidi.c	Sun Nov 03 11:31:19 2013 -0800
-+++ b/timidity/readmidi.c	Sun Nov 03 13:33:21 2013 -0800
-@@ -673,15 +673,15 @@
- 		meep->event.time, meep->event.channel + 1,
- 		meep->event.type, meep->event.a, meep->event.b);
- 
--      if (meep->event.channel >= MAXCHAN)
--	skip_this_event=1;
--      else if (meep->event.type==ME_TEMPO)
-+      if (meep->event.type==ME_TEMPO)
- 	{
- 	  tempo=
- 	    meep->event.channel + meep->event.b * 256 + meep->event.a * 65536;
- 	  compute_sample_increment(tempo, divisions);
- 	  skip_this_event=1;
- 	}
-+      else if (meep->event.channel >= MAXCHAN)
-+	skip_this_event=1;
-       else if ((quietchannels & (1<<meep->event.channel)))
- 	skip_this_event=1;
-       else switch (meep->event.type)
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sdl/packages/libsdl2-mixer.git