[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 fc46e634306dbf5240a124fbbc6a3d35f40849c5
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sat Jun 8 17:43:30 2013 +0100

    Applied upstream: http://hg.libsdl.org/SDL_mixer/rev/23d69b6621d0

diff --git a/debian/patches/02_hurd.patch b/debian/patches/02_hurd.patch
deleted file mode 100644
index 9564677..0000000
--- a/debian/patches/02_hurd.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: Fix FTBFS on Hurd
- Introduced in 1.2.6-3 (Tue, 31 Jul 2007 14:16:36 +0200).
-Author: Samuel Thibault <samuel.thibault at ens-lyon.org>
-Last-Update: 2012-01-20
-Bug-Debian: http://bugs.debian.org/428892
---- a/music_cmd.c
-+++ b/music_cmd.c
-@@ -53,10 +53,8 @@
- 		Mix_SetError("Out of memory");
- 		return(NULL);
- 	}
--	strncpy(music->file, file, (sizeof music->file)-1);
--	music->file[(sizeof music->file)-1] = '\0';
--	strncpy(music->cmd, cmd, (sizeof music->cmd)-1);
--	music->cmd[(sizeof music->cmd)-1] = '\0';
-+	music->file = strdup(file);
-+	music->cmd = strdup(cmd);
- 	music->pid = 0;
- 
- 	/* We're done */
-@@ -155,7 +153,7 @@
- 
- 	    /* Child process - executes here */
- 	    case 0: {
--		    char command[PATH_MAX];
-+		    char *command;
- 		    char **argv;
- 
- 		    /* Unblock signals in case we're called from a thread */
-@@ -166,11 +164,12 @@
- 		    }
- 
- 		    /* Execute the command */
--		    strcpy(command, music->cmd);
-+		    command = strdup(music->cmd);
- 		    argv = parse_args(command, music->file);
- 		    if ( argv != NULL ) {
- 			execvp(argv[0], argv);
- 		    }
-+		    SDL_free(command);
- 
- 		    /* exec() failed */
- 		    perror(argv[0]);
-@@ -219,6 +218,8 @@
- /* Close the given music stream */
- void MusicCMD_FreeSong(MusicCMD *music)
- {
-+	SDL_free(music->file);
-+	SDL_free(music->cmd);
- 	SDL_free(music);
- }
- 
---- a/music_cmd.h
-+++ b/music_cmd.h
-@@ -30,8 +30,8 @@
- # include <linux/limits.h>
- #endif
- typedef struct {
--	char file[PATH_MAX];
--	char cmd[PATH_MAX];
-+	char *file;
-+	char *cmd;
- 	pid_t pid;
- } MusicCMD;
- 
diff --git a/debian/patches/series b/debian/patches/series
index 1b94542..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +0,0 @@
-# review for libsdl2-mixer (SDL2), some must have been incorporated upstream or
-# were backports in the first place
-#
-# 02_hurd.patch

-- 
Debian packaging of SDL2_mixer