Bug#699401: unblock: bristol/0.60.10-3

[Alessio Treglia <alessio@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Dear release managers,

Please unblock package bristol 0.60.10-3, it contains an improvement to
the patch already applied in the past to fix bugs#674229 ('FTBFS due to
hardcoded compiler options').

The (minimalistic) debdiff is attached.

Thanks for considering,
Regards.

unblock bristol/0.60.10-3

-- 
Alessio Treglia          | www.alessiotreglia.com
Debian Developer         | alessio@debian.org
Ubuntu Core Developer    | quadrispro@ubuntu.com
0416 0004 A827 6E40 BB98 90FB E8A4 8AE5 311D 765A

diffstat for bristol-0.60.10 bristol-0.60.10

 changelog                    |    7 +++++++
 patches/02-disable_sse.patch |   16 ++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff -Nru bristol-0.60.10/debian/changelog bristol-0.60.10/debian/changelog
--- bristol-0.60.10/debian/changelog	2012-06-15 08:58:09.000000000 +0100
+++ bristol-0.60.10/debian/changelog	2012-07-18 17:01:51.000000000 +0100
@@ -1,3 +1,10 @@
+bristol (0.60.10-3) unstable; urgency=low
+
+  * Extend 02-disable_sse.patch to disable -march=core2 -msse -msse
+    -mfpmath=sse when compiling libbristol too.
+
+ -- Alessio Treglia <alessio@debian.org>  Wed, 18 Jul 2012 18:01:34 +0200
+
 bristol (0.60.10-2) unstable; urgency=low
 
   * Disable -msse -mfpmath (Closes: #674229)
diff -Nru bristol-0.60.10/debian/patches/02-disable_sse.patch bristol-0.60.10/debian/patches/02-disable_sse.patch
--- bristol-0.60.10/debian/patches/02-disable_sse.patch	2012-06-15 08:57:04.000000000 +0100
+++ bristol-0.60.10/debian/patches/02-disable_sse.patch	2012-07-18 16:55:10.000000000 +0100
@@ -2,8 +2,9 @@
 Author: Alessio Treglia <alessio@debian.org>
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674229
 ---
- bristol/Makefile.am |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ bristol/Makefile.am    |    2 +-
+ libbristol/Makefile.am |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 --- bristol.orig/bristol/Makefile.am
 +++ bristol/bristol/Makefile.am
@@ -15,3 +16,14 @@
  
  bin_PROGRAMS = bristol
  #bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol/.libs -L../libbristolic/.libs
+--- bristol.orig/libbristol/Makefile.am
++++ bristol/libbristol/Makefile.am
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+ AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @BRISTOL_HAS_PA@
+-libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3
++libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -ffast-math -fomit-frame-pointer -O2
+ #libbristol_la_LIBADD=$(top_builddir)/libbristol/libbristol.la
+ 
+ lib_LTLIBRARIES = libbristol.la