[osmpbf] 14/16: Drop 00-fix_build_flags.patch, no longer required.

Bas Couwenberg sebastic at xs4all.nl
Tue Mar 11 23:42:14 UTC 2014


This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch debian
in repository osmpbf.

commit fc45680c2efcea2ce118e6754fd0299dd1ae0116
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 11 23:15:24 2014 +0100

    Drop 00-fix_build_flags.patch, no longer required.
---
 debian/changelog                        |  1 +
 debian/patches/00-fix_build_flags.patch | 32 --------------------------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71e218d..99d9a58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ osmpbf (1.3.1-1) UNRELEASED; urgency=medium
   * Use simple makefile buildsystem by default.
   * Use ant buildsystem for java library.
   * Enable parallel builds.
+  * Drop 00-fix_build_flags.patch, no longer required.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Wed, 12 Mar 2014 00:04:57 +0100
 
diff --git a/debian/patches/00-fix_build_flags.patch b/debian/patches/00-fix_build_flags.patch
deleted file mode 100644
index f1dcaca..0000000
--- a/debian/patches/00-fix_build_flags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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++
--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
- 
---- osmpbf.orig/src/Makefile
-+++ osmpbf/src/Makefile
-@@ -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
deleted file mode 100644
index ef3eaa6..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-00-fix_build_flags.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmpbf.git



More information about the Pkg-grass-devel mailing list