[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.2 branch, master, updated. debian/1.2.15-1

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit 0dd2a8450396bfa7ad15ce236dc1737eb62141c3
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Jan 22 17:24:37 2012 +0000

    Remove patch disable_ipod.diff, it wasn't documented nor appeared anywhere in the changelog, and it only disabled its support in the configure script (and the option to add ipod support is off by default, at least in the current version)

diff --git a/debian/patches/disable_ipod.diff b/debian/patches/disable_ipod.diff
deleted file mode 100644
index de5a7e8..0000000
--- a/debian/patches/disable_ipod.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: SDL-1.2.14/configure.in
-===================================================================
---- SDL-1.2.14.orig/configure.in	2009-11-27 15:01:50.000000000 -0500
-+++ SDL-1.2.14/configure.in	2009-11-27 15:01:50.000000000 -0500
-@@ -882,19 +882,19 @@
- }
- 
- 
--dnl Do the iPod thing
--CheckIPod()
--{
--    AC_ARG_ENABLE(ipod,
--AC_HELP_STRING([--enable-ipod], [configure SDL to work with iPodLinux [[default=no]]]),
--        , enable_ipod=no)
--
--    if test x$enable_ipod = xyes; then
--        EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
--        AC_DEFINE(SDL_VIDEO_DRIVER_IPOD)
--        SOURCES="$SOURCES $srcdir/src/video/ipod/*.c"
--    fi
--}
-+#dnl Do the iPod thing
-+#CheckIPod()
-+#{
-+#    AC_ARG_ENABLE(ipod,
-+#AC_HELP_STRING([--enable-ipod], [configure SDL to work with iPodLinux [[default=no]]]),
-+#        , enable_ipod=no)
-+#
-+#    if test x$enable_ipod = xyes; then
-+#        EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD"
-+#        AC_DEFINE(SDL_VIDEO_DRIVER_IPOD)
-+#        SOURCES="$SOURCES $srcdir/src/video/ipod/*.c"
-+#    fi
-+#}
- 
- dnl Find the nanox include and library directories
- CheckNANOX()
diff --git a/debian/patches/series b/debian/patches/series
index a3b09e6..2fcfc97 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 no_yasm.diff
 nasm_include.diff
-disable_ipod.diff
 relibtoolize.diff
 kfreebsd_gnu.diff
 x11_keytounicode.diff

-- 
Debian packaging of SDL 1.2