[med-svn] r20022 - in trunk/packages/mapsembler2/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-09-01 09:18:19 +0000 (Tue, 01 Sep 2015)
New Revision: 20022

Added:
   trunk/packages/mapsembler2/trunk/debian/patches/gcc-5.patch
Modified:
   trunk/packages/mapsembler2/trunk/debian/changelog
   trunk/packages/mapsembler2/trunk/debian/patches/series
Log:
Fix type of prefix_trashable since gcc-5 is picky about it


Modified: trunk/packages/mapsembler2/trunk/debian/changelog
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/changelog	2015-09-01 09:17:18 UTC (rev 20021)
+++ trunk/packages/mapsembler2/trunk/debian/changelog	2015-09-01 09:18:19 UTC (rev 20022)
@@ -1,3 +1,11 @@
+mapsembler2 (2.2.3+dfsg-3) UNRELEASED; urgency=medium
+
+  * Fix type of prefix_trashable since gcc-5 is picky about it (Thanks to
+    Gianfranco Costamagna <costamagnagianfranco at yahoo.it> for the hint)
+    Closes: #797526
+
+ -- Andreas Tille <tille at debian.org>  Tue, 01 Sep 2015 11:12:52 +0200
+
 mapsembler2 (2.2.3+dfsg-2) unstable; urgency=medium
 
   * Some DEP5 fixes

Added: trunk/packages/mapsembler2/trunk/debian/patches/gcc-5.patch
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/patches/gcc-5.patch	                        (rev 0)
+++ trunk/packages/mapsembler2/trunk/debian/patches/gcc-5.patch	2015-09-01 09:18:19 UTC (rev 20022)
@@ -0,0 +1,26 @@
+Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Last-Update: Tue, 1 Sep 2015 08:34:33 +0000 (UTC)
+Bug-Debian: http://bugs.debian.org/797526
+Forwarded-Upstream: yes
+Description: Fix type of prefix_trashable since gcc-5 is picky about it
+
+--- a/mapsembler2_extend/mapsembler_extend.cpp
++++ b/mapsembler2_extend/mapsembler_extend.cpp
+@@ -34,7 +34,7 @@ int order=0; // in kissnp, don't change
+ #include "commons.h"
+ 
+ extern int size_seeds;
+-extern string prefix_trashable;
++extern char* prefix_trashable;
+ using namespace std;
+ 
+ /////////////////////// FOR MINIA //////////////////
+@@ -317,7 +317,7 @@ int main(int argc, char *argv[])
+     
+     // CLEANING THE TEMP FILES
+     string command;
+-    command = string("rm -f ")+prefix_trashable.c_str()+string("*"); system((char *)command.c_str());
++    command = string("rm -f ")+string(prefix_trashable)+string("*"); system((char *)command.c_str());
+ 
+     
+     STOPWALL(0,"Total");

Modified: trunk/packages/mapsembler2/trunk/debian/patches/series
===================================================================
--- trunk/packages/mapsembler2/trunk/debian/patches/series	2015-09-01 09:17:18 UTC (rev 20021)
+++ trunk/packages/mapsembler2/trunk/debian/patches/series	2015-09-01 09:18:19 UTC (rev 20022)
@@ -2,3 +2,4 @@
 run_pipeline
 add_hardening
 skip_mphe
+gcc-5.patch