[SCM] dirac/master: Add patch to fix FTBFS with GCC4.6 (Closes: #625318):

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4f25625414e2d008a819061e4fc0423e501897ce
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon May 9 20:46:55 2011 +0200

    Add patch to fix FTBFS with GCC4.6 (Closes: #625318):
    
    - Strip -Werror out of CFLAGS.

diff --git a/debian/patches/gcc46.patch b/debian/patches/gcc46.patch
new file mode 100644
index 0000000..c1f9f6c
--- /dev/null
+++ b/debian/patches/gcc46.patch
@@ -0,0 +1,58 @@
+Description: Strip -Werror out of CFLAGS to prevent FTBFS with GCC4.6.
+Author: Alessio Treglia <alessio at debian.org>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=625318
+---
+ configure    |   30 ------------------------------
+ configure.ac |    2 --
+ 2 files changed, 32 deletions(-)
+
+--- dirac.orig/configure.ac
++++ dirac/configure.ac
+@@ -181,8 +181,6 @@ case "$CXX" in
+ 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
+ 		TRY_CFLAGS="$OPT_CFLAGS -Wall"
+ 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
+-		TRY_CFLAGS="$OPT_CFLAGS -Werror"
+-		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
+ 		TRY_CFLAGS="$OPT_CFLAGS -W"
+ 		AC_TRY_CXXFLAGS([],[], [$TRY_CFLAGS $CXXFLAGS],[OPT_CFLAGS="$TRY_CFLAGS"])
+ 		TRY_CFLAGS="$OPT_CFLAGS -Woverloaded-virtual"
+--- dirac.orig/configure
++++ dirac/configure
+@@ -16286,36 +16286,6 @@ $as_echo "$ac_cv_try_cxxflags_ok" >&6; }
+     else
+ 	:
+     fi
+-		TRY_CFLAGS="$OPT_CFLAGS -Werror"
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports $TRY_CFLAGS $CXXFLAGS flags" >&5
+-$as_echo_n "checking if $CXX supports $TRY_CFLAGS $CXXFLAGS flags... " >&6; }
+-	SAVE_CXXFLAGS="$CXXFLAGS"
+-	CXXFLAGS="$TRY_CFLAGS $CXXFLAGS"
+-	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_cxx_try_compile "$LINENO"; then :
+-  ac_cv_try_cxxflags_ok=yes
+-else
+-  ac_cv_try_cxxflags_ok=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-	CXXFLAGS="$SAVE_CXXFLAGS"
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_try_cxxflags_ok" >&5
+-$as_echo "$ac_cv_try_cxxflags_ok" >&6; }
+-	if test x"$ac_cv_try_cxxflags_ok" = x"yes"; then
+-	OPT_CFLAGS="$TRY_CFLAGS"
+-    else
+-	:
+-    fi
+ 		TRY_CFLAGS="$OPT_CFLAGS -W"
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CXX supports $TRY_CFLAGS $CXXFLAGS flags" >&5
+ $as_echo_n "checking if $CXX supports $TRY_CFLAGS $CXXFLAGS flags... " >&6; }
diff --git a/debian/patches/series b/debian/patches/series
index ffd74ad..58f3719 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 build-system-modifications.patch
 bootstrap.patch
 gcc45.patch
+gcc46.patch

-- 
dirac packaging