[trigger-rally] 07/14: Drop 20_system_tinyxml.patch

[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 4b996af055cb7887b7d3fea7b6206b59b13af490
Author: Markus Koschany <apo at debian.org>
Date:   Mon Dec 19 14:28:26 2016 +0100

    Drop 20_system_tinyxml.patch
---
 debian/patches/20_system_tinyxml.patch | 23 -----------------------
 debian/patches/series                  |  1 -
 2 files changed, 24 deletions(-)

diff --git a/debian/patches/20_system_tinyxml.patch b/debian/patches/20_system_tinyxml.patch
deleted file mode 100644
index f039f45..0000000
--- a/debian/patches/20_system_tinyxml.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: trigger-rally ships an internal copy of tinyxml
-Author: Bertrand Marc <bmarc at debian.org>
-
---- a/src/GNUmakefile
-+++ b/src/GNUmakefile
-@@ -16,7 +16,7 @@
- TR_CFGFILE      := $(TR_BINDIR)/$(TR_CFGNAME)
- TR_DATAFILES    := $(shell cd $(TR_DATADIR); find * -type f)
- TR_DOCFILES     := $(shell cd $(TR_DOCDIR); find * -type f)
--PROJDIRS        := PEngine PSim TinyXML Trigger
-+PROJDIRS        := PEngine PSim Trigger
- SRCFILES        := $(shell find $(PROJDIRS) -type f -name "*.cpp")
- OBJFILES        := $(patsubst %.cpp, %.o, $(SRCFILES))
- DEPFILES        := $(patsubst %.cpp, %.d, $(SRCFILES))
-@@ -25,7 +25,7 @@
- DMACROS         := -DNDEBUG -DUNIX -DPACKAGE_VERSION=\"$(DISTVER)\"
- INCDIRS         := -I"./include"
- CXXFLAGS        := -std=c++11 $(WARNINGS) $(OPTIMS) $(DMACROS) $(INCDIRS)
--EXTRA_LIBS      := -lGL -lGLU -lGLEW -lSDL -lSDL_image -lphysfs -lopenal -lalut -lpthread
-+EXTRA_LIBS      := -lGL -lGLU -lGLEW -lSDL -lSDL_image -lphysfs -lopenal -lalut -lpthread -ltinyxml
- LDFLAGS         := $(EXTRA_LIBS)
- INSTALL_PROGRAM := install --mode=0755
- INSTALL_DATA    := install --mode=0644
diff --git a/debian/patches/series b/debian/patches/series
index 56f9ba7..3563862 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-20_system_tinyxml.patch
 813-config-path.patch
 811-flags.patch
 verbose-build.patch

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