[SCM] xvidcore/master: Remove configure.in-fix.patch and no-exec-stack-elf32.patch, applied upstream.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 01a55c2200059e5f04844cf3a908379d179d8fd2
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Mon Mar 28 09:47:14 2011 +0200

    Remove configure.in-fix.patch and no-exec-stack-elf32.patch, applied upstream.

diff --git a/debian/patches/configure.in-fix.patch b/debian/patches/configure.in-fix.patch
deleted file mode 100644
index b7afc7f..0000000
--- a/debian/patches/configure.in-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Patch to fix issue where autoconf outputs badly formatted configure script
-==========================================================================
---- xvidcore.orig/build/generic/configure.in
-+++ xvidcore/build/generic/configure.in
-@@ -593,13 +593,13 @@ dnl
- dnl ==========================================================================
- 
- AC_CHECK_HEADER(
--	pthread.h,
--	AC_CHECK_LIB(
--		pthread,
--		pthread_create,
--		SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
--		SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread",
--		AC_MSG_WARN(Pthread not supported. No SMP support)),
-+	[pthread.h],
-+	[AC_CHECK_LIB(
-+		[pthread],
-+		[pthread_create],
-+		[SPECIFIC_CFLAGS="$SPECIFIC_CFLAGS -DHAVE_PTHREAD"
-+		 SPECIFIC_LDFLAGS="$SPECIFIC_LDFLAGS -lpthread"],
-+		AC_MSG_WARN(Pthread not supported. No SMP support))],
- 	AC_MSG_WARN(Pthread not supported. No SMP support))
- 
- dnl ==========================================================================
diff --git a/debian/patches/no-exec-stack-elf32.patch b/debian/patches/no-exec-stack-elf32.patch
deleted file mode 100644
index 83c3eb4..0000000
--- a/debian/patches/no-exec-stack-elf32.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Really disable the executable bit for GNU-stack for elf32 archs.
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Forwarded: http://list.xvid.org/pipermail/xvid-devel/2011-February/006256.html
-
---- xvidcore.orig/src/nasm.inc
-+++ xvidcore/src/nasm.inc
-@@ -212,6 +212,9 @@ BITS 32
- %ifidn __OUTPUT_FORMAT__,elf
- section .note.GNU-stack noalloc noexec nowrite progbits
- %endif
-+%ifidn __OUTPUT_FORMAT__,elf32
-+section .note.GNU-stack noalloc noexec nowrite progbits
-+%endif
- %ifidn __OUTPUT_FORMAT__,elf64
- section .note.GNU-stack noalloc noexec nowrite progbits
- %endif
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index db6325f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-configure.in-fix.patch
-no-exec-stack-elf32.patch

-- 
xvidcore packaging