[SCM] mjpegtools/master: Fix patches to modify configure.ac instead of configure, we are running autoreconf.

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

The following commit has been merged in the master branch:
commit 7586fc36c73897e20421fb360e0cb9f2c48b754f
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Oct 9 11:08:28 2012 +0200

    Fix patches to modify configure.ac instead of configure, we are running autoreconf.

diff --git a/debian/patches/01_debian-directory.patch b/debian/patches/01_debian-directory.patch
index b480d43..348e78c 100644
--- a/debian/patches/01_debian-directory.patch
+++ b/debian/patches/01_debian-directory.patch
@@ -33,23 +33,3 @@
       docs/Makefile
       lavtools/Makefile
       yuvcorrect/Makefile
---- a/configure
-+++ b/configure
-@@ -18564,7 +18564,7 @@ $as_echo "#define NDEBUG 1" >>confdefs.h
- 	;;
- esac
- 
--ac_config_files="$ac_config_files Makefile debian/Makefile debian/control docs/Makefile lavtools/Makefile yuvcorrect/Makefile yuvdenoise/Makefile yuvdeinterlace/Makefile yuvscaler/Makefile y4munsharp/Makefile y4mutils/Makefile yuvfilters/Makefile mpeg2enc/Makefile aenc/Makefile mplex/Makefile scripts/Makefile utils/Makefile utils/altivec/Makefile utils/mmxsse/Makefile y4mdenoise/Makefile mjpegtools.pc mjpegtools.spec"
-+ac_config_files="$ac_config_files Makefile docs/Makefile lavtools/Makefile yuvcorrect/Makefile yuvdenoise/Makefile yuvdeinterlace/Makefile yuvscaler/Makefile y4munsharp/Makefile y4mutils/Makefile yuvfilters/Makefile mpeg2enc/Makefile aenc/Makefile mplex/Makefile scripts/Makefile utils/Makefile utils/altivec/Makefile utils/mmxsse/Makefile y4mdenoise/Makefile mjpegtools.pc mjpegtools.spec"
- 
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -19715,8 +19715,6 @@ do
-     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-     "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
--    "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
--    "debian/control") CONFIG_FILES="$CONFIG_FILES debian/control" ;;
-     "docs/Makefile") CONFIG_FILES="$CONFIG_FILES docs/Makefile" ;;
-     "lavtools/Makefile") CONFIG_FILES="$CONFIG_FILES lavtools/Makefile" ;;
-     "yuvcorrect/Makefile") CONFIG_FILES="$CONFIG_FILES yuvcorrect/Makefile" ;;
diff --git a/debian/patches/03_disable_optimization.patch b/debian/patches/03_disable_optimization.patch
index 8548c19..9e7178a 100644
--- a/debian/patches/03_disable_optimization.patch
+++ b/debian/patches/03_disable_optimization.patch
@@ -1,10 +1,10 @@
---- a/configure
-+++ b/configure
-@@ -18433,6 +18433,7 @@ $as_echo_n "checking sub-architecture se
+--- a/configure.ac
++++ b/configure.ac
+@@ -471,6 +471,7 @@ if test x$have_x86cpu = xtrue -o x$have_
         ARCHFLAGS=`$srcdir/cpuinfo.sh ppc`
      fi
    fi
 +  ARCHFLAGS=""
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ARCHFLAGS" >&5
- $as_echo "$ARCHFLAGS" >&6; }
+   AC_MSG_RESULT($ARCHFLAGS)
  fi
+ 

-- 
mjpegtools packaging