[SCM] osmctools branch, master, updated. upstream/0.1-18-g5904def

[Pierre Blanc]

The following commit has been merged in the master branch:
commit 65e0700aaac50fb12bbe65d9ae75b5c116d89b1d
Author: Pierre Blanc <pierreblanc75 at gmail.com>
Date:   Tue Jan 21 21:13:55 2014 +0100

    Fix FTBTS for LDFLAGS
    
    Don't use osmconvert_LDFLAGS to specify libraries to
    link with, use osmconvert_LDADD instead (fixes FTBFS).

diff --git a/debian/patches/ld-as-needed.patch b/debian/patches/ld-as-needed.patch
new file mode 100644
index 0000000..541f923
--- /dev/null
+++ b/debian/patches/ld-as-needed.patch
@@ -0,0 +1,16 @@
+From: Michael Bienia 
+Date: Thu, 21 Jan 2014 21:00:08 +0200
+Subject: Don't use osmconvert_LDFLAGS to specify libraries to
+link with, use osmconvert_LDADD instead (fixes FTBFS).
+
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -6,7 +6,7 @@
+ 
+ if ENABLE_OSMCONVERT
+ osmconvert_SOURCES = osmconvert.c
+-osmconvert_LDFLAGS = -lz
++osmconvert_LDADD = -lz
+ endif
+ 
+ osmfilter_SOURCES = osmfilter.c
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..abff4f8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+ld-as-needed.patch

-- 
Some tools to manipulate OpenStreetMap files