[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.2.1-2-5-g347b097

[Giovanni Mascellani]

The following commit has been merged in the debian branch:
commit 4b510b78c8abc664744438be67a6875cfa62ab68
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Jun 15 10:27:29 2012 +0200

    Patch to fix build flags.

diff --git a/debian/changelog b/debian/changelog
index ffc9194..13b6430 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ osmpbf (1.2.1-3) unstable; urgency=low
     (closes: #676059).
   * Bump Standards-Version to 3.9.3 (no changes required).
   * Update copyright years.
+  * Fix Makefile so Debian build flags are honoured.
 
  -- Giovanni Mascellani <gio at debian.org>  Fri, 15 Jun 2012 10:04:57 +0200
 
diff --git a/debian/patches/build_flags b/debian/patches/build_flags
new file mode 100644
index 0000000..41809c2
--- /dev/null
+++ b/debian/patches/build_flags
@@ -0,0 +1,26 @@
+Index: osmpbf/tools/Makefile
+===================================================================
+--- osmpbf.orig/tools/Makefile	2012-06-15 10:35:26.000000000 +0200
++++ osmpbf/tools/Makefile	2012-06-15 10:35:43.000000000 +0200
+@@ -1,7 +1,7 @@
+ 
+ CXX = g++
+-CXXFLAGS = -g -I../include
+-LDFLAGS = -L../src -lpthread -lz -lprotobuf-lite -losmpbf
++CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) -g -I../include
++LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) -L../src -lpthread -lz -lprotobuf-lite -losmpbf
+ 
+ all: osmpbf-outline
+ 
+Index: osmpbf/src/Makefile
+===================================================================
+--- osmpbf.orig/src/Makefile	2012-06-15 10:36:30.000000000 +0200
++++ osmpbf/src/Makefile	2012-06-15 10:36:43.000000000 +0200
+@@ -1,6 +1,6 @@
+ 
+ CXX = g++
+-CXXFLAGS = -O3
++CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS) -O3
+ AR = ar
+ 
+ all: libosmpbf.a ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..64c4d9f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+build_flags

-- 
Java library to access OpenStreetMap PDF file format