diff -u mjpegtools-1.9.0/debian/changelog mjpegtools-1.9.0/debian/changelog
--- mjpegtools-1.9.0/debian/changelog
+++ mjpegtools-1.9.0/debian/changelog
@@ -1,3 +1,17 @@
+mjpegtools (1:1.9.0-0.0ubuntu3) jaunty-proposed; urgency=low
+
+  * debian/control
+    - add quilt build-depend for patch
+    - reformat to comply with upstream, making future merge easier
+  * debian/rules
+    - add quilt
+  * debian/patches/02_fix_arch_specifics.patch
+    - patch configure and configure.ac to never use arch specific
+      optimizations, really fixes SIGILL on non-pentium4 archs.
+      (LP: #351017)
+
+ -- Andreas Moog <amoog@ubuntu.com>  Sat, 25 Apr 2009 15:17:36 +0200
+
 mjpegtools (1:1.9.0-0.0ubuntu2) jaunty-proposed; urgency=low
 
   * debian/rules
diff -u mjpegtools-1.9.0/debian/control mjpegtools-1.9.0/debian/control
--- mjpegtools-1.9.0/debian/control
+++ mjpegtools-1.9.0/debian/control
@@ -7,9 +7,10 @@
 Bugs: mailto:marillat@debian.org
 Standards-Version: 3.8.0
 Build-Depends: debhelper (>> 7), libpopt-dev, nasm (>= 0.98.34) [i386],
- libdv-dev, libsdl1.2-dev, libgtk2.0-dev, libjpeg62-dev, libquicktime-dev (>= 2:0.9.8),
- libfreetype6-dev, libxrender-dev | xlibs-static-dev (<< 6.8.1-1), libpng-dev,
- libxt-dev | xlibs-static-dev (<< 6.8.1-1), ccache
+ libdv-dev, libsdl1.2-dev, libgtk2.0-dev, libjpeg62-dev, quilt, ccache, 
+ libquicktime-dev (>= 2:0.9.8), libfreetype6-dev, libpng-dev, 
+ libxrender-dev | xlibs-static-dev (<< 6.8.1-1),
+ libxt-dev | xlibs-static-dev (<< 6.8.1-1)
 
 Package: libmjpegtools-1.9
 Architecture: any
diff -u mjpegtools-1.9.0/debian/rules mjpegtools-1.9.0/debian/rules
--- mjpegtools-1.9.0/debian/rules
+++ mjpegtools-1.9.0/debian/rules
@@ -4,6 +4,8 @@
 
 version := $(shell sed -n 's/Package: \(.*\)/\1/p' debian/control | head -n 1)
 
+include /usr/share/quilt/quilt.make
+
 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
@@ -31,7 +33,7 @@
 endif
 
 configure: configure-stamp
-configure-stamp:
+configure-stamp: debian/stamp-patched
 	dh_testdir
 
 	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man \
@@ -47,7 +49,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp configure-stamp
only in patch2:
unchanged:
--- mjpegtools-1.9.0.orig/debian/patches/series
+++ mjpegtools-1.9.0/debian/patches/series
@@ -0,0 +1 @@
+02_fix_arch_specifics.patch
only in patch2:
unchanged:
--- mjpegtools-1.9.0.orig/debian/patches/02_fix_arch_specifics.patch
+++ mjpegtools-1.9.0/debian/patches/02_fix_arch_specifics.patch
@@ -0,0 +1,32 @@
+Index: mjpegtools-1.9.0/configure
+===================================================================
+--- mjpegtools-1.9.0.orig/configure	2009-04-25 03:27:11.000000000 +0200
++++ mjpegtools-1.9.0/configure	2009-04-25 03:27:40.000000000 +0200
+@@ -25998,9 +25998,9 @@
+ echo $ECHO_N "checking sub-architecture settings... $ECHO_C" >&6; }
+     chmod +x $srcdir/cpuinfo.sh
+     if test x$have_x86cpu = xtrue; then
+-       ARCHFLAGS=`$srcdir/cpuinfo.sh x86`
++       ARCHFLAGS=``
+     elif test x$have_ppccpu = xtrue; then
+-       ARCHFLAGS=`$srcdir/cpuinfo.sh ppc`
++       ARCHFLAGS=``
+     fi
+   fi
+   { echo "$as_me:$LINENO: result: $ARCHFLAGS" >&5
+Index: mjpegtools-1.9.0/configure.ac
+===================================================================
+--- mjpegtools-1.9.0.orig/configure.ac	2009-04-25 03:27:15.000000000 +0200
++++ mjpegtools-1.9.0/configure.ac	2009-04-25 03:27:29.000000000 +0200
+@@ -441,9 +441,9 @@
+     AC_MSG_CHECKING(sub-architecture settings)
+     chmod +x $srcdir/cpuinfo.sh
+     if test x$have_x86cpu = xtrue; then
+-       ARCHFLAGS=`$srcdir/cpuinfo.sh x86`
++       ARCHFLAGS=``
+     elif test x$have_ppccpu = xtrue; then
+-       ARCHFLAGS=`$srcdir/cpuinfo.sh ppc`
++       ARCHFLAGS=``
+     fi
+   fi
+   AC_MSG_RESULT($ARCHFLAGS)