[Pkg-sdl-commits] [SCM] Debian packaging of SDL2_mixer branch, master, updated. debian/2.0.0_rc1-1-6-g1969aab

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 3ddccdfe26c65383bb06960c5b311d2fc0d6b43f
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sat Jun 8 17:40:36 2013 +0100

    Was backported from upstream, now included: http://hg.libsdl.org/SDL_mixer/rev/2d713670db9b

diff --git a/debian/patches/bug-688369-double_free_crash.patch b/debian/patches/bug-688369-double_free_crash.patch
deleted file mode 100644
index 1293af7..0000000
--- a/debian/patches/bug-688369-double_free_crash.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix crash on double free if loading WAV file failed
- Backported from upstream:
-  # HG changeset patch
-  # User Sam Lantinga <slouken at libsdl.org>
-  # Date 1329087437 18000
-  # Node ID 2d713670db9b832b0c5aa700824900bc1fc3c3cd
-  # Parent  df72f22b4b411ad4b08f924329678aabd5ac97d6
-  Fixed 1418 - crash on double free if loading WAV file failed
-Author: Sam Lantinga <slouken at libsdl.org>
-Last-Update: 2012-09-23
-Bug-Debian: http://bugs.debian.org/688369
-
-diff -r df72f22b4b41 -r 2d713670db9b mixer.c
---- a/mixer.c	Mon Jan 30 21:41:45 2012 -0500
-+++ b/mixer.c	Sun Feb 12 17:57:17 2012 -0500
-@@ -610,13 +610,15 @@
- 			break;
- 		default:
- 			SDL_SetError("Unrecognized sound file type");
--			return(0);			
-+			if ( freesrc ) {
-+				SDL_RWclose(src);
-+			}
-+			loaded = NULL;
-+			break;
- 	}
- 	if ( !loaded ) {
-+		/* The individual loaders have closed src if needed */
- 		SDL_free(chunk);
--		if ( freesrc ) {
--			SDL_RWclose(src);
--		}
- 		return(NULL);
- 	}
- 
-
diff --git a/debian/patches/series b/debian/patches/series
index 34922ea..1b94542 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 # were backports in the first place
 #
 # 02_hurd.patch
-# bug-688369-double_free_crash.patch

-- 
Debian packaging of SDL2_mixer