[SCM] naspro-core/master: Reintroduce 0001-float_rounding.patch to fix various FTBFS.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit acaaab483d63190819aca6288e057d7e284e2008
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon May 30 12:38:24 2011 +0200

    Reintroduce 0001-float_rounding.patch to fix various FTBFS.
    
    This reverts commit 4b104f41bcd46760bd33c4b104672e3329b3c922.
    0002-gcc46.patch needs to be removed, it is unnecessary.

diff --git a/debian/patches/0001-float_rounding.patch b/debian/patches/0001-float_rounding.patch
new file mode 100644
index 0000000..a4fc0cd
--- /dev/null
+++ b/debian/patches/0001-float_rounding.patch
@@ -0,0 +1,23 @@
+Description: Fix expected test results on alpha,s390,sparc{,64}.
+Author: Alessio Treglia <alessio at debian.org>
+Forwarded: Stefano D'Angelo <zanga.mail at gmail.com>
+---
+ tests/string.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- naspro-core.orig/tests/string.c
++++ naspro-core/tests/string.c
+@@ -438,7 +438,12 @@ main()
+ 	else if (nchar != enchar)
+ 		test_err("expected length: %d, returned length: %d",
+ 			enchar, nchar);
+-	else if (strcmp(buf2, "5.5556") != 0)
++	else
++#if defined (__alpha__) || defined (__s390__) || defined (__sparc__) || defined (__sparc64__)
++	if (strcmp(buf2, "5.5555") != 0)
++#else
++	if (strcmp(buf2, "5.5556") != 0)
++#endif
+ 		test_err("expected '%.4f', returned '%s'", floatval, buf2);
+ 		
+ 	if(buf2 != NULL)
diff --git a/debian/patches/0002-gcc46.patch b/debian/patches/0002-gcc46.patch
new file mode 100644
index 0000000..6f0e74b
--- /dev/null
+++ b/debian/patches/0002-gcc46.patch
@@ -0,0 +1,31 @@
+Author: Alessio Treglia <alessio at debian.org>
+Description: Get rid of -Werror to avoid build failure with GCC4.6.
+Bug-Debian: http://bugs.debian.org/625399
+Forwarded: Stefano D'Angelo <zanga.mail at gmail.com>
+---
+ src/Makefile.am   |    2 +-
+ tests/Makefile.am |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- naspro-core.orig/src/Makefile.am
++++ naspro-core/src/Makefile.am
+@@ -7,7 +7,7 @@
+ # See the COPYING file for license conditions.
+ #
+ 
+-AM_CFLAGS = -pedantic -Wall -Werror @THREAD_FLAGS@
++AM_CFLAGS = -pedantic -Wall @THREAD_FLAGS@
+ AM_LDFLAGS = -no-undefined -version-info @API_MAJOR@:@API_MINOR@:@API_MICRO@ \
+ 	     @THREAD_FLAGS@
+ INCLUDES = -I$(top_srcdir)/include
+--- naspro-core.orig/tests/Makefile.am
++++ naspro-core/tests/Makefile.am
+@@ -7,7 +7,7 @@
+ # See the COPYING file for license conditions.
+ #
+ 
+-AM_CFLAGS = -pedantic -Wall -Werror @THREAD_FLAGS@
++AM_CFLAGS = -pedantic -Wall @THREAD_FLAGS@
+ AM_LDFLAGS = -lnacore -L$(top_builddir)/src @THREAD_FLAGS@
+ INCLUDES = -I$(top_srcdir)/include
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4667a9c
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-float_rounding.patch
+0002-gcc46.patch

-- 
naspro-core packaging