This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository xmoto.
commit 1888d6ea247d137768802d942b353102129241fd
Author: Stephen Kitt <st...@sk2.org>
Date: Sun Aug 6 23:25:04 2017 +0200
Avoid comparing pointers with booleans
---
debian/changelog | 6 ++++++
debian/copyright | 2 +-
debian/patches/gcc-7.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 58 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index ad53577..2c18a4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xmoto (0.5.11+dfsg-7) UNRELEASED; urgency=medium
+
+ * Avoid comparing pointers with booleans. (Closes: #853712.)
+
+ -- Stephen Kitt <sk...@debian.org> Sun, 06 Aug 2017 23:23:05 +0200
+
xmoto (0.5.11+dfsg-6) unstable; urgency=medium
* Switch to https: VCS URIs (see #810378).
diff --git a/debian/copyright b/debian/copyright
index 3f454da..8c1b790 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -83,7 +83,7 @@ Copyright: 2005-2009 Samuel Mimram <smim...@debian.org>
2008-2009 Barry deFreese <bdefre...@debian.org>
2009 Gonéri Le Bouder <gon...@rulezlan.org>
2011 Bruno "Fuddl" Kleinert <fu...@debian.org>
- 2011, 2012, 2014, 2015 Stephen Kitt <sk...@debian.org>
+ 2011, 2012, 2014-2017 Stephen Kitt <sk...@debian.org>
License: GPL-2+
License: GPL-2+
diff --git a/debian/patches/gcc-7.patch b/debian/patches/gcc-7.patch
new file mode 100644
index 0000000..67b168a
--- /dev/null
+++ b/debian/patches/gcc-7.patch
@@ -0,0 +1,50 @@
+Description: Avoid comparing points with booleans
+Author: Stephen Kitt <sk...@debian.org>
+
+--- a/src/WWW.cpp
++++ b/src/WWW.cpp
+@@ -206,7 +206,7 @@
+ std::string v_www_agent = WWW_AGENT;
+
+ /* open the file */
+- if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == false) {
++ if( (v_destinationFile = fopen(v_local_file_tmp.c_str(), "wb")) == NULL) {
+ throw Exception("error : unable to open output file "
+ + v_local_file_tmp);
+ }
+@@ -320,7 +320,7 @@
+ LogInfo(std::string("Uploading replay " + p_replayFilename).c_str());
+
+ /* open the file */
+- if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
++ if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
+ throw Exception("error : unable to open output file "
DEFAULT_WWW_MSGFILE("UR"));
+ }
+
+@@ -478,7 +478,7 @@
+ LogInfo("Sending vote");
+
+ /* open the file */
+- if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
++ if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
+ throw Exception("error : unable to open output file "
DEFAULT_WWW_MSGFILE("SV"));
+ }
+
+@@ -562,7 +562,7 @@
+ LogInfo("Sending report");
+
+ /* open the file */
+- if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == false) {
++ if( (v_destinationFile = fopen(v_local_file.c_str(), "wb")) == NULL) {
+ throw Exception("error : unable to open output file "
DEFAULT_WWW_MSGFILE("SR"));
+ }
+
+@@ -677,7 +677,7 @@
+ LogInfo(std::string("Uploading dbsync " + p_dbSyncFilename + " to " +
p_url_to_transfert).c_str());
+
+ /* open the file */
+- if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == false) {
++ if( (v_destinationFile = fopen(p_answerFile.c_str(), "wb")) == NULL) {
+ throw Exception("error : unable to open output file " + p_answerFile);
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 25ef264..f4c64d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ utf8.patch
reproducible.patch
string-constants.patch
svn3421.patch
+gcc-7.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-games/xmoto.git
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
