[med-svn] r22816 - in trunk/packages/mssstest/trunk/debian: . patches

[Sascha Steinbiss]

Author: satta
Date: 2016-09-17 14:32:45 +0000 (Sat, 17 Sep 2016)
New Revision: 22816

Added:
   trunk/packages/mssstest/trunk/debian/patches/gcc6.patch
Modified:
   trunk/packages/mssstest/trunk/debian/README.Debian
   trunk/packages/mssstest/trunk/debian/changelog
   trunk/packages/mssstest/trunk/debian/control
   trunk/packages/mssstest/trunk/debian/patches/hardening.patch
   trunk/packages/mssstest/trunk/debian/patches/series
   trunk/packages/mssstest/trunk/debian/rules
Log:
fix build on GCC6, housekeeping


Modified: trunk/packages/mssstest/trunk/debian/README.Debian
===================================================================
--- trunk/packages/mssstest/trunk/debian/README.Debian	2016-09-17 14:24:53 UTC (rev 22815)
+++ trunk/packages/mssstest/trunk/debian/README.Debian	2016-09-17 14:32:45 UTC (rev 22816)
@@ -1,7 +1,7 @@
 mssstest for Debian
 -------------------
 
-The orignal source is seeking for two files edss.txt and global.dat
+The original source is seeking for two files edss.txt and global.dat
 in the current directory.  Under Debian these files were moved to
 /usr/share/mssstest and the code was adjusted.  I do not think that
 this change conflicts with the license (Andreas Tille <tille at debian.org>)

Modified: trunk/packages/mssstest/trunk/debian/changelog
===================================================================
--- trunk/packages/mssstest/trunk/debian/changelog	2016-09-17 14:24:53 UTC (rev 22815)
+++ trunk/packages/mssstest/trunk/debian/changelog	2016-09-17 14:32:45 UTC (rev 22816)
@@ -1,3 +1,15 @@
+mssstest (3.0-5) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Fix building with GCC 6.
+    - Add missing qualifier.
+    Closes: #836930
+  * Bump Standards-Version.
+  * Fix typo in README.Debian.
+  * Add full hardening.
+
+ -- Sascha Steinbiss <satta at debian.org>  Sat, 17 Sep 2016 14:25:43 +0000
+
 mssstest (3.0-4) unstable; urgency=low
 
   * debian/upstream/metadata: Added citation information

Modified: trunk/packages/mssstest/trunk/debian/control
===================================================================
--- trunk/packages/mssstest/trunk/debian/control	2016-09-17 14:24:53 UTC (rev 22815)
+++ trunk/packages/mssstest/trunk/debian/control	2016-09-17 14:32:45 UTC (rev 22816)
@@ -6,7 +6,7 @@
 XS-Autobuild: yes
 Priority: optional
 Build-Depends: debhelper (>= 9)
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/mssstest/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/mssstest/trunk/
 Homepage: https://www-gene.cimr.cam.ac.uk/MSgenetics/GAMES/MSSS/index.html

Added: trunk/packages/mssstest/trunk/debian/patches/gcc6.patch
===================================================================
--- trunk/packages/mssstest/trunk/debian/patches/gcc6.patch	                        (rev 0)
+++ trunk/packages/mssstest/trunk/debian/patches/gcc6.patch	2016-09-17 14:32:45 UTC (rev 22816)
@@ -0,0 +1,13 @@
+DescriptionL fix building with GCC6
+Author: Sascha Steinbiss <satta at debian.org>
+--- a/neededroutines.cpp
++++ b/neededroutines.cpp
+@@ -169,7 +169,7 @@
+   int *intranks;
+ 
+   intranks = new int [len+1];
+-  rank(len, arr, intranks);
++  ::rank(len, arr, intranks);
+ 
+   for (i=1; i<=len; i++)
+     ranks[i] = (float) intranks[i];

Modified: trunk/packages/mssstest/trunk/debian/patches/hardening.patch
===================================================================
--- trunk/packages/mssstest/trunk/debian/patches/hardening.patch	2016-09-17 14:24:53 UTC (rev 22815)
+++ trunk/packages/mssstest/trunk/debian/patches/hardening.patch	2016-09-17 14:32:45 UTC (rev 22816)
@@ -4,7 +4,7 @@
 
 --- a/makefile
 +++ b/makefile
-@@ -3,14 +3,14 @@ mi = neededroutines
+@@ -3,14 +3,14 @@
  
  
  mssstest: $(mi).o $(mu).o
@@ -14,11 +14,11 @@
  
  $(mi).o: $(mi).cpp $(mi).h
 -	g++ -c $(mi).cpp  -g -o $(mi).o
-+	g++ $(CXXFLAGS) -c $(mi).cpp  -g -o $(mi).o
++	g++ $(CPPFLAGS) $(CXXFLAGS) -c $(mi).cpp  -g -o $(mi).o
  
  $(mu).o: $(mu).cpp
 -	g++ -c $(mu).cpp  -g -o $(mu).o
-+	g++ $(CXXFLAGS) -c $(mu).cpp  -g -o $(mu).o
++	g++ $(CPPFLAGS) $(CXXFLAGS) -c $(mu).cpp  -g -o $(mu).o
  
  clean:
  	rm -f *.o

Modified: trunk/packages/mssstest/trunk/debian/patches/series
===================================================================
--- trunk/packages/mssstest/trunk/debian/patches/series	2016-09-17 14:24:53 UTC (rev 22815)
+++ trunk/packages/mssstest/trunk/debian/patches/series	2016-09-17 14:32:45 UTC (rev 22816)
@@ -2,3 +2,4 @@
 10_fixdatapath.patch
 10_makefile.patch
 hardening.patch
+gcc6.patch

Modified: trunk/packages/mssstest/trunk/debian/rules
===================================================================
--- trunk/packages/mssstest/trunk/debian/rules	2016-09-17 14:24:53 UTC (rev 22815)
+++ trunk/packages/mssstest/trunk/debian/rules	2016-09-17 14:32:45 UTC (rev 22816)
@@ -2,5 +2,7 @@
 # debian/rules file for mssstest
 # Andreas Tille <tille at debian.org>, GPL
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
 %:
 	dh $@