[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 8f09a71cd9c24e014661f90aa29294b9b7888f6f
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Jan 22 17:44:49 2012 +0000

    Remove patch no_yasm.diff, it was applied upstream, picked from Debian (changeset 4538 74b5387da0c4)

diff --git a/debian/patches/no_yasm.diff b/debian/patches/no_yasm.diff
deleted file mode 100644
index 4b9c3f4..0000000
--- a/debian/patches/no_yasm.diff
+++ /dev/null
@@ -1,26 +0,0 @@
----
- configure.in |    6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-Index: SDL-1.2.14/configure.in
-===================================================================
---- SDL-1.2.14.orig/configure.in	2009-11-27 15:02:19.000000000 -0500
-+++ SDL-1.2.14/configure.in	2009-11-27 15:02:24.000000000 -0500
-@@ -745,16 +745,12 @@
-             esac
-         fi
- 
--        AC_PATH_PROG(NASM, yasm)
-+        AC_PATH_PROG(NASM, nasm)
-         echo "%ifidn __OUTPUT_FORMAT__,elf" > unquoted-sections
-         echo "section .note.GNU-stack noalloc noexec nowrite progbits" >> unquoted-sections
-         echo "%endif" >> unquoted-sections
-         CompileNASM unquoted-sections || NASM=""
- 
--        if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then
--            $as_unset ac_cv_path_NASM
--            AC_PATH_PROG(NASM, nasm)
--        fi
-         if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
-             AC_DEFINE(SDL_HERMES_BLITTERS)
-             SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
diff --git a/debian/patches/series b/debian/patches/series
index dbf7b4f..cec429a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-no_yasm.diff
 nasm_include.diff
 relibtoolize.diff
 kfreebsd_gnu.diff

-- 
Debian packaging of SDL 1.2