Michael R. Crusoe pushed to branch master at Debian Med / librcsb-core-wrapper
Commits: 004daf33 by Michael R. Crusoe at 2019-01-18T20:06:41Z Adapt patches for latest boost version - - - - - 1c3ad757 by Michael R. Crusoe at 2019-01-18T20:09:51Z debian/watch: use secure HTTPS URL - - - - - 5 changed files: - debian/changelog - debian/control - debian/patches/gcc-8.patch - debian/patches/setup.py.in - debian/watch Changes: ===================================== debian/changelog ===================================== @@ -1,18 +1,19 @@ librcsb-core-wrapper (1.005-6) UNRELEASED; urgency=medium + [ Andreas Tille ] * Drop unneeded get-orig-source target * Fix build error with gcc-8 Closes: #897795 - - TODO: While the gcc-8 bug is fixed the build system is somehow messed - up. No idea how to fix this for the moment - * Point Vcs fields to salsa.debian.org * Standards-Version: 4.2.1 * Testsuite: autopkgtest-pkg-python * No Priority: extra * Drop ancient field X-Python-Version + [ Michael R. Crusoe ] + * Adapt patches for latest boost version + * debian/watch: use secure HTTPS URL + -- Andreas Tille <ti...@debian.org> Fri, 27 Jul 2018 01:12:37 +0200 librcsb-core-wrapper (1.005-5) unstable; urgency=medium ===================================== debian/control ===================================== @@ -8,6 +8,7 @@ Priority: optional Build-Depends: debhelper (>= 10), doxygen, graphviz, + dh-python, libboost-python-dev, libxerces-c-dev, python-all-dev, @@ -60,6 +61,7 @@ Description: documentation for librcsb-core-wrapper0 Package: python-corepywrap Architecture: any Section: python +Provides: ${python:Provides} Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, ===================================== debian/patches/gcc-8.patch ===================================== @@ -1,18 +1,16 @@ -Description: Fix build error with gcc-8 - "error: catching polymorphic type 'class std::exception' by value [-Werror=catch-value=]" - -> This should be a reference +Description: Stop building with -Werror + This works around a FTBFS with gcc 8. +Author: Adrian Bunk <b...@debian.org> Bug-Debian: https://bugs.debian.org/897795 -Author: Andreas Tille <ti...@debian.org> -Last-Update: Thu, 26 Jul 2018 16:06:21 +0200 ---- a/common/src/GenString.C -+++ b/common/src/GenString.C -@@ -536,7 +536,7 @@ bool String::IsNumber(const string& inSt +--- librcsb-core-wrapper.orig/etc/make.platform.gnu4 ++++ librcsb-core-wrapper/etc/make.platform.gnu4 +@@ -34,7 +34,7 @@ - return (true); - } -- catch (exception) -+ catch (std::exception &exception) - { - return (false); - } + # WARNINGS_AS_ERRORS defines flags to instruct all compilers to treat all + # warnings as errors. +-WARNINGS_AS_ERRORS=-Werror ++#WARNINGS_AS_ERRORS=-Werror + + # ALL_WARNINGS defines flags to instruct all compilers to report all + # warnings. ===================================== debian/patches/setup.py.in ===================================== @@ -2,7 +2,7 @@ Author: Laszlo Kajan <lka...@rostlab.org> Description: python build system Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-August/016975.html --- /dev/null -+++ b/wrapper/python/setup.py.in ++++ librcsb-core-wrapper/wrapper/python/setup.py.in @@ -0,0 +1,49 @@ +#!/usr/bin/python + @@ -51,11 +51,11 @@ Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-Au + include_dirs = ['../../include'] + parse_cmd(extra_cmd, '-I'), + library_dirs = ['../../lib/.libs'] + parse_cmd(extra_cmd, '-L'), + extra_compile_args = parse_cmd(extra_cmd, '-D', True), -+ libraries = ['rcsb-core-wrapper', 'boost_python-py%1d%1d' % ( sys.version_info[0], sys.version_info[1] )] + parse_cmd(extra_cmd, '-l'))], ++ libraries = ['rcsb-core-wrapper', 'boost_python%1d%1d' % ( sys.version_info[0], sys.version_info[1] )] + parse_cmd(extra_cmd, '-l'))], +) ---- a/wrapper/Makefile -+++ b/wrapper/Makefile -@@ -103,11 +103,16 @@ ALL_OBJ_FILES = *.o +--- librcsb-core-wrapper.orig/wrapper/Makefile ++++ librcsb-core-wrapper/wrapper/Makefile +@@ -103,11 +103,16 @@ .PHONY: ../etc/Makefile.platform all install export clean clean_build @@ -73,7 +73,7 @@ Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-Au export: mkdir -p $(EXPORT_DIR) -@@ -137,6 +142,7 @@ clean_build: +@@ -137,6 +142,7 @@ @rm -f $(M_MOD_LIB) @rm -f $(M_AGR_LIB) @rm -f *.pyc @@ -81,9 +81,9 @@ Forwarded: http://lists.alioth.debian.org/pipermail/debian-med-packaging/2012-Au $(L_MOD_LIB): $(OBJ_FILES) $(ALL_DEP_LIBS) ---- a/Makefile -+++ b/Makefile -@@ -12,7 +12,11 @@ DOC_SCRIPT = doc.sh +--- librcsb-core-wrapper.orig/Makefile ++++ librcsb-core-wrapper/Makefile +@@ -12,7 +12,11 @@ CLEAN_DOC_SCRIPT = clean_doc.sh EXPORT_SCRIPT = export.sh ===================================== debian/watch ===================================== @@ -1,4 +1,4 @@ # Compulsory line, this is a version 3 file version=3 -http://sw-tools.rcsb.org/apps/CORE-WRAPPER/source/source.html core-wrapper-v([\d.]+)-prod-src\.tar\..z +https://sw-tools.rcsb.org/apps/CORE-WRAPPER/source/source.html core-wrapper-v([\d.]+)-prod-src\.tar\..z View it on GitLab: https://salsa.debian.org/med-team/librcsb-core-wrapper/compare/cc64934e13f2c1f0108fa240ef8766ba429e850c...1c3ad757b2a442d3573dbc2b64ae73b05a7d3b64 -- View it on GitLab: https://salsa.debian.org/med-team/librcsb-core-wrapper/compare/cc64934e13f2c1f0108fa240ef8766ba429e850c...1c3ad757b2a442d3573dbc2b64ae73b05a7d3b64 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list debian-med-com...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit