[med-svn] [Git][med-team/libzeep][master] last steps
Maarten L. Hekkelman
gitlab at salsa.debian.org
Thu Sep 10 08:19:17 BST 2020
Maarten L. Hekkelman pushed to branch master at Debian Med / libzeep
Commits:
59dd1847 by Maarten L. Hekkelman at 2020-09-10T09:18:27+02:00
last steps
- - - - -
8 changed files:
- debian/control
- − debian/libzeep-dev.doc-base
- + debian/libzeep-doc.doc-base
- + debian/libzeep5.0.docs
- debian/patches/changelog
- debian/patches/docs-patch
- debian/patches/install-targets
- debian/rules
Changes:
=====================================
debian/control
=====================================
@@ -8,13 +8,13 @@ Build-Depends: debhelper-compat (= 12),
autoconf-archive,
libboost-dev,
libboost-program-options-dev,
- libboost-system-dev,
- libboost-tools-dev,
- doxygen,
- docbook-website,
- xsltproc,
- fop
-Standards-Version: 4.4.0
+ libboost-system-dev
+Build-Depends-indep: libboost-tools-dev,
+ doxygen,
+ docbook-website,
+ xsltproc,
+ fop
+Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/med-team/libzeep
Vcs-Git: https://salsa.debian.org/med-team/libzeep.git
Homepage: https://github.com/mhekkel/libzeep
@@ -25,8 +25,9 @@ Section: libdevel
Depends: ${misc:Depends},
libzeep5.0 (= ${binary:Version}),
libboost-dev,
- libboost-program-options-dev
-Conflicts: libzeep-dev
+ libboost-program-options-dev,
+ pkg-config
+Suggests: libzeep-doc
Description: Development files for libzeep
Libzeep is a C++ library providing a validating XML parser, XML DOM tree
implementation, XPath 1.0 support and code to create SOAP/REST servers as
@@ -45,9 +46,11 @@ Description: Development files for libzeep
software using libzeep.
Package: libzeep-doc
-Architecture: any
-Section: libdevel
+Architecture: all
+Multi-Arch: foreign
+Section: doc
Depends: ${misc:Depends}
+Suggests: libzeep-dev (>= ${binary:Version})
Description: Documentation for libzeep
Libzeep is a C++ library providing a validating XML parser, XML DOM tree
implementation, XPath 1.0 support and code to create SOAP/REST servers as
=====================================
debian/libzeep-dev.doc-base deleted
=====================================
@@ -1,20 +0,0 @@
-Document: libzeep-dev
-Title: Libzeep documentation
-Author: Maarten L. Hekkelman <maarten at hekkelman.com>
-Abstract: This manual documents the libzeep API.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libzeep-dev/index.html
-Files: /usr/share/doc/libzeep-dev/*.html
- /usr/share/doc/libzeep-dev/index/*.html
- /usr/share/doc/libzeep-dev/libzeep/*.html
- /usr/share/doc/libzeep-dev/zeep/*.html
- /usr/share/doc/libzeep-dev/zeep/xml/*.html
- /usr/share/doc/libzeep-dev/zeep/xml/doctype/*.html
- /usr/share/doc/libzeep-dev/zeep/xml/element/*.html
- /usr/share/doc/libzeep-dev/zeep/xml/container/*.html
- /usr/share/doc/libzeep-dev/zeep/http/*.html
- /usr/share/doc/libzeep-dev/zeep/http/basic_webapp/*.html
- /usr/share/doc/libzeep-dev/zeep/http/el/*.html
- /usr/share/doc/libzeep-dev/zeep/http/el/object/*.html
=====================================
debian/libzeep-doc.doc-base
=====================================
@@ -0,0 +1,16 @@
+Document: libzeep-doc
+Title: Libzeep documentation
+Author: Maarten L. Hekkelman <maarten at hekkelman.com>
+Abstract: This manual documents the libzeep API.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libzeep-doc/html/index.html
+Files: /usr/share/doc/libzeep-doc/html/*.html
+ /usr/share/doc/libzeep-doc/html/libzeep/*.html
+ /usr/share/doc/libzeep-doc/html/libzeep/http/*.html
+ /usr/share/doc/libzeep-doc/html/libzeep/json/*.html
+ /usr/share/doc/libzeep-doc/html/libzeep/xml/*.html
+ /usr/share/doc/libzeep-doc/html/quickbook/*.html
+ /usr/share/doc/libzeep-doc/html/std/*.html
+ /usr/share/doc/libzeep-doc/html/zeep/*.html
=====================================
debian/libzeep5.0.docs
=====================================
@@ -0,0 +1 @@
+README.md
=====================================
debian/patches/changelog
=====================================
@@ -1,3 +1,8 @@
+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 @@
=====================================
debian/patches/docs-patch
=====================================
@@ -1,3 +1,7 @@
+Description: Add some rules to find the right tools and files
+Author: Maarten L. Hekkelman <maarten at hekkelman.com>
+Last-Update: Thu, 10 Sep 2020 08:55:19 +0200
+
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -1,3 +1,16 @@
=====================================
debian/patches/install-targets
=====================================
@@ -1,3 +1,7 @@
+Description: Fix makefiles to install parts at the correct location
+Author: Maarten L. Hekkelman <maarten at hekkelman.com>
+Last-Update: Thu, 10 Sep 2020 08:55:19 +0200
+
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -16,10 +16,11 @@
@@ -28,10 +32,13 @@
lib-$(1): $(OUTPUT_DIR)
endef
-@@ -110,6 +119,16 @@
- .PHONY: all
- all: libraries test examples
+@@ -108,7 +117,17 @@
+ endif
+ .PHONY: all
+-all: libraries test examples
++all: libraries
++
+.PHONY: install-libs
+install-libs: $(ZEEP_LIBS:%=install-%-lib)
+
@@ -40,11 +47,10 @@
+
+.PHONY: install-doc
+install-doc: doc
-+ cd doc; for f in `find html -type f`; do install -D $$f $(docdir)/$$f; done
-+
++ cd doc; for f in `find html -type f`; do install -D $$f $(docdir)/libzeep-doc/$$f; done
+
.PHONY: install
install: $(ZEEP_LIBS:%=install-%)
-
--- a/lib-http/GNUmakefile.in
+++ b/lib-http/GNUmakefile.in
@@ -14,7 +14,7 @@
@@ -52,11 +58,11 @@
LIBS = @LIBS@
-prefix = @prefix@
-+prefix = $(DESTDIR)/@prefix@
++prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
-@@ -147,12 +147,19 @@
+@@ -147,11 +147,18 @@
.PHONY: lib
lib: $(LIB_TARGET)
@@ -70,14 +76,14 @@
+.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 -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)
- $(OBJDIR)/%.lo: %.cpp | $(OBJDIR)
--- a/lib-json/GNUmakefile.in
+++ b/lib-json/GNUmakefile.in
@@ -15,7 +15,7 @@
@@ -85,11 +91,11 @@
LIBS = @LIBS@
-prefix = @prefix@
-+prefix = $(DESTDIR)/@prefix@
++prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
-@@ -99,12 +99,19 @@
+@@ -99,11 +99,18 @@
.PHONY: lib
lib: $(LIB_TARGET)
@@ -103,14 +109,14 @@
+.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 -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)
- $(OBJDIR)/%.lo: %.cpp | $(OBJDIR)
--- a/lib-xml/GNUmakefile.in
+++ b/lib-xml/GNUmakefile.in
@@ -14,7 +14,7 @@
@@ -118,11 +124,11 @@
LIBS = @LIBS@
-prefix = @prefix@
-+prefix = $(DESTDIR)/@prefix@
++prefix = $(DESTDIR)@prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@
includedir = @includedir@
-@@ -101,12 +101,19 @@
+@@ -101,11 +101,18 @@
.PHONY: lib
lib: $(LIB_TARGET)
@@ -136,11 +142,11 @@
+.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 -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)
- $(OBJDIR)/%.lo: %.cpp | $(OBJDIR)
=====================================
debian/rules
=====================================
@@ -3,6 +3,11 @@
DH_VERBOSE := 1
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+# Fixing reproducible builds
+LC_ALL := C.UTF-8
+export LC_ALL
+
+export LIBRARY_VERSION=5.0
%:
dh $@
@@ -14,3 +19,27 @@ override_dh_auto_install:
$(MAKE) DESTDIR=$(CURDIR)/debian/libzeep5.0 install-libs
$(MAKE) DESTDIR=$(CURDIR)/debian/libzeep-dev install-dev
$(MAKE) DESTDIR=$(CURDIR)/debian/libzeep-doc install-doc
+ find $(CURDIR)/debian -type d -empty -delete
+
+override_dh_auto_configure-arch:
+ dh_auto_configure -- --enable-shared --disable-documentation
+
+override_dh_auto_configure-indep:
+ dh_auto_configure -- --enable-shared
+
+override_dh_auto_build-indep:
+ cd $(CURDIR)/doc/ && bjam
+ find -type f -iname "*.md5" -delete
+
+override_dh_auto_test:
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+ $(MAKE) test
+endif
+
+override_dh_install:
+ ## cleaning up dependency_libs filed in *.la files
+ sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
+ dh_install
+
+override_dh_makeshlibs:
+ dh_makeshlibs -- -v$(LIBRARY_VERSION)
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/commit/59dd1847416a58519215c1f2249efa742f306a73
--
View it on GitLab: https://salsa.debian.org/med-team/libzeep/-/commit/59dd1847416a58519215c1f2249efa742f306a73
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/20200910/60660cb2/attachment-0001.html>
More information about the debian-med-commit
mailing list