[Pkg-sdl-commits] [SCM] Debian packaging of SDL_mixer project branch, master, updated. debian/1.2.11-7-9-g6c0b401

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 0ac712547bde67bb2f69515b6c74182c819f910a
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Fri Jan 20 16:14:05 2012 +0000

    GPL version of Native MIDI removed upstream

diff --git a/debian/rules b/debian/rules
index 4d8092d..739050d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,11 +18,9 @@ confflags += --enable-music-mod
 confflags += --disable-music-mp3
 confflags += --enable-music-mp3-mad-gpl
 
-# MIDI: use GPL code for the native MIDI player, explicitly state that we use
-# (an in-source copy of) timidity
+# Explicitly state what we use
 confflags += --enable-music-timidity-midi
-confflags += --disable-music-native-midi
-confflags += --enable-music-native-midi-gpl
+confflags += --enable-music-native-midi
 
 # mafm 20111203: removed the "disable shared" support from previous versions, I
 # couldn't find any reason for it in the changelog

-- 
Debian packaging of SDL_mixer project