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

    Applied upstream: http://hg.libsdl.org/SDL_mixer/rev/280e18696f64

diff --git a/debian/patches/01_no_lvorbis_logg.patch b/debian/patches/01_no_lvorbis_logg.patch
deleted file mode 100644
index 22507dd..0000000
--- a/debian/patches/01_no_lvorbis_logg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Do not uselessly link with -lvorbis -logg.
- Introduced in 1.2.8-4 (Wed, 21 May 2008 11:54:21 +0000).
- .
- Not linked with a bug report.
-Author: Sam Hocevar <sam at zoy.org>
-Last-Update: 2012-01-20
-
---- a/configure.in
-+++ b/configure.in
-@@ -457,7 +457,7 @@
-                 echo "-- dynamic libvorbisidec -> $ogg_lib"
-                 EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
-             else
--                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec -lvorbis -logg"
-+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec -lvorbis"
-             fi
-         else
-             AC_MSG_WARN([*** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)])
-@@ -487,7 +487,7 @@
-                 echo "-- dynamic libvorbisfile -> $ogg_lib"
-                 EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
-             else
--                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg"
-+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis"
-             fi
-         else
-             AC_MSG_WARN([*** Unable to find Ogg Vorbis library (http://www.xiph.org/)])
diff --git a/debian/patches/series b/debian/patches/series
index a02a785..34922ea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # review for libsdl2-mixer (SDL2), some must have been incorporated upstream or
 # were backports in the first place
 #
-# 01_no_lvorbis_logg.patch
 # 02_hurd.patch
 # bug-688369-double_free_crash.patch

-- 
Debian packaging of SDL2_mixer