[med-svn] [Git][med-team/libzeep][master] 4 commits: revert everything done for v5.0.2 so far
Maarten L. Hekkelman
gitlab at salsa.debian.org
Sat Nov 14 11:52:23 GMT 2020
Maarten L. Hekkelman pushed to branch master at Debian Med / libzeep
Commits:
b6de0600 by Maarten L. Hekkelman at 2020-11-14T09:53:25+01:00
revert everything done for v5.0.2 so far
- - - - -
df9d094c by Maarten L. Hekkelman at 2020-11-14T09:57:11+01:00
New upstream version 5.0.2
- - - - -
1f709b3a by Maarten L. Hekkelman at 2020-11-14T09:57:14+01:00
Update upstream source from tag 'upstream/5.0.2'
Update to upstream version '5.0.2'
with Debian dir e47910cc208175fdee369c981506f36b6c50f388
- - - - -
e5a13721 by Maarten L. Hekkelman at 2020-11-14T12:49:31+01:00
changes for 5.0.2
- - - - -
6 changed files:
- GNUmakefile.in
- debian/changelog
- debian/control
- + debian/patches/examples-makefile
- debian/patches/install-targets
- debian/patches/series
Changes:
=====================================
GNUmakefile.in
=====================================
@@ -135,6 +135,9 @@ $(OBJDIR)/%.o: %.cpp | $(OBJDIR)
$(LIB_TARGET): $(OBJECTS)
$(CXXLINK) -rpath $(libdir) $(OBJECTS) $(LDFLAGS) $(LIBS)
+libzeep.pc: libzeep.pc.in
+ ./config.status libzeep.pc
+
# Example code
.PHONY: examples
@@ -167,7 +170,7 @@ install-lib: $(LIB_TARGET)
# Install header files and .pc files
.PHONY: install-dev
-install-dev: $(LIB_TARGET)
+install-dev: $(LIB_TARGET) libzeep.pc
for dir in . ./http ./json ./xml ; do \
install -d $(includedir)/zeep/$${dir}; \
for hdr in include/zeep/$${dir}/*.hpp ; do \
@@ -240,12 +243,17 @@ endif
$(foreach part,$(TESTS),$(eval $(call TEST_template,$(part))))
+lib-xml/test/XML-Test-Suite/xmlconf/xmlconf.xml: lib-xml/test/XML-Test-Suite.tbz
+ cd lib-xml/test; tar xf XML-Test-Suite.tbz
+
+parser-test: lib-xml/test/XML-Test-Suite/xmlconf/xmlconf.xml
+
.PHONY: test
test: $(TESTS:%=%-test)
.PHONY: clean
clean:
- rm -rf $(LIB_TARGET) $(OBJDIR) $(DIST_NAME).tgz .libs
+ rm -rf $(LIB_TARGET) $(OBJDIR) $(DIST_NAME).tgz .libs tests lib-xml/test/XML-Test-Suite/ libzeep.pc
$(MAKE) -C examples clean
cd doc; $$(which $(BJAM) > /dev/null) && $(BJAM) clean || echo "No $(BJAM) installed, cannot clean doc"
=====================================
debian/changelog
=====================================
@@ -3,8 +3,10 @@ libzeep (5.0.2-1) unstable; urgency=medium
* Fix FTBFS (Closes: #974074)
+ remove override_dh_auto_configure and add --enable-shared flag to
override_dh_auto_configure-arch
+ * New upstream release
+ * Add autopkgtest
- -- Maarten L. Hekkelman <maarten at hekkelman.com> Thu, 12 Nov 2020 09:55:07 +0100
+ -- Maarten L. Hekkelman <maarten at hekkelman.com> Sat, 14 Nov 2020 12:44:57 +0100
libzeep (5.0.1-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -11,7 +11,7 @@ Build-Depends: debhelper-compat (= 13),
libboost-date-time-dev,
libboost-system-dev,
libboost-tools-dev,
- mrc,
+ mrc,
doxygen,
docbook-website,
xsltproc,
@@ -26,9 +26,11 @@ Package: libzeep-dev
Architecture: any
Section: libdevel
Depends: ${misc:Depends},
- libzeep-http5 (= ${binary:Version}),
+ libzeep5 (= ${binary:Version}),
libboost-dev,
libboost-program-options-dev,
+ libboost-date-time-dev,
+ libboost-system-dev,
pkg-config
Suggests: libzeep-doc, mrc
Description: Development files for libzeep
=====================================
debian/patches/examples-makefile
=====================================
@@ -0,0 +1,26 @@
+Description: Fix makefile for examples
+Author: Maarten L. Hekkelman <maarten at hekkelman.com>
+Last-Update: Sat, 14 Nov 2020 11:41:05 +0100
+Forwarded: yes
+
+--- a/examples/GNUmakefile
++++ b/examples/GNUmakefile
+@@ -50,9 +50,6 @@
+ clean:
+ rm -rf $(OBJDIR)/* $(EXAMPLES:%=$(BINDIR)/%)
+
+-ZEEP_LIBS = http xml json
+-BOOST_LIBS = system
+-
+ define EXAMPLE_template =
+
+ -include $$(OBJDIR)/$(1).d
+@@ -61,7 +58,7 @@
+
+ $(BINDIR)/$(1): $$($(1)_OBJECTS) | $(BINDIR)
+ @ echo "ld> $(1)"
+- @ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) $(ZEEP_LIBS:%=-lzeep-%) $(BOOST_LIBS:%=-lboost_%) $(LIBS)
++ @ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -lzeep $(LIBS)
+
+ endef
+
=====================================
debian/patches/install-targets
=====================================
@@ -14,20 +14,45 @@ Forwarded: not-needed
exec_prefix = @exec_prefix@
libdir = @libdir@
datarootdir = @datarootdir@
-@@ -163,11 +163,15 @@
+@@ -125,12 +125,10 @@
+ -include $(OBJECTS:%.lo=%.d)
+
+ $(OBJDIR)/%.lo: %.cpp | $(OBJDIR)
+- @ echo ">>" $<
+- @ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
++ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
+
+ $(OBJDIR)/%.o: %.cpp | $(OBJDIR)
+- @ echo ">>" $<
+- @ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
++ $(CXX) $(CXXFLAGS) -MT $@ -MD -MP -MF $(OBJDIR)/$*.d -c -o $@ $<
+
+ $(LIB_TARGET): $(OBJECTS)
+ $(CXXLINK) -rpath $(libdir) $(OBJECTS) $(LDFLAGS) $(LIBS)
+@@ -166,11 +164,15 @@
.PHONY: install-lib
install-lib: $(LIB_TARGET)
install -d $(libdir)
- $(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir);
+ $(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
-+ rm -f $(libdir)/libzeep.so $(libdir)/libzeep.so.5 $(libdir)/libzeep.a $(libdir)/libzeep.la
++ rm -f $(libdir)/libzeep.so $(libdir)/libzeep.a $(libdir)/libzeep.la
# Install header files and .pc files
.PHONY: install-dev
- install-dev: $(LIB_TARGET)
+ install-dev: $(LIB_TARGET) libzeep.pc
+ install -d $(libdir)
+ $(LIBTOOL) --mode=install install $(LIB_TARGET) $(libdir)
-+ rm -f $(libdir)/libzeep.so.5.0.0
++ rm -f $(libdir)/libzeep.so.5.0.0 $(libdir)/libzeep.so.5
for dir in . ./http ./json ./xml ; do \
install -d $(includedir)/zeep/$${dir}; \
for hdr in include/zeep/$${dir}/*.hpp ; do \
+@@ -226,8 +228,7 @@
+ endif
+
+ tests/$(1)-test: $(LIB_TARGET) $$($(1)_OBJECTS) | tests
+- @ echo ">>> building $(1)-test"
+- @ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L.libs -lzeep $(LIBS)
++ $(CXX) -o $$@ $$($(1)_OBJECTS) $$(CFLAGS) $$(CXXFLAGS) $(LDFLAGS) -L.libs -lzeep $(LIBS)
+
+ .PHONY: $(1)-test
+ $(1)-test: tests/$(1)-test
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
install-targets
+examples-makefile
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/compare/d5ace6a2ed056781eeef7842d2c9588244c4f404...e5a13721608b2d5f083f4bc33de3a5e9afad398c
--
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/compare/d5ace6a2ed056781eeef7842d2c9588244c4f404...e5a13721608b2d5f083f4bc33de3a5e9afad398c
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/20201114/2d3f8465/attachment-0001.html>
More information about the debian-med-commit
mailing list