[SCM] mjpegtools/master: Fix patches to not modify Makefile.in, we are running autoreconf.

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

The following commit has been merged in the master branch:
commit 6ad7b17dd134da9afef6bd6f74d75c623ae16613
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Wed Oct 10 09:34:30 2012 +0200

    Fix patches to not modify Makefile.in, we are running autoreconf.

diff --git a/debian/patches/01_debian-directory.patch b/debian/patches/01_debian-directory.patch
index 348e78c..68ca349 100644
--- a/debian/patches/01_debian-directory.patch
+++ b/debian/patches/01_debian-directory.patch
@@ -10,18 +10,6 @@
  
  #
  # Add any non autoconf'd files here, extra readmes and other misc 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -309,8 +309,7 @@ SUBDIRS = \
- 	yuvdeinterlace \
- 	y4mdenoise \
- 	y4munsharp \
--        y4mutils \
--	debian
-+        y4mutils
- 
- 
- #
 --- a/configure.ac
 +++ b/configure.ac
 @@ -570,8 +570,6 @@ dnl Output a Makefile or two and the lib
diff --git a/debian/patches/06_link_pthread.patch b/debian/patches/06_link_pthread.patch
index 20b3f06..0dd8994 100644
--- a/debian/patches/06_link_pthread.patch
+++ b/debian/patches/06_link_pthread.patch
@@ -9,14 +9,3 @@
  
  mpeg2enc_DEPENDENCIES = \
  	$(LIBMJPEGUTILS) \
---- a/mpeg2enc/Makefile.in
-+++ b/mpeg2enc/Makefile.in
-@@ -359,7 +359,7 @@ libmpeg2encpp_la_LDFLAGS = \
- 	-release $(LT_RELEASE) ${EXTRA_LDFLAGS}
- 
- libmpeg2encpp_la_DEPENDENCIES = $(LIBMJPEGUTILS)
--libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) @PTHREAD_LIBS@
-+libmpeg2encpp_la_LIBADD = $(LIBMJPEGUTILS) @PTHREAD_LIBS@ -lpthread
- mpeg2enc_DEPENDENCIES = \
- 	$(LIBMJPEGUTILS) \
- 	libmpeg2encpp.la

-- 
mjpegtools packaging