[SCM] WarMUX PKG branch, master, updated. 56e3341e6284e349bc18f9d2f25a3d896d61f2c8

[Felix Geyer]

The following commit has been merged in the master branch:
commit 78244d1182e807734f71d82dc1e9fd9c6a19668f
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Fri Jun 17 13:44:27 2011 +0200

    Adapt 03_respect_build_flags_from_env.patch to new upstream version.

diff --git a/debian/changelog b/debian/changelog
index 6ba9c41..9c5e437 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ warmux (1:11.04.1+repack-1) UNRELEASED; urgency=low
   * Update the package description as Warmux supports playing against
     computer opponents. (Closes: #624798)
   * Drop 05_fix_build_s390.patch, fixed upstream.
+  * Adapt 03_respect_build_flags_from_env.patch to new upstream version.
 
  -- Felix Geyer <debfx-pkg at fobos.de>  Sun, 15 May 2011 18:21:43 +0200
 
diff --git a/debian/patches/03_respect_build_flags_from_env.patch b/debian/patches/03_respect_build_flags_from_env.patch
index 66a76a8..08e3eae 100644
--- a/debian/patches/03_respect_build_flags_from_env.patch
+++ b/debian/patches/03_respect_build_flags_from_env.patch
@@ -3,24 +3,21 @@ Author: Felix Geyer <debfx-pkg at fobos.de>
 
 --- warmux-11.01.orig/configure.ac
 +++ warmux-11.01/configure.ac
-@@ -43,7 +43,6 @@
+@@ -43,8 +43,6 @@
    AC_MSG_ERROR([*** No C++ compiler can be found!])
  fi
  
 -AX_CFLAGS_WARN_ALL([CXXFLAGS])
+-
+ # ==========================================================================
+ # == Set flags for various environments                                    =
+ # ==========================================================================
+@@ -186,8 +184,6 @@
  
- # ========================================================================
- # == Set flags for various environments                                  =
-@@ -193,12 +193,6 @@
-     GCC_FLAGS="$GCC_FLAGS -DWMX_LOG"
+   if test "x${debug}" = "xyes"; then
+     GCC_FLAGS="$GCC_FLAGS -O0 -g -DDEBUG -DWMX_LOG"
+-  else
+-    GCC_FLAGS="$GCC_FLAGS -O2"
    fi
  
--  dnl Ignore default options set by autoconf
--  dnl CFLAGS="$CFLAGS $GCC_FLAGS"
--  CFLAGS="$GCC_FLAGS"
--  dnl CXXFLAGS="$CXXFLAGS $GCC_FLAGS"
--  CXXFLAGS="$GCC_FLAGS"
--
- else
-   if test "x${debug}" = "xyes"; then
-     CFLAGS="$CFLAGS -DDEBUG"
+   if test "x${logging}" = "xyes"; then
diff --git a/debian/rules b/debian/rules
index b01fad1..2fb45e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
 
-CXXFLAGS += -Wall -Wextra
-
 %:
 	dh $@ --parallel --with autoreconf
 

-- 
WarMUX PKG