[med-svn] [Git][med-team/trinityrnaseq][master] 5 commits: assume_modern_g++ - hmmmm, but the code fits that patch, no idea how this should…

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / trinityrnaseq


Commits:
d5bc1092 by Andreas Tille at 2018-08-02T23:36:59Z
assume_modern_g++ - hmmmm, but the code fits that patch, no idea how this should help fixing bug #897877

- - - - -
7fd763b1 by Andreas Tille at 2018-08-02T23:39:00Z
debhelper 11

- - - - -
bb26c962 by Andreas Tille at 2018-08-02T23:44:04Z
Point Vcs fields to salsa.debian.org

- - - - -
4b42893a by Andreas Tille at 2018-08-02T23:44:04Z
Standards-Version: 4.1.5

- - - - -
4a3293a9 by Andreas Tille at 2018-08-02T23:53:03Z
Close bug

- - - - -


5 changed files:

- debian/changelog
- debian/compat
- debian/control
- + debian/patches/assume_modern_g++.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
 trinityrnaseq (2.6.6+dfsg-1) UNRELEASED; urgency=medium
 
+  [ Michael R. Crusoe ]
   * New upstream release, now with the sample data returned
+    Closes: #897877
   * Build and ship seqtk-trinity
   
   TODO: update salmon to v0.9; required for this version
 
+  [ Andreas Tille ]
+  * debhelper 11
+  * Point Vcs fields to salsa.debian.org
+  * Standards-Version: 4.1.5
+
  -- Michael R. Crusoe <michael.crusoe at gmail.com>  Sat, 17 Feb 2018 07:38:23 -0800
 
 trinityrnaseq (2.5.1+dfsg-2) unstable; urgency=medium


=====================================
debian/compat
=====================================
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11


=====================================
debian/control
=====================================
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Michael R. Crusoe <michael.crusoe at gmail.com>
 Section: science
 Priority: optional
-Build-Depends: debhelper (>= 10),
+Build-Depends: debhelper (>= 11~),
                jellyfish (>= 2.1.4),
                libjung-free-java,
                javahelper,
@@ -17,9 +17,9 @@ Build-Depends: debhelper (>= 10),
                jellyfish,
                salmon,
                zlib1g-dev
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/trinityrnaseq.git
-Vcs-Git: https://anonscm.debian.org/git/debian-med/trinityrnaseq.git
+Standards-Version: 4.1.5
+Vcs-Browser: https://salsa.debian.org/med-team/trinityrnaseq
+Vcs-Git: https://salsa.debian.org/med-team/trinityrnaseq.git
 Homepage: http://trinityrnaseq.github.io/
 
 Package: trinityrnaseq


=====================================
debian/patches/assume_modern_g++.patch
=====================================
--- /dev/null
+++ b/debian/patches/assume_modern_g++.patch
@@ -0,0 +1,37 @@
+From: Brian Haas <brianjohnhaas at gmail.com>
+Date: Mon, 5 Feb 2018 19:51:50 -0500
+Origin: https://github.com/trinityrnaseq/trinityrnaseq/commit/a3d279c17f868fd51d56f8e1a6f9a3c223480fbf.patch
+Bug-Debian: https://bugs.debian.org/897877
+Subject: [PATCH] assume modern g++
+
+---
+ Chrysalis/Makefile | 16 +---------------
+ 1 file changed, 1 insertion(+), 15 deletions(-)
+
+diff --git a/Chrysalis/Makefile b/Chrysalis/Makefile
+index 346dc5c9..1f1a4223 100644
+--- a/Chrysalis/Makefile
++++ b/Chrysalis/Makefile
+@@ -297,21 +297,7 @@ SYS_INCS = -I.
+ 
+ # Where to find system-specific includes:
+ ifeq ($(COMPILER),g++)
+-  ifeq ($(GPP_MAJOR_VERSION),2)
+-       SYS_INCS	= -I. -I- $(XERCES_INC)
+-  endif
+-  ifeq ($(GPP_MAJOR_VERSION),3)
+-       SYS_INCS	= -I. -I- $(XERCES_INC)
+-  endif
+-  ifeq ($(GPP_MAJOR_VERSION),4)
+-       SYS_INCS	= -iquote . $(XERCES_INC)
+-  endif
+-  ifeq ($(GPP_MAJOR_VERSION),5)
+-       SYS_INCS        = -iquote . $(XERCES_INC)
+-  endif
+-  ifeq ($(GPP_MAJOR_VERSION),6)
+-       SYS_INCS        = -iquote . $(XERCES_INC)
+-  endif
++	SYS_INCS        = -iquote . $(XERCES_INC)
+ endif
+ 
+ # Linking control (e.g. to link templates):


=====================================
debian/patches/series
=====================================
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@ adjust-trimmomatic-adapters-path
 build_with_gcc6.patch
 NeedlemanWunschGotohBanded.patch
 disable-libieee
+# assume_modern_g++.patch



View it on GitLab: https://salsa.debian.org/med-team/trinityrnaseq/compare/baf7d95721eac1adcf411a1f8fd6cf5a1c68c865...4a3293a9ae4ca639561033097e074f9b4229240b

-- 
View it on GitLab: https://salsa.debian.org/med-team/trinityrnaseq/compare/baf7d95721eac1adcf411a1f8fd6cf5a1c68c865...4a3293a9ae4ca639561033097e074f9b4229240b
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/20180803/db042a5a/attachment-0001.html>