[SCM] shapelib branch, master, updated. upstream/1.2.10-16-g9df21f8

[Arto Jantunen]

The following commit has been merged in the master branch:
commit 9df21f82c5f3a453ce70ddb88af8c08db548e51a
Author: Arto Jantunen <viiru at debian.org>
Date:   Tue May 8 14:32:26 2012 +0300

    Add patch to stop setting CFLAGS in the Makefile, allowing debhelper to set it instead
    
    This makes the package obey DEB_BUILD_OPTIONS, enables some hardening features, etc.

diff --git a/debian/patches/0006-Stop-setting-CFLAGS-in-the-Makefile.patch b/debian/patches/0006-Stop-setting-CFLAGS-in-the-Makefile.patch
new file mode 100644
index 0000000..81e167d
--- /dev/null
+++ b/debian/patches/0006-Stop-setting-CFLAGS-in-the-Makefile.patch
@@ -0,0 +1,21 @@
+From: Arto Jantunen <viiru at debian.org>
+Date: Tue, 8 May 2012 14:31:56 +0300
+Subject: [PATCH] Stop setting CFLAGS in the Makefile
+
+---
+ Makefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 3e53d15..6a614f1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ 
+ #LINKOPT	=	/usr/local/lib/libdbmalloc.a
+-CFLAGS	=	-g
++#CFLAGS	=	-g
+ 
+ default:	all
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index c9d3362..f2754e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-Thread-safety-fixes.patch
 0004-Properly-use-libtool.patch
 0005-Dynamically-link-the-shp-binaries-to-libshp.patch
+0006-Stop-setting-CFLAGS-in-the-Makefile.patch

-- 
Library for reading and writing ArcView Shapefiles