[saga] 05/11: Remove patch (included upstream)

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch experimental
in repository saga.

commit da6f6f2084bcfe50fe7e5118632d7c7851ae6107
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Fri Oct 31 21:34:03 2014 +0100

    Remove patch (included upstream)
---
 .../0001-Fix-gcc-errors-from-upstream.patch        | 48 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 49 deletions(-)

diff --git a/debian/patches/0001-Fix-gcc-errors-from-upstream.patch b/debian/patches/0001-Fix-gcc-errors-from-upstream.patch
deleted file mode 100644
index b748d49..0000000
--- a/debian/patches/0001-Fix-gcc-errors-from-upstream.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Volker Wichmann <wichmann at laserdata.at>
-Subject: errfunc.c: fix bug, refers to bug #191 Missing format strings
-Bug:http://sourceforge.net/p/saga-gis/bugs/191/
-Origin: upstream, http://sourceforge.net/p/saga-gis/code-0/2133/
----
- src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c b/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c
-index 959b37f..d229221 100644
---- a/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c
-+++ b/src/modules/grid/grid_filter/geodesic_morph_rec/errfunc.c
-@@ -225,7 +225,7 @@ void fehler (int zeile,
-       cp4 = cp2;
-    }
- 
--   fprintf (protfile, cp1);
-+   fprintf (protfile, "%s", cp1);
- 
-    if (fil -> art == 'E')
-    {
-@@ -415,7 +415,7 @@ void error_message (int zeile,
-       cp4 = cp2;
-    }
- 
--   sprintf (fmessage + sl_all, cp1);
-+   sprintf (fmessage + sl_all, "%s", cp1);
-    sl_all = strlen (fmessage);
-    
-    sl_alt = strlen (*error_list);
-@@ -577,7 +577,7 @@ void fehler2 (int zeile,
- 
-    va_end (ap);
- 
--   fprintf (protfile, cp1);
-+   fprintf (protfile, "%s", cp1);
- 
-    if (fil -> art == 'E')
-    {
-@@ -756,7 +756,7 @@ void fehler3 (int zeile,
- 
-    va_end (ap);
- 
--   sprintf (fmessage + sl_all, cp1);
-+   sprintf (fmessage + sl_all, "%s", cp1);
-    sl_all = strlen (fmessage);
-    
-    sl_alt = strlen (*error_list);
diff --git a/debian/patches/series b/debian/patches/series
index 9c59c65..b2e5377 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-Fix-gcc-errors-from-upstream.patch
 0002-Remove-references-to-libfire.patch
 0003-Use-debian-version-of-grib2.patch
 0004-Use-qhull-instead-of-triangle.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git