[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 eaaa4dff65bf8916ac06f53c08a89398fd9924c6
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Sun Jan 22 18:42:47 2012 +0000

    Remove patch nasm_include.diff, it was applied upstream, picked from Debian (changeset 4539 d2517c0de52b)

diff --git a/debian/patches/nasm_include.diff b/debian/patches/nasm_include.diff
deleted file mode 100644
index ea73495..0000000
--- a/debian/patches/nasm_include.diff
+++ /dev/null
@@ -1,15 +0,0 @@
----
- build-scripts/makedep.sh |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/build-scripts/makedep.sh
-+++ b/build-scripts/makedep.sh
-@@ -69,7 +69,7 @@
-         ;;
-         asm) cat >>${output}.new <<__EOF__
- 
--	\$(LIBTOOL) --tag=CC --mode=compile \$(auxdir)/strip_fPIC.sh \$(NASM) $src -o \$@
-+	\$(LIBTOOL) --tag=CC --mode=compile \$(auxdir)/strip_fPIC.sh \$(NASM) -I\$(srcdir)/src/hermes/ $src -o \$@
- 
- __EOF__
-         ;;
diff --git a/debian/patches/series b/debian/patches/series
index ab08628..3719ad7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-nasm_include.diff
 relibtoolize.diff
 kfreebsd_gnu.diff
 x11_keytounicode.diff

-- 
Debian packaging of SDL 1.2