[SCM] easytag/master: Drop upstream CXXFLAGS patch

[amigadave-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4c963e848b412a18bc43e5604f3374f967ca6d3f
Author: David King <amigadave at amigadave.com>
Date:   Wed Apr 23 09:10:35 2014 +0100

    Drop upstream CXXFLAGS patch

diff --git a/debian/patches/series b/debian/patches/series
index 2b1c309..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-use-CXXFLAGS-from-environment.patch
diff --git a/debian/patches/use-CXXFLAGS-from-environment.patch b/debian/patches/use-CXXFLAGS-from-environment.patch
deleted file mode 100644
index 09af64b..0000000
--- a/debian/patches/use-CXXFLAGS-from-environment.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Description: Use CXXFLAGS from environment
-Origin: upstream, https://git.gnome.org/browse/easytag/patch/?id=5a73d051b844e8c8e01f0f8d51e8839e4de3bf1a
-Applied-Upstream: https://git.gnome.org/browse/easytag/commit/?id=5a73d051b844e8c8e01f0f8d51e8839e4de3bf1a
-From: David King <amigadave at amigadave.com>
-
-Fix a typo when checking for warning options to pass to the C++
-compiler, and ensure that CXXFLAGS set in the environment are passed to
-the compiler.
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-diff --git a/configure.ac b/configure.ac
-index ae11d83..eacea67 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -344,9 +344,9 @@ CFLAGS="$realsave_CFLAGS"
- AC_SUBST([WARN_CFLAGS], ["$tested_warning_flags"])
- AC_LANG_PUSH([C++])
- 
--realsave_CFLAGS="$CXXFLAGS"
-+realsave_CXXFLAGS="$CXXFLAGS"
- for option in $warning_flags; do
--    save_CFLAGS="$CXXFLAGS"
-+    save_CXXFLAGS="$CXXFLAGS"
-     CXXFLAGS="$CXXFLAGS -Werror $option"
- 	AC_MSG_CHECKING([whether the c++ compiler understands $option])
- 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM], [has_option=yes], [has_option=no])
-@@ -355,7 +355,7 @@ for option in $warning_flags; do
- 	AS_IF([test $has_option = yes],
- 	      [tested_cxx_warning_flags="$tested_cxx_warning_flags $option"])
- 	unset has_option
--	unset save_CFLAGS
-+	unset save_CXXFLAGS
- done
- unset option
- CXXFLAGS="$realsave_CXXFLAGS"
--- 
-cgit v0.10.1
-

-- 
easytag packaging