[mapnik] 05/08: Drop 2001_ftemplate-depth.patch, applied upstream.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Fri Feb 26 22:40:43 UTC 2016


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

sebastic pushed a commit to branch master
in repository mapnik.

commit 9c07b0cbf2878a8e93189fb57eb97859ea4ca96e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Feb 26 20:01:37 2016 +0100

    Drop 2001_ftemplate-depth.patch, applied upstream.
---
 debian/changelog                          |  1 +
 debian/patches/2001_ftemplate-depth.patch | 16 ----------------
 debian/patches/series                     |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5e4342..1964fb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ mapnik (3.0.10+ds-1) UNRELEASED; urgency=medium
     those debug files have no debug symbols.
   * Disable parallel builds on alpha, hurd-i386 & kfreebsd-* too.
   * Update copyright years for Artem Pavlenko.
+  * Drop 2001_ftemplate-depth.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 26 Feb 2016 19:48:46 +0100
 
diff --git a/debian/patches/2001_ftemplate-depth.patch b/debian/patches/2001_ftemplate-depth.patch
deleted file mode 100644
index e45f8c9..0000000
--- a/debian/patches/2001_ftemplate-depth.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: remove gcc ftemplate-depth-300 flag
- it can use a lot of memory, and default value works on debian
-Forwarded: not-needed, https://github.com/mapnik/mapnik/commit/b01b21f24
-Author: Jérémy Lal <kapouer at melix.org>
-Last-Update: 2015-06-19
---- a/SConstruct
-+++ b/SConstruct
-@@ -1785,7 +1785,7 @@ if not preconfigured:
- 
-         # Common flags for g++/clang++ CXX compiler.
-         # TODO: clean up code more to make -Wextra -Wsign-compare -Wsign-conversion -Wconversion viable
--        common_cxx_flags = '-Wall %s %s -ftemplate-depth-300 -Wsign-compare -Wshadow ' % (env['WARNING_CXXFLAGS'], pthread)
-+        common_cxx_flags = '-Wall %s %s -Wsign-compare -Wshadow ' % (env['WARNING_CXXFLAGS'], pthread)
- 
-         if env['DEBUG']:
-             env.Append(CXXFLAGS = common_cxx_flags + '-O0')
diff --git a/debian/patches/series b/debian/patches/series
index 0f4fbe2..5d213c7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-2001_ftemplate-depth.patch
 initialize-typo.patch
 occurred-typo.patch

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



More information about the Pkg-grass-devel mailing list