[med-svn] [Git][med-team/libzeep][master] 4 commits: Apply patch by Steve Langasek to update for g++7 + boost 1.65 compatibility
Andreas Tille
gitlab at salsa.debian.org
Sun Mar 18 15:28:58 UTC 2018
Andreas Tille pushed to branch master at Debian Med / libzeep
Commits:
bb483517 by Andreas Tille at 2018-03-18T16:22:24+01:00
Apply patch by Steve Langasek to update for g++7 + boost 1.65 compatibility
- - - - -
cff3bb38 by Andreas Tille at 2018-03-18T16:22:54+01:00
Standards-Version: 4.1.3
- - - - -
a1428245 by Andreas Tille at 2018-03-18T16:23:14+01:00
debhelper 11
- - - - -
2240f506 by Andreas Tille at 2018-03-18T16:28:46+01:00
Upload to unstable
- - - - -
5 changed files:
- debian/changelog
- debian/compat
- debian/control
- + debian/patches/boost-1.65-compat.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libzeep (3.0.2-6) unstable; urgency=medium
+
+ [ Steve Langasek ]
+ * update for g++7 + boost 1.65 compatibility
+ Closes: #893352
+
+ [ Andreas Tille ]
+ * Standards-Version: 4.1.3
+ * debhelper 11
+
+ -- Andreas Tille <tille at debian.org> Sun, 18 Mar 2018 16:23:56 +0100
+
libzeep (3.0.2-5) unstable; urgency=medium
* Moved packaging from SVN to Git
=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,14 @@ Uploaders: Maarten L. Hekkelman <m.hekkelman at cmbi.ru.nl>,
Andreas Tille <tille at debian.org>
Section: libs
Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
libboost-dev,
libboost-filesystem-dev,
libboost-system-dev,
libboost-regex-dev,
libboost-math-dev,
libboost-thread-dev
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/libzeep.git
Vcs-Git: https://anonscm.debian.org/git/debian-med/libzeep.git
Homepage: http://sourceforge.net/projects/libzeep/
=====================================
debian/patches/boost-1.65-compat.patch
=====================================
--- /dev/null
+++ b/debian/patches/boost-1.65-compat.patch
@@ -0,0 +1,245 @@
+Description: fix compatibility with boost 1.65
+ Boost 1.65 no longer provides tr1/ headers, which are now provided instead
+ by g++7 directly. Adjust our includes accordingly.
+Author: Steve Langasek <steve.langasek at ubuntu.com>
+Last-Modified: 2018-03-18
+
+Index: libzeep-3.0.2/src/doctype.cpp
+===================================================================
+--- libzeep-3.0.2.orig/src/doctype.cpp
++++ libzeep-3.0.2/src/doctype.cpp
+@@ -9,8 +9,8 @@
+ #include <typeinfo>
+ #include <numeric>
+
+-#include <boost/tr1/tuple.hpp>
+-#include <boost/tr1/memory.hpp>
++#include <tr1/tuple>
++#include <tr1/memory>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/foreach.hpp>
+ #define foreach BOOST_FOREACH
+@@ -132,7 +132,7 @@
+ switch (m_state)
+ {
+ case state_Start:
+- boost::fusion::tie(result, done) = m_sub->allow(name);
++ std::tr1::tie(result, done) = m_sub->allow(name);
+ if (result == true)
+ m_state = state_Loop;
+ else
+@@ -140,7 +140,7 @@
+ break;
+
+ case state_Loop:
+- boost::fusion::tie(result, done) = m_sub->allow(name);
++ std::tr1::tie(result, done) = m_sub->allow(name);
+ if (result == false and done)
+ done = true;
+ break;
+@@ -172,7 +172,7 @@
+ switch (m_state)
+ {
+ case state_Start:
+- boost::fusion::tie(result, done) = m_sub->allow(name);
++ std::tr1::tie(result, done) = m_sub->allow(name);
+ if (result == true)
+ m_state = state_Loop;
+ else
+@@ -180,11 +180,11 @@
+ break;
+
+ case state_Loop:
+- boost::fusion::tie(result, done) = m_sub->allow(name);
++ std::tr1::tie(result, done) = m_sub->allow(name);
+ if (result == false and done)
+ {
+ m_sub->reset();
+- boost::fusion::tie(result, done) = m_sub->allow(name);
++ std::tr1::tie(result, done) = m_sub->allow(name);
+ if (result == false)
+ done = true;
+ }
+@@ -218,28 +218,28 @@
+ switch (m_state)
+ {
+ case state_Start:
+- boost::fusion::tie(result, done) = m_sub->allow(name);
++ std::tr1::tie(result, done) = m_sub->allow(name);
+ if (result == true)
+ m_state = state_FirstLoop;
+ break;
+
+ case state_FirstLoop:
+- boost::fusion::tie(result, done) = m_sub->allow(name);
++ std::tr1::tie(result, done) = m_sub->allow(name);
+ if (result == false and done)
+ {
+ m_sub->reset();
+- boost::fusion::tie(result, done) = m_sub->allow(name);
++ std::tr1::tie(result, done) = m_sub->allow(name);
+ if (result == true)
+ m_state = state_NextLoop;
+ }
+ break;
+
+ case state_NextLoop:
+- boost::fusion::tie(result, done) = m_sub->allow(name);
++ std::tr1::tie(result, done) = m_sub->allow(name);
+ if (result == false and done)
+ {
+ m_sub->reset();
+- boost::fusion::tie(result, done) = m_sub->allow(name);
++ std::tr1::tie(result, done) = m_sub->allow(name);
+ if (result == false)
+ done = true;
+ }
+@@ -319,7 +319,7 @@
+ // fall through
+
+ case state_Element:
+- boost::fusion::tie(result, done) = (*m_next)->allow(name);
++ std::tr1::tie(result, done) = (*m_next)->allow(name);
+ while (result == false and done)
+ {
+ ++m_next;
+@@ -330,7 +330,7 @@
+ break;
+ }
+
+- boost::fusion::tie(result, done) = (*m_next)->allow(name);
++ std::tr1::tie(result, done) = (*m_next)->allow(name);
+ }
+ break;
+ }
+@@ -404,7 +404,7 @@
+ case state_Start:
+ for (list<state_ptr>::iterator choice = m_states.begin(); choice != m_states.end(); ++choice)
+ {
+- boost::fusion::tie(result, done) = (*choice)->allow(name);
++ std::tr1::tie(result, done) = (*choice)->allow(name);
+ if (result == true)
+ {
+ m_sub = *choice;
+@@ -415,7 +415,7 @@
+ break;
+
+ case state_Choice:
+- boost::fusion::tie(result, done) = m_sub->allow(name);
++ std::tr1::tie(result, done) = m_sub->allow(name);
+ break;
+ }
+
+@@ -490,7 +490,7 @@
+ bool validator::allow(const string& name)
+ {
+ bool result;
+- boost::fusion::tie(result, m_done) = m_state->allow(name);
++ std::tr1::tie(result, m_done) = m_state->allow(name);
+ return result;
+ }
+
+Index: libzeep-3.0.2/src/document-expat.cpp
+===================================================================
+--- libzeep-3.0.2.orig/src/document-expat.cpp
++++ libzeep-3.0.2/src/document-expat.cpp
+@@ -12,7 +12,7 @@
+ #include <vector>
+ #include <stack>
+
+-#include <boost/tr1/memory.hpp>
++#include <tr1/memory>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/filesystem/fstream.hpp>
+Index: libzeep-3.0.2/src/document-libxml2.cpp
+===================================================================
+--- libzeep-3.0.2.orig/src/document-libxml2.cpp
++++ libzeep-3.0.2/src/document-libxml2.cpp
+@@ -10,7 +10,7 @@
+ #include <deque>
+ #include <map>
+
+-#include <boost/tr1/memory.hpp>
++#include <tr1/memory>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/function.hpp>
+ #include <boost/bind.hpp>
+Index: libzeep-3.0.2/src/document.cpp
+===================================================================
+--- libzeep-3.0.2.orig/src/document.cpp
++++ libzeep-3.0.2/src/document.cpp
+@@ -10,7 +10,7 @@
+ #include <deque>
+ #include <map>
+
+-#include <boost/tr1/memory.hpp>
++#include <tr1/memory>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/function.hpp>
+ #include <boost/bind.hpp>
+Index: libzeep-3.0.2/src/parser.cpp
+===================================================================
+--- libzeep-3.0.2.orig/src/parser.cpp
++++ libzeep-3.0.2/src/parser.cpp
+@@ -6,7 +6,7 @@
+ #include <iostream>
+ #include <map>
+
+-#include <boost/tr1/memory.hpp>
++#include <tr1/memory>
+ #include <boost/algorithm/string.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/lexical_cast.hpp>
+Index: libzeep-3.0.2/src/preforked-http-server.cpp
+===================================================================
+--- libzeep-3.0.2.orig/src/preforked-http-server.cpp
++++ libzeep-3.0.2/src/preforked-http-server.cpp
+@@ -16,7 +16,7 @@
+ #include <zeep/http/connection.hpp>
+ #include <zeep/exception.hpp>
+
+-#include <boost/tr1/memory.hpp>
++#include <tr1/memory>
+ #include <boost/date_time/posix_time/posix_time.hpp>
+ #include <boost/thread.hpp>
+ #include <boost/bind.hpp>
+Index: libzeep-3.0.2/src/webapp-el.cpp
+===================================================================
+--- libzeep-3.0.2.orig/src/webapp-el.cpp
++++ libzeep-3.0.2/src/webapp-el.cpp
+@@ -14,7 +14,7 @@
+ #include <boost/foreach.hpp>
+ #define foreach BOOST_FOREACH
+ #include <boost/algorithm/string.hpp>
+-#include <boost/tr1/cmath.hpp>
++#include <tr1/cmath>
+
+ #include <zeep/http/webapp.hpp>
+ #include <zeep/http/webapp/el.hpp>
+Index: libzeep-3.0.2/src/xpath.cpp
+===================================================================
+--- libzeep-3.0.2.orig/src/xpath.cpp
++++ libzeep-3.0.2/src/xpath.cpp
+@@ -12,7 +12,7 @@
+ #include <cmath>
+ #include <map>
+
+-#include <boost/tr1/cmath.hpp>
++#include <tr1/cmath>
+ #include <boost/function.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/foreach.hpp>
+Index: libzeep-3.0.2/zeep/http/reply.hpp
+===================================================================
+--- libzeep-3.0.2.orig/zeep/http/reply.hpp
++++ libzeep-3.0.2/zeep/http/reply.hpp
+@@ -8,7 +8,7 @@
+
+ #include <vector>
+
+-#include <boost/tr1/memory.hpp>
++#include <tr1/memory>
+ #include <boost/asio/buffer.hpp>
+
+ #include <zeep/http/header.hpp>
=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ makefile.diff
linking-order.diff
libzeep-3.0-g++6-boost1.60.patch
spelling.patch
+boost-1.65-compat.patch
View it on GitLab: https://salsa.debian.org/med-team/libzeep/compare/fc664267d21cecece74082c30fe2d084d8fcadcd...2240f506b6b37c16e79aa9b3f091cee7a8d1209c
---
View it on GitLab: https://salsa.debian.org/med-team/libzeep/compare/fc664267d21cecece74082c30fe2d084d8fcadcd...2240f506b6b37c16e79aa9b3f091cee7a8d1209c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/debian-med-commit/attachments/20180318/cb1e0bc8/attachment-0001.html>
More information about the debian-med-commit
mailing list