[onboard] 01/01: Update 0002_build-with-gcc6.patch with version accepted upstream

[Jeremy Bicha]

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

jbicha-guest pushed a commit to branch master
in repository onboard.

commit cce204022722bc8c70e5f27850a7154f6a0c00cf
Author: Jeremy Bicha <jbicha at ubuntu.com>
Date:   Sat Jul 30 17:49:18 2016 -0400

    Update 0002_build-with-gcc6.patch with version accepted upstream
---
 debian/patches/0002_build-with-gcc6.patch | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/debian/patches/0002_build-with-gcc6.patch b/debian/patches/0002_build-with-gcc6.patch
index 48220ee..b66a73b 100644
--- a/debian/patches/0002_build-with-gcc6.patch
+++ b/debian/patches/0002_build-with-gcc6.patch
@@ -1,16 +1,20 @@
 Description: Fix build with GCC 6
-Forwarded: https://code.launchpad.net/~jbicha/onboard/build-with-gcc-6/+merge/298729
+Forwarded: https://bazaar.launchpad.net/~onboard/onboard/trunk/revision/2155
 Origin: https://git.archlinux.org/svntogit/community.git/tree/trunk/gcc6.diff?h=packages/onboard
 Bug-Debian: https://bugs.debian.org/812033
---- onboard-1.2.0/Onboard/pypredict/lm/lm_dynamic_cached.h	2016-02-18 14:31:51.000000000 +0100
-+++ /tmp/lm_dynamic_cached.h.new	2016-06-14 19:04:23.924349370 +0200
-@@ -224,7 +224,7 @@
+--- Onboard/pypredict/lm/lm_dynamic_cached.h	2016-06-30 02:31:38 +0000
++++ Onboard/pypredict/lm/lm_dynamic_cached.h	2016-07-03 23:13:59 +0000
+@@ -224,10 +224,11 @@
      public:
          typedef _DynamicModelKN<TNGRAMS> Base;
          static const Smoothing DEFAULT_SMOOTHING = ABS_DISC_I;
--        static const double DEFAULT_LAMBDA = 0.3;  // Jelinek-Mercer weights
-+        const double DEFAULT_LAMBDA = 0.3;  // Jelinek-Mercer weights
+-        const double DEFAULT_LAMBDA = 0.3;  // Jelinek-Mercer weights
++        const double DEFAULT_LAMBDA;  // default for Jelinek-Mercer weights
  
      public:
-         _CachedDynamicModel()
-
+-        _CachedDynamicModel()
++        _CachedDynamicModel() :
++            DEFAULT_LAMBDA(0.3)
+         {
+             this->smoothing = DEFAULT_SMOOTHING;
+             recency_smoothing = JELINEK_MERCER_I;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/onboard.git