[med-svn] [hyphy] 02/02: Update changelog

[Andreas Tille]

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

tille pushed a commit to branch master
in repository hyphy.

commit d4a66a8686e947006b4c3c10c9391ca1e69f86ab
Author: Andreas Tille <tille at debian.org>
Date:   Mon Aug 15 12:45:44 2016 +0200

    Update changelog
---
 debian/changelog                              |  6 ++--
 debian/patches/gcc-6.1_false_is_not_nil.patch | 50 +++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 26d87bd..217735c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-hyphy (2.2.6+dfsg-5) UNRELEASED; urgency=medium
+hyphy (2.2.6+dfsg-5) unstable; urgency=medium
 
   * Fix error: narrowing conversion from 'double' to 'unsigned char'
+  * Fix error: replacing false with nil 
+    Closes: #811866
 
- -- Andreas Tille <tille at debian.org>  Sun, 14 Aug 2016 21:44:17 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 15 Aug 2016 12:44:58 +0200
 
 hyphy (2.2.6+dfsg-4) unstable; urgency=medium
 
diff --git a/debian/patches/gcc-6.1_false_is_not_nil.patch b/debian/patches/gcc-6.1_false_is_not_nil.patch
new file mode 100644
index 0000000..6a62861
--- /dev/null
+++ b/debian/patches/gcc-6.1_false_is_not_nil.patch
@@ -0,0 +1,50 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Sun, 14 Aug 2016 21:42:54 +0200
+Bug-Debian: https://bugs.debian.org/811866
+Description: Previous versions of the compiler allow conversion from false to
+ a null pointer, so this used to work, though maybe with a warning.  Replacing
+ false with nil fixed this.
+ Thanks for the hint to Jason Crain <jason at inspiresomeone.us>
+
+--- a/src/gui/HYChartWindow.cpp
++++ b/src/gui/HYChartWindow.cpp
+@@ -3007,7 +3007,7 @@ bool    ReadDataFromFile (_String fileNa
+             for (long k=0; k<columns; k++) {
+                 _String * thisString = (_String*)readStrings (lastRead*columns+k);
+                 if ((thisString->sLength)&&(thisString->FirstNonSpaceIndex (0,-1)>=0)) {
+-                    _Formula f (*thisString,nil,false);
++                    _Formula f (*thisString,nil,nil);
+                     v.SetValue (k);
+                     if (!f.IsEmpty()) {
+                         data.MStore (&h,&v,f);
+@@ -4527,7 +4527,7 @@ void    _HYDistributionChartWindow::AddV
+ 
+         aPrompt = newExpression;
+ 
+-        _Formula f (newExpression, nil,false);
++        _Formula f (newExpression, nil, nil);
+ 
+         if (f.IsEmpty()) {
+             newExpression = _String("Failed to parse the expression :") & aPrompt;
+--- a/src/gui/gtk/WindowClasses/HYPlatformModelWindow.cpp
++++ b/src/gui/gtk/WindowClasses/HYPlatformModelWindow.cpp
+@@ -173,7 +173,7 @@ bool _HYModelWindow::_CheckClipboard (vo
+     {
+         _String cText ((char*)scrapHandle);
+         skipWarningMessages = true;
+-        _Formula f (cText,nil,false);
++        _Formula f (cText,nil,nil);
+         skipWarningMessages = false;
+         if (f.GetList().lLength)
+         {
+--- a/src/gui/HYModelWindow.cpp
++++ b/src/gui/HYModelWindow.cpp
+@@ -857,7 +857,7 @@ bool    _HYModelWindow::ProcessEvent (_H
+             _HYButtonBar* bb3 = (_HYButtonBar*)GetCellObject (MODEL_BUTTON_ROW,6);
+ 
+             _String cText (tl->GetText());
+-            _Formula f (cText,nil,false);
++            _Formula f (cText,nil,nil);
+             if (f.GetList().lLength) {
+                 clipboardString = cText;
+                 SyncEditBox ();

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