[med-svn] [Git][med-team/librcsb-core-wrapper][master] 10 commits: Drop unneeded get-orig-source target

Fri Jul 27 00:44:17 BST 2018

Andreas Tille pushed to branch master at Debian Med / librcsb-core-wrapper


Commits:
ffd10643 by Andreas Tille at 2018-07-26T16:06:38+02:00
Drop unneeded get-orig-source target

- - - - -
cd57b5ad by Andreas Tille at 2018-07-26T16:11:38+02:00
Fix build error with gcc-8

- - - - -
dec1b226 by Andreas Tille at 2018-07-26T16:11:55+02:00
debhelper 11

- - - - -
d85919dc by Andreas Tille at 2018-07-26T16:11:58+02:00
Point Vcs fields to salsa.debian.org

- - - - -
b206b75d by Andreas Tille at 2018-07-26T16:11:59+02:00
Standards-Version: 4.1.5

- - - - -
202f460d by Andreas Tille at 2018-07-26T16:11:59+02:00
Testsuite: autopkgtest-pkg-python

- - - - -
b8cc5d3c by Andreas Tille at 2018-07-26T16:18:27+02:00
Fix gcc-8 patch

- - - - -
e6ce9121 by Andreas Tille at 2018-07-27T01:10:25+02:00
Revert to debhelper 10 since the build fails otherwise for very strange reasons (see d/rules for a beginning of the hack - but that's no solution)

- - - - -
1c0284fc by Andreas Tille at 2018-07-27T01:11:53+02:00
No Priority: extra

- - - - -
e3c4e610 by Andreas Tille at 2018-07-27T01:43:53+02:00
Add TODO item to changelog

- - - - -


5 changed files:

- debian/changelog
- debian/control
- + debian/patches/gcc-8.patch
- debian/patches/series
- debian/rules


Changes:

=====================================
debian/changelog
=====================================

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+librcsb-core-wrapper (1.005-6) UNRELEASED; urgency=medium
+
+  * 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.1.5
+  * Testsuite: autopkgtest-pkg-python
+  * No Priority: extra
+
+ -- Andreas Tille <tille at debian.org>  Fri, 27 Jul 2018 01:12:37 +0200
+
 librcsb-core-wrapper (1.005-5) unstable; urgency=medium
 
   * Enable build against libxerces-c3.2


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Laszlo Kajan <lkajan at debian.org>,
            Andreas Tille <tille at debian.org>
 Section: libs
+Testsuite: autopkgtest-pkg-python
 Priority: optional
 Build-Depends: debhelper (>= 10),
                doxygen,
@@ -14,9 +15,9 @@ Build-Depends: debhelper (>= 10),
                libtool-bin,
                bison,
                flex
-Standards-Version: 4.1.1
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/librcsb-core-wrapper.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/librcsb-core-wrapper.git
+Standards-Version: 4.1.5
+Vcs-Browser: https://salsa.debian.org/med-team/librcsb-core-wrapper
+Vcs-Git: https://salsa.debian.org/med-team/librcsb-core-wrapper.git
 Homepage: http://sw-tools.rcsb.org/apps/CORE-WRAPPER/index.html
 X-Python-Version: >= 2.5
 
@@ -60,7 +61,6 @@ Description: documentation for librcsb-core-wrapper0
 Package: python-corepywrap
 Architecture: any
 Section: python
-Priority: extra
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          ${python:Depends},


=====================================
debian/patches/gcc-8.patch
=====================================
--- /dev/null
+++ b/debian/patches/gcc-8.patch
@@ -0,0 +1,18 @@
+Description: Fix build error with gcc-8
+ "error: catching polymorphic type 'class std::exception' by value [-Werror=catch-value=]"
+ -> This should be a reference
+Bug-Debian: https://bugs.debian.org/897795
+Author: Andreas Tille <tille at 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
+ 
+         return (true);
+     }
+-    catch (exception)
++    catch (std::exception &exception)
+     {
+         return (false);
+     }


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ make_test_target
 regcomp_cert_fix.patch
 gcc5.patch
 xerces32.patch
+gcc-8.patch


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,9 @@ override_dh_auto_build: override_dh_auto_build-nopy override_dh_auto_build-py
 
 override_dh_auto_build-nopy:
 	dh_auto_build
+	# When using debhelper 11 something is very different in the installation.
+	# The next line tries to hack around this - but this is not the solution - thus reverting debhelper compat level
+	# cp -a common/include/* pdbml-parser/include/* cif-file/include/* tables/include/* include
 	$(MAKE) doc
 
 override_dh_auto_build-py: override_dh_auto_build-nopy
@@ -40,7 +43,3 @@ override_dh_makeshlibs:
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf wrapper/python/build
-
-get-orig-source:
-	mkdir -p ../tarballs
-	uscan --verbose --force-download --destdir=../tarballs



View it on GitLab: https://salsa.debian.org/med-team/librcsb-core-wrapper/compare/f4c5b3d447a611bfcf2682e3029d963962035cf7...e3c4e610b3e730454e8947e5eeffa62067db6793

-- 
View it on GitLab: https://salsa.debian.org/med-team/librcsb-core-wrapper/compare/f4c5b3d447a611bfcf2682e3029d963962035cf7...e3c4e610b3e730454e8947e5eeffa62067db6793
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/20180726/f9363e7c/attachment-0001.html>
