[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.2.1-3-14-gc4c3fd0

[David Paleino]

The following commit has been merged in the debian branch:
commit 16981811547d4fbb77a78faee6f55de9d2644d15
Author: David Paleino <dapal at debian.org>
Date:   Mon Jan 28 20:05:55 2013 +0100

    Renamed patch, and added DEP-3 header

diff --git a/debian/patches/build_flags b/debian/patches/00-fix_build_flags.patch
similarity index 53%
rename from debian/patches/build_flags
rename to debian/patches/00-fix_build_flags.patch
index 41809c2..f1dcaca 100644
--- a/debian/patches/build_flags
+++ b/debian/patches/00-fix_build_flags.patch
@@ -1,7 +1,15 @@
-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
+From: Giovanni Mascellani <gio at debian.org>
+Subject: fix Makefile so Debian build flags are honoured.
+Origin: vendor
+Forwarded: not-needed
+
+---
+ src/Makefile   |    2 +-
+ tools/Makefile |    4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- osmpbf.orig/tools/Makefile
++++ osmpbf/tools/Makefile
 @@ -1,7 +1,7 @@
  
  CXX = g++
@@ -12,10 +20,8 @@ Index: osmpbf/tools/Makefile
  
  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
+--- osmpbf.orig/src/Makefile
++++ osmpbf/src/Makefile
 @@ -1,6 +1,6 @@
  
  CXX = g++
diff --git a/debian/patches/series b/debian/patches/series
index 64c4d9f..ef3eaa6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-build_flags
+00-fix_build_flags.patch

-- 
Java library to access OpenStreetMap PDF file format