The following commit has been merged in the master branch: commit 789b795728917cefaae3935e5dd3b81644909b80 Author: Johan Van de Wauw <johan.vandew...@gmail.com> Date: Thu Jan 9 11:10:23 2014 -0500
Remove patch (included upstream) diff --git a/debian/patches/0005-Fix-gcc-security-warnings.patch b/debian/patches/0005-Fix-gcc-security-warnings.patch deleted file mode 100644 index 71621f0..0000000 --- a/debian/patches/0005-Fix-gcc-security-warnings.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Johan Van de Wauw <johan.vandew...@gmail.com> -Date: Fri, 15 Nov 2013 01:57:38 -0500 -Subject: Fix gcc security warnings - ---- - src/modules_io/grid/io_grid/esri_arcinfo.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/modules_io/grid/io_grid/esri_arcinfo.cpp b/src/modules_io/grid/io_grid/esri_arcinfo.cpp -index 477dd41..970eb71 100644 ---- a/src/modules_io/grid/io_grid/esri_arcinfo.cpp -+++ b/src/modules_io/grid/io_grid/esri_arcinfo.cpp -@@ -594,13 +594,13 @@ bool CESRI_ArcInfo_Export::On_Execute(void) - { - if( x > 0 ) - { -- fprintf(Stream.Get_Stream(), " "); -+ fputs(" ",Stream.Get_Stream()); - } - -- fprintf(Stream.Get_Stream(), Write_Value(pGrid->asDouble(x, y), Precision, bComma).b_str()); -+ fputs(Write_Value(pGrid->asDouble(x, y), Precision, bComma).b_str(),Stream.Get_Stream()); - } - -- fprintf(Stream.Get_Stream(), "\n"); -+ fputs("\n", Stream.Get_Stream()); - } - - pGrid->Get_Projection().Save(SG_File_Make_Path(NULL, fName, SG_T("prj"))); -@@ -671,7 +671,7 @@ bool CESRI_ArcInfo_Export::Write_Header(CSG_File &Stream, CSG_Grid *pGrid, bool - s += CSG_String::Format(SG_T("%s %s\n") , HDR_BYTEORDER , Parameters("BYTEORD")->asInt() == 1 ? HDR_BYTEORDER_LO : HDR_BYTEORDER_HI); - } - -- fprintf(Stream.Get_Stream(), s.b_str()); -+ fputs(s.b_str(),Stream.Get_Stream()); - - return( true ); - } diff --git a/debian/patches/series b/debian/patches/series index bc3353f..dc36a48 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ 0001-Remove-references-to-libfire.patch 0002-Use-debian-version-of-grib2.patch 0004-Use-qhull-instead-of-triangle.patch -0005-Fix-gcc-security-warnings.patch -- Saga GIS _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel