[Debichem-devel] Bug#853351: libmstoolkit: diff for NMU version 77.0.0-1.1

[Gilles Filippini]

Control: tags 853351 + pending

Dear maintainer,

I've prepared an NMU for libmstoolkit (versioned as 77.0.0-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards,

_g.

diff -Nru libmstoolkit-77.0.0/debian/changelog libmstoolkit-77.0.0/debian/changelog
--- libmstoolkit-77.0.0/debian/changelog	2015-09-25 15:20:00.000000000 +0200
+++ libmstoolkit-77.0.0/debian/changelog	2017-11-02 22:42:31.000000000 +0100
@@ -1,3 +1,10 @@
+libmstoolkit (77.0.0-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * New patch gcc-7.patch: fix FTBFS with GCC-7 (closes: #853351)
+
+ -- Gilles Filippini <pini at debian.org>  Thu, 02 Nov 2017 22:42:31 +0100
+
 libmstoolkit (77.0.0-1) unstable; urgency=medium
 
   * New upstream version;
diff -Nru libmstoolkit-77.0.0/debian/patches/gcc-7.patch libmstoolkit-77.0.0/debian/patches/gcc-7.patch
--- libmstoolkit-77.0.0/debian/patches/gcc-7.patch	1970-01-01 01:00:00.000000000 +0100
+++ libmstoolkit-77.0.0/debian/patches/gcc-7.patch	2017-10-12 21:39:30.000000000 +0200
@@ -0,0 +1,26 @@
+Index: libmstoolkit/include/MSReader.h
+===================================================================
+--- libmstoolkit.orig/include/MSReader.h
++++ libmstoolkit/include/MSReader.h
+@@ -82,7 +82,7 @@ class MSReader {
+   void setPrecisionInt(int i);
+   void setPrecisionMZ(int i);
+   void writeFile(const char* c, bool text, MSObject& m);
+-  void writeFile(const char* c, MSFileFormat ff, MSObject& m, char* sha1Report='\0');
++  void writeFile(const char* c, MSFileFormat ff, MSObject& m, char* sha1Report=NULL);
+ 
+   bool readMSTFile(const char* c, bool text, Spectrum& s, int scNum=0);
+   bool readMZPFile(const char* c, Spectrum& s, int scNum=0);
+Index: libmstoolkit/src/MSToolkit/MSReader.cpp
+===================================================================
+--- libmstoolkit.orig/src/MSToolkit/MSReader.cpp
++++ libmstoolkit/src/MSToolkit/MSReader.cpp
+@@ -688,7 +688,7 @@ void MSReader::writeSqlite(const char* c
+   string instrumentType="=";
+   for(int i=0; i<16; i++)
+     {
+-      if(m.getHeader().header[i] != '\0')
++      if(m.getHeader().header[i] != NULL)
+ 	{
+ 	  string headerLine = m.getHeader().header[i];
+ 	  if(headerLine.find("CreationDate") != string::npos)
diff -Nru libmstoolkit-77.0.0/debian/patches/series libmstoolkit-77.0.0/debian/patches/series
--- libmstoolkit-77.0.0/debian/patches/series	2015-09-25 15:20:00.000000000 +0200
+++ libmstoolkit-77.0.0/debian/patches/series	2017-10-12 21:39:30.000000000 +0200
@@ -1,2 +1,3 @@
 makefile.patch
 
+gcc-7.patch