[trigger-rally] 09/14: Drop 811-flags.patch. Fixed upstream.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository trigger-rally.

commit ab55f06b76020e47d110b9c3425f0f79dd1890a7
Author: Markus Koschany <apo at debian.org>
Date:   Mon Dec 19 14:29:55 2016 +0100

    Drop 811-flags.patch. Fixed upstream.
---
 debian/patches/811-flags.patch | 37 -------------------------------------
 debian/patches/series          |  1 -
 2 files changed, 38 deletions(-)

diff --git a/debian/patches/811-flags.patch b/debian/patches/811-flags.patch
deleted file mode 100644
index 755c7e5..0000000
--- a/debian/patches/811-flags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: fix *FLAGS overrides
-Origin: upstream, commit 811
---- a/src/GNUmakefile
-+++ b/src/GNUmakefile
-@@ -23,10 +23,11 @@
- WARNINGS        ?= -Wall -Wextra -pedantic
- OPTIMS          ?= -march=native -mtune=native -Ofast
- DMACROS         := -DNDEBUG -DUNIX -DPACKAGE_VERSION=\"$(DISTVER)\"
--INCDIRS         := -I"./include"
--CXXFLAGS        := -std=c++11 $(WARNINGS) $(OPTIMS) $(DMACROS) $(INCDIRS)
-+INCDIRS         := -I'./include'
-+CXXFLAGS        += -std=c++11 $(WARNINGS) $(OPTIMS)
-+CPPFLAGS        += $(DMACROS) $(INCDIRS)
- EXTRA_LIBS      := -lGL -lGLU -lGLEW -lSDL -lSDL_image -lphysfs -lopenal -lalut -lpthread -ltinyxml
--LDFLAGS         := $(EXTRA_LIBS)
-+LDFLAGS         += $(EXTRA_LIBS)
- INSTALL_PROGRAM := install --mode=0755
- INSTALL_DATA    := install --mode=0644
- 
-@@ -67,6 +68,11 @@
- 	@printf "\texec_prefix  ?= %s\n" "$(exec_prefix)"
- 	@printf "\tOPTIMS       ?= %s\n" "$(OPTIMS)"
- 	@printf "\tWARNINGS     ?= %s\n" "$(WARNINGS)"
-+	@printf "\n"
-+	@printf "resulting values of build variables:\n"
-+	@printf "\tCXXFLAGS     += %s\n" "$(CXXFLAGS)"
-+	@printf "\tCPPFLAGS     += %s\n" "$(CPPFLAGS)"
-+	@printf "\tLDFLAGS      += %s\n" "$(LDFLAGS)"
- 	@printf "\n"
- 
- # installs the software (executable, data files and documentation)
-@@ -149,4 +155,4 @@
- #
- %.o: %.cpp GNUmakefile
- 	@printf "%s\t%s -> %s\n" $(CXX) $< $@
--	@$(CXX) $(CXXFLAGS) -MMD -MP -c $< -o $@
-+	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MMD -MP -c $< -o $@
diff --git a/debian/patches/series b/debian/patches/series
index 077a0ea..626aaca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-811-flags.patch
 verbose-build.patch
 disable-strip.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally.git