[med-svn] [Git][med-team/libzeep][master] update debian patches to new 5.0.1 upstream
Maarten L. Hekkelman
gitlab at salsa.debian.org
Mon Nov 9 10:06:43 GMT 2020
Maarten L. Hekkelman pushed to branch master at Debian Med / libzeep
Commits:
1d5830ff by Maarten L. Hekkelman at 2020-11-09T10:52:34+01:00
update debian patches to new 5.0.1 upstream
- - - - -
6 changed files:
- debian/control
- − debian/patches/changelog
- − debian/patches/gcc10-patch
- debian/patches/install-targets
- debian/patches/series
- − debian/patches/spelling.patch
Changes:
=====================================
debian/control
=====================================
@@ -9,6 +9,7 @@ Build-Depends: debhelper-compat (= 13),
mrc,
libboost-dev,
libboost-program-options-dev,
+ libboost-date-time-dev,
libboost-system-dev,
libboost-tools-dev,
doxygen,
=====================================
debian/patches/changelog deleted
=====================================
@@ -1,29 +0,0 @@
-Description: The upstream changelog contains an error since it mentions
- release 5.0.1 which does not exist, yet. This is fixed with this patch.
-Author: Maarten L. Hekkelman <maarten at hekkelman.com>
-Last-Update: Thu, 10 Sep 2020 08:55:19 +0200
-
---- a/changelog
-+++ b/changelog
-@@ -1,10 +1,3 @@
--Version 5.0.1
--
--- Refactored request, it is now a class and credentials are
-- always stored if a valid access-token was detected.
--- A bunch of fixes to make web application work behind a
-- reverse proxy.
--
- Version 5.0.0
-
- - Total rewrite of about everything
-@@ -18,6 +11,10 @@
- - Lots of test code added
- - Added some real world examples
- - Tested with boost 1.65.1 up to 1.73
-+- Refactored request, it is now a class and credentials are
-+ always stored if a valid access-token was detected.
-+- A bunch of fixes to make web application work behind a
-+ reverse proxy.
-
- Version 4.0.0
-
=====================================
debian/patches/gcc10-patch deleted
=====================================
@@ -1,44 +0,0 @@
-Description: Patch required to compile code with gcc version 10
-Author: Maarten L. Hekkelman <maarten at hekkelman.com>
-Last-Update: Thu, 10 Sep 2020 14:57:08 +0200
-
---- a/include/zeep/json/element.hpp
-+++ b/include/zeep/json/element.hpp
-@@ -149,7 +149,14 @@
- element(std::nullptr_t = nullptr);
- element(const element& j);
- element(element&& j);
-- element(const detail::element_reference& r);
-+
-+ template<typename ElementRef, std::enable_if_t<std::is_same_v<ElementRef,detail::element_reference>, int> = 0>
-+ element(const ElementRef& r)
-+ : element(r.data())
-+ {
-+ validate();
-+ }
-+
- template<typename T,
- typename U = typename std::remove_cv_t<typename std::remove_reference_t<T>>,
- std::enable_if_t<not std::is_same_v<U,element> and detail::is_compatible_type_v<T>, int> = 0>
---- a/lib-json/src/element.cpp
-+++ b/lib-json/src/element.cpp
-@@ -55,12 +55,6 @@
- validate();
- }
-
--element::element(const detail::element_reference& r)
-- : element(r.data())
--{
-- validate();
--}
--
- element::element(initializer_list_t init)
- {
- bool isAnObject = std::all_of(init.begin(), init.end(), [](auto& ref)
-@@ -915,4 +909,4 @@
- return os;
- }
-
--} // namespace zeep::json
-\ No newline at end of file
-+} // namespace zeep::json
=====================================
debian/patches/install-targets
=====================================
@@ -4,22 +4,18 @@ Last-Update: Thu, 10 Sep 2020 08:55:19 +0200
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
-@@ -16,10 +16,11 @@
+@@ -16,7 +16,7 @@
LDFLAGS = @LDFLAGS@ @BOOST_LDFLAGS@
LIBS = @LIBS@
-prefix = @prefix@
-+prefix = $(DESTDIR)/@prefix@
++prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
-+docdir = @docdir@
-
- BOOST_LIBS = program_options
- ZEEP_LIBS = http json xml
-@@ -82,6 +83,14 @@
- install-$(1):
- +$(MAKE) -C lib-$(1) install
+@@ -95,6 +95,14 @@
+ install-$(1)-dev:
+ +$(MAKE) -C lib-$(1) install-dev
+.PHONY: install-$(1)-lib
+install-$(1)-lib:
@@ -32,7 +28,7 @@ Last-Update: Thu, 10 Sep 2020 08:55:19 +0200
lib-$(1): $(OUTPUT_DIR)
endef
-@@ -108,7 +117,17 @@
+@@ -121,7 +129,17 @@
endif
.PHONY: all
@@ -49,8 +45,8 @@ Last-Update: Thu, 10 Sep 2020 08:55:19 +0200
+install-doc: doc
+ cd doc; for f in `find html -type f`; do install -D $$f $(docdir)/libzeep-doc/$$f; done
- .PHONY: install
- install: $(ZEEP_LIBS:%=install-%)
+ .PHONY: install-libs
+ install-libs: $(ZEEP_LIBS:%=install-%-lib)
--- a/lib-http/GNUmakefile.in
+++ b/lib-http/GNUmakefile.in
@@ -14,7 +14,7 @@
@@ -62,61 +58,17 @@ Last-Update: Thu, 10 Sep 2020 08:55:19 +0200
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
-@@ -147,11 +147,18 @@
- .PHONY: lib
- lib: $(LIB_TARGET)
-
--.PHONY: install
--install: lib
-+.PHONY: install-lib
-+install-lib: lib
-+ install -d $(libdir)
- $(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
-+
-+.PHONY: install-dev
-+install-dev:
- for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
-- install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-+ install -m 644 -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-+
-+.PHONY: install
-+install: install-lib install-dev
-
- -include $(OBJECTS:%.lo=%.d)
-
--- a/lib-json/GNUmakefile.in
+++ b/lib-json/GNUmakefile.in
@@ -15,7 +15,7 @@
LDFLAGS = @LDFLAGS@ @LIBS@ @BOOST_LDFLAGS@
- LIBS = @LIBS@
+ LIBS = @BOOST_DATE_TIME_LIB@ @LIBS@
-prefix = @prefix@
+prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
-@@ -99,11 +99,18 @@
- .PHONY: lib
- lib: $(LIB_TARGET)
-
--.PHONY: install
--install: lib
-+.PHONY: install-lib
-+install-lib: lib
-+ install -d $(libdir)
- $(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
-+
-+.PHONY: install-dev
-+install-dev:
- for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
-- install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-+ install -m 644 -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-+
-+.PHONY: install
-+install: install-lib install-dev
-
- -include $(OBJECTS:%.lo=%.d)
-
--- a/lib-xml/GNUmakefile.in
+++ b/lib-xml/GNUmakefile.in
@@ -14,7 +14,7 @@
@@ -128,25 +80,3 @@ Last-Update: Thu, 10 Sep 2020 08:55:19 +0200
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
-@@ -101,11 +101,18 @@
- .PHONY: lib
- lib: $(LIB_TARGET)
-
--.PHONY: install
--install: lib
-+.PHONY: install-lib
-+install-lib: lib
-+ install -d $(libdir)
- $(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
-+
-+.PHONY: install-dev
-+install-dev:
- for f in $(HEADERS); do install -D ../include/$$f $(includedir)/$$f; done
-- install -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-+ install -m 644 -D $(LIB_NAME).pc $(pkgconfigdir)/$(LIB_NAME).pc
-+
-+.PHONY: install
-+install: install-lib install-dev
-
- -include $(OBJECTS:%.lo=%.d)
-
=====================================
debian/patches/series
=====================================
@@ -1,5 +1,2 @@
-changelog
-spelling.patch
install-targets
docs-patch
-gcc10-patch
=====================================
debian/patches/spelling.patch deleted
=====================================
@@ -1,15 +0,0 @@
-Description: Fix Spelling
-Author: Andreas Tille <tille at debian.org>
-Last-Update: Tue, 28 Nov 2017 08:32:15 +0100
-
---- a/lib-xml/src/xpath.cpp
-+++ b/lib-xml/src/xpath.cpp
-@@ -1927,7 +1927,7 @@
- case xp_NodeType: result << "node type specification"; break;
- case xp_OperatorUnion: result << "union operator"; break;
- case xp_OperatorAdd: result << "addition operator"; break;
-- case xp_OperatorSubstract: result << "substraction operator"; break;
-+ case xp_OperatorSubstract: result << "subtraction operator"; break;
- case xp_OperatorEqual: result << "equals operator"; break;
- case xp_OperatorNotEqual: result << "not-equals operator"; break;
- case xp_OperatorLess: result << "less operator"; break;
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/commit/1d5830ffdb284fbf7ae726c7d082472be6209867
--
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/commit/1d5830ffdb284fbf7ae726c7d082472be6209867
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20201109/07906fe5/attachment-0001.html>
More information about the debian-med-commit
mailing list