[sdpb] 01/02: Add a patch to use the system version of tinyxml2.h.

[Tobias Hansen]

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

thansen pushed a commit to branch master
in repository sdpb.

commit 41b7622cf2aadc2b17db12bfafd803e79c9077c6
Author: Tobias Hansen <thansen at debian.org>
Date:   Sun Mar 19 00:08:37 2017 +0000

    Add a patch to use the system version of tinyxml2.h.
---
 debian/changelog                           |  6 ++++++
 debian/patches/series                      |  1 +
 debian/patches/use-system-tinyxml2.h.patch | 28 ++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d117481..1358010 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sdpb (1.0-2) unstable; urgency=medium
+
+  * Add patch use-system-tinyxml2.h.patch. (Closes: #857310)
+
+ -- Tobias Hansen <thansen at debian.org>  Sun, 19 Mar 2017 00:06:27 +0000
+
 sdpb (1.0-1) unstable; urgency=medium
 
   * Initial release. (Closes: #856704)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f4500ff
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-system-tinyxml2.h.patch
diff --git a/debian/patches/use-system-tinyxml2.h.patch b/debian/patches/use-system-tinyxml2.h.patch
new file mode 100644
index 0000000..373b6b6
--- /dev/null
+++ b/debian/patches/use-system-tinyxml2.h.patch
@@ -0,0 +1,28 @@
+Description: Use the system version of tinyxml2.h
+Author: Tobias Hansen <thansen at debian.org>
+Bug-Debian: http://bugs.debian.org/857310
+
+--- a/Makefile
++++ b/Makefile
+@@ -41,6 +41,7 @@
+ 
+ ifeq ($(SHARED_TINYXML2), 1)
+ LIBS = -ltinyxml2
++CFLAGS += -D___SHARED_TINYXML2___
+ else
+ SOURCES += $(wildcard src/tinyxml2/*.cpp)
+ HEADERS += $(wildcard src/tinyxml2/*.h)
+--- a/src/parse.cpp
++++ b/src/parse.cpp
+@@ -19,7 +19,11 @@
+ #include "parse.h"
+ #include "Polynomial.h"
+ #include "SDP.h"
++#ifdef ___SHARED_TINYXML2___
++#include <tinyxml2.h>
++#else
+ #include "tinyxml2/tinyxml2.h"
++#endif
+ 
+ using std::vector;
+ using tinyxml2::XMLDocument;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sdpb.git