[med-svn] [Git][med-team/spades][master] 2 commits: Re-add utils/perf/memory_limit.hpp to patch

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / spades


Commits:
4f8a3f26 by Andreas Tille at 2018-07-18T13:53:26+02:00
Re-add utils/perf/memory_limit.hpp to patch

- - - - -
3e6039ea by Andreas Tille at 2018-07-18T14:22:17+02:00
New version fixes gcc-8 issue

- - - - -


2 changed files:

- debian/changelog
- debian/patches/0114_use_debian_provided_libs.patch


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 spades (3.12.0+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream version
+    Closes: #897867
   * Fix watch file
   * Standards-Version: 4.1.5
   * Add dh-python


=====================================
debian/patches/0114_use_debian_provided_libs.patch
=====================================
--- a/debian/patches/0114_use_debian_provided_libs.patch
+++ b/debian/patches/0114_use_debian_provided_libs.patch
@@ -60,7 +60,15 @@ Author: Sascha Steinbiss <satta at debian.org>
  
 --- a/src/common/utils/logger/logger_impl.cpp
 +++ b/src/common/utils/logger/logger_impl.cpp
-@@ -105,15 +105,16 @@ void logger::log(level desired_level, co
+@@ -14,6 +14,7 @@
+ 
+ #include "utils/logger/logger.hpp"
+ #include "utils/perf/memory.hpp"
++#include "utils/memory_limit.hpp"
+ 
+ #include "config.hpp"
+ 
+@@ -105,15 +106,16 @@ void logger::log(level desired_level, co
    size_t max_rss;
  
  #ifdef SPADES_USE_JEMALLOC



View it on GitLab: https://salsa.debian.org/med-team/spades/compare/5beddfd8ec8097b07ba8adfee7ceb0d35e189429...3e6039eac2ea4b977d2e53ce09313628853f03fe

-- 
View it on GitLab: https://salsa.debian.org/med-team/spades/compare/5beddfd8ec8097b07ba8adfee7ceb0d35e189429...3e6039eac2ea4b977d2e53ce09313628853f03fe
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/20180718/52fb1fe8/attachment.html>