[SCM] snaphu branch, master, updated. upstream/1.4.2-14-gdca3f44

[Antonio Valentino]

The following commit has been merged in the master branch:
commit 6745e1b56e88cf30f0bcef94575db2c8b5b9460d
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Thu Dec 27 10:20:15 2012 +0000

    Use hardening flags

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index ad7b257..c123ca7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: non-free/science
 Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Antonio Valentino <antonio.valentino at tiscali.it>
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 9.0.0)
 Standards-Version: 3.9.2
 Homepage: http://www-star.stanford.edu/sar_group/snaphu
 Vcs-Git: git://git.debian.org/git/pkg-grass/snaphu.git
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
new file mode 100644
index 0000000..1dc4f6d
--- /dev/null
+++ b/debian/patches/hardening.patch
@@ -0,0 +1,25 @@
+CFLAGS setup has been modified to extent the settings of the external
+environment.
+CPPFLAGS and LDFLAGS are now used during the build phase.
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -13,8 +13,8 @@
+ # If you specify -D NO_CS2, the program will be compiled without the
+ # CS2 MCF solver module.
+ 
+-CC		=	cc 
+-CFLAGS		=	-O3   # -D NO_CS2
++#CC		=	cc 
++CFLAGS		+=	-O3   # -D NO_CS2
+ LIBS		=	-lm 
+ BINDIR		=	../bin
+ INSTALLDIR	=	/usr/local/bin
+@@ -32,7 +32,7 @@
+ all:		$(SNAPHU)
+ 
+ $(SNAPHU):	snaphu.c $(OBJS) snaphu.h Makefile 
+-		$(CC) $(CFLAGS) \
++		$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
+ 		snaphu.c \
+ 		$(OBJS) \
+ 		-o $(SNAPHU) \
diff --git a/debian/patches/series b/debian/patches/series
index 9a34b00..df7004f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-compilation-warnings.patch
 man-page-hyphens.patch
+hardening.patch

-- 
Statistical-Cost, Netowrk-Flow Algorithm for Phase Unwrapping