[SCM] naspro-core/master: Remove 0001-float_rounding.patch, 0002-gcc46.patch patches, applied upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4b104f41bcd46760bd33c4b104672e3329b3c922
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun May 29 21:10:20 2011 +0200

    Remove 0001-float_rounding.patch, 0002-gcc46.patch patches, applied upstream.

diff --git a/debian/patches/0001-float_rounding.patch b/debian/patches/0001-float_rounding.patch
deleted file mode 100644
index a4fc0cd..0000000
--- a/debian/patches/0001-float_rounding.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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
deleted file mode 100644
index 6f0e74b..0000000
--- a/debian/patches/0002-gcc46.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
deleted file mode 100644
index 4667a9c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-float_rounding.patch
-0002-gcc46.patch

-- 
naspro-core packaging