[med-svn] [jellyfish1] 01/03: Downloaded upstream commit to build with GCC5.

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to tag debian/2.2.3-2
in repository jellyfish1.

commit 11d72349362eafb0b8d72f22de039f7af41fe0e1
Author: Charles Plessy <plessy at debian.org>
Date:   Thu Aug 20 13:40:38 2015 +0900

    Downloaded upstream commit to build with GCC5.
    
    https://github.com/gmarcais/Jellyfish/commit/a3c491af4b02086cf13269eb5df8266a748e1c7c.patch
---
 .../a3c491af4b02086cf13269eb5df8266a748e1c7c.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 37 insertions(+)

diff --git a/debian/patches/a3c491af4b02086cf13269eb5df8266a748e1c7c.patch b/debian/patches/a3c491af4b02086cf13269eb5df8266a748e1c7c.patch
new file mode 100644
index 0000000..3262c91
--- /dev/null
+++ b/debian/patches/a3c491af4b02086cf13269eb5df8266a748e1c7c.patch
@@ -0,0 +1,36 @@
+From a3c491af4b02086cf13269eb5df8266a748e1c7c Mon Sep 17 00:00:00 2001
+From: Guillaume Marcais <gmarcais at umd.edu>
+Date: Thu, 2 Jul 2015 09:25:02 -0400
+Subject: [PATCH] Removed kludgy -Dprotected=public flags in testing.
+
+---
+ Makefile.am                 | 2 +-
+ unit_tests/test_mer_heap.cc | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a31b91f..3fd4a12 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -203,7 +203,7 @@ bin_test_all_SOURCES = unit_tests/test_main.cc				\
+ 	               unit_tests/test_stdio_filebuf.cc
+ bin_test_all_SOURCES += jellyfish/backtrace.cc
+ 
+-bin_test_all_CPPFLAGS = -Dprotected=public -Dprivate=public -DJSON_IS_AMALGAMATION=1
++bin_test_all_CPPFLAGS = -DJSON_IS_AMALGAMATION=1
+ bin_test_all_CXXFLAGS = $(AM_CXXFLAGS) -I$(srcdir)/unit_tests/gtest/include -I$(srcdir)/unit_tests -I$(srcdir)/include
+ bin_test_all_LDADD = libgtest.la $(LDADD)
+ YAGGO_SOURCES += unit_tests/test_main_cmdline.hpp
+diff --git a/unit_tests/test_mer_heap.cc b/unit_tests/test_mer_heap.cc
+index 44cf91a..ceeb54a 100644
+--- a/unit_tests/test_mer_heap.cc
++++ b/unit_tests/test_mer_heap.cc
+@@ -16,7 +16,7 @@ static const uint16_t mer_len  = 50;
+ static const size_t   nb_mers  = ary_size / 2;
+ 
+ class MerHeapTest : public ::testing::TestWithParam<size_t> {
+-protected:
++public:
+   static void SetUpTestCase() {
+     mer_dna::k(mer_len);
+     shared_ary = new large_array(ary_size, mer_len * 2, 0, 63);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d1a3f20
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+a3c491af4b02086cf13269eb5df8266a748e1c7c.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/jellyfish1.git