[bzflag] 19/36: Drop 08_clang_FTBFS.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 bzflag.

commit 006054d5f50a97b5bef103cbff8549d5902740f1
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jul 22 06:07:04 2016 +0200

    Drop 08_clang_FTBFS.patch. Fixed upstream.
---
 debian/patches/08_clang_FTBFS.patch | 45 -------------------------------------
 debian/patches/series               |  1 -
 2 files changed, 46 deletions(-)

diff --git a/debian/patches/08_clang_FTBFS.patch b/debian/patches/08_clang_FTBFS.patch
deleted file mode 100644
index 207f3eb..0000000
--- a/debian/patches/08_clang_FTBFS.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Alexander <sanek23994 at gmail.com>
-Date: Sun, 1 Nov 2015 15:57:12 +0100
-Subject: clang FTBFS
-
-Fix FTBFS with the clang compiler.
-
-Forwarded: not needed, fixed upstream in r22804
----
- include/VotingArbiter.h | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/include/VotingArbiter.h b/include/VotingArbiter.h
-index cbf9e02..606220e 100644
---- a/include/VotingArbiter.h
-+++ b/include/VotingArbiter.h
-@@ -86,9 +86,9 @@ protected:
- public:
- 
-   /* default constructor */
--  VotingArbiter(unsigned short int voteTime, unsigned short int vetoTime,
--		unsigned short int votesRequired, float votePercentage,
--		unsigned short int voteRepeatTime);
-+  VotingArbiter(unsigned short int voteTime=60, unsigned short int vetoTime=20,
-+		unsigned short int votesRequired=2, float votePercentage=50.1,
-+		unsigned short int voteRepeatTime=300);
-   /* default copy constructor */
-   VotingArbiter(const VotingArbiter& arbiter);
-   ~VotingArbiter(void);
-@@ -231,11 +231,11 @@ public:
- };
- 
- 
--inline VotingArbiter::VotingArbiter(unsigned short int voteTime=60,
--				    unsigned short int vetoTime=20,
--				    unsigned short int votesRequired=2,
--				    float votePercentage=50.1,
--				    unsigned short int voteRepeatTime=300)
-+inline VotingArbiter::VotingArbiter(unsigned short int voteTime,
-+				    unsigned short int vetoTime,
-+				    unsigned short int votesRequired,
-+				    float votePercentage,
-+				    unsigned short int voteRepeatTime)
-   : _votingBooth(NULL),
-     _maxVotes(votesRequired+1),
-     _voteTime(voteTime),
diff --git a/debian/patches/series b/debian/patches/series
index 1c4d5e4..42278cf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 04_desktop_file_keywords.diff
 06_PATH_MAX.diff
-08_clang_FTBFS.patch
 09_update_portuguese_translation.patch

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