[SCM] osmium branch, master, updated. debian/0.0_20111213-g7f3500a-3-6-ga916292

[Andreas Tille]

The following commit has been merged in the master branch:
commit a916292710ded627c15f2fcd3ce6e7b6ac68460c
Author: Andreas Tille <tille at debian.org>
Date:   Tue Dec 17 20:19:53 2013 +0100

    Propagate hardening options

diff --git a/debian/changelog b/debian/changelog
index ec48650..4732f66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ osmium (0.0~20111213-g7f3500a-4) UNRELEASED; urgency=medium
     - Priority: optional
     - debhelper 9
     - Make Debian GIS maintainer of the package
+  * debian/patches/04-hardening.patch: Propagate hardening options
 
  -- Andreas Tille <tille at debian.org>  Tue, 17 Dec 2013 17:27:00 +0100
 
diff --git a/debian/patches/04-hardening.patch b/debian/patches/04-hardening.patch
new file mode 100644
index 0000000..e5ec8d2
--- /dev/null
+++ b/debian/patches/04-hardening.patch
@@ -0,0 +1,15 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 17 Dec 2013 17:27:00 +0100
+Description: Propagate hardening options
+
+--- osmium.orig/osmjs/Makefile
++++ osmium/osmjs/Makefile
+@@ -26,7 +26,7 @@
+ 
+ CXXFLAGS += -I../include
+ 
+-LDFLAGS = -L/usr/local/lib -lexpat -lpthread
++LDFLAGS += -L/usr/local/lib -lexpat -lpthread
+ LDFLAGS += $(shell geos-config --libs)
+ 
+ LIB_V8       = -lv8 -licuuc
diff --git a/debian/patches/series b/debian/patches/series
index 2369b95..76e177e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 01-fix_ld--as-needed.patch
 02-support_new_libgeos++.patch
 03-disable_building_docs.patch
+04-hardening.patch

-- 
C++ framework for working with OSM data files