[med-svn] [jellyfish] 04/05: New upstream version (upstream applied patches)

[Andreas Tille]

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

tille pushed a commit to branch master
in repository jellyfish.

commit be1faa6d21f02396da459a5a7dd7c374a9719c4a
Author: Andreas Tille <tille at debian.org>
Date:   Tue Nov 10 21:56:49 2015 +0100

    New upstream version (upstream applied patches)
---
 debian/changelog                                   |  6 ++++
 .../a3c491af4b02086cf13269eb5df8266a748e1c7c.patch | 38 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ba93c57..7122b28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jellyfish (2.2.4-1) UNRELEASED; urgency=medium
+
+  * New upstream version
+
+ -- Andreas Tille <tille at debian.org>  Tue, 10 Nov 2015 21:54:26 +0100
+
 jellyfish (2.2.3-3) unstable; urgency=medium
 
   * team upload
diff --git a/debian/patches/a3c491af4b02086cf13269eb5df8266a748e1c7c.patch b/debian/patches/a3c491af4b02086cf13269eb5df8266a748e1c7c.patch
deleted file mode 100644
index 22d8fdc..0000000
--- a/debian/patches/a3c491af4b02086cf13269eb5df8266a748e1c7c.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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.
-Origin: https://github.com/gmarcais/Jellyfish/commit/a3c491af4b02086cf13269eb5df8266a748e1c7c.patch
-Bug-Debian: #795847
-
----
- 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
deleted file mode 100644
index d1a3f20..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-a3c491af4b02086cf13269eb5df8266a748e1c7c.patch

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