Bug#377374: diff for 0.0.2pre25-1.1 NMU

[Steinar H. Gunderson]

Package: spandsp
Version: 0.0.2pre25-1
Severity: normal
Tags: patch

Hi,

Attached is the diff for my spandsp 0.0.2pre25-1.1 NMU.
-------------- next part --------------
reverted:
--- spandsp-0.0.2pre25/debian/patches/00list
+++ spandsp-0.0.2pre25.orig/debian/patches/00list
@@ -1 +0,0 @@
-nonmmx.dpatch
reverted:
--- spandsp-0.0.2pre25/debian/patches/nonmmx.dpatch
+++ spandsp-0.0.2pre25.orig/debian/patches/nonmmx.dpatch
@@ -1,43 +0,0 @@
-#! /bin/sh -e
-## nonmmx.dpatch by Kilian Krause <kk at verfaction.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixed compilation on all non-i386
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
---- spandsp-0.0.2.orig/src/spandsp/mmx.h
-+++ spandsp-0.0.2/src/spandsp/mmx.h
-@@ -21,6 +21,8 @@
- #if !defined(_MMX_H_)
- #define _MMX_H_
- 
-+#if defined(USE_MMX) || defined(USE_SSE)
-+
- /*
-     The type of an value that fits in an MMX register
-     (note that long long constant values MUST be suffixed
-@@ -571,4 +573,6 @@
- #endif
- 
- #endif
-+
-+#endif
- /*- End of file ------------------------------------------------------------*/
diff -u spandsp-0.0.2pre25/debian/changelog spandsp-0.0.2pre25/debian/changelog
--- spandsp-0.0.2pre25/debian/changelog
+++ spandsp-0.0.2pre25/debian/changelog
@@ -1,3 +1,11 @@
+spandsp (0.0.2pre25-1.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Remove "nonmmx" patch, which is superseded by changes in upstream, and
+    causes FTBFS for non-i386 architectures. (Closes: #376249)
+
+ -- Steinar H. Gunderson <sesse at debian.org>  Sat,  8 Jul 2006 16:56:04 +0200
+
 spandsp (0.0.2pre25-1) unstable; urgency=low
 
   * New upstream version.