[med-svn] [physamp] 01/01: Added unforce-cxxflags.patch.

[Julien Dutheil]

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

jdutheil-guest pushed a commit to branch master
in repository physamp.

commit 0a05c7efbadc34c3c00adb4dc38849a32fab1e52
Author: Julien Y. Dutheil <dutheil at evolbio.mpg.de>
Date:   Wed Aug 9 23:26:27 2017 +0200

    Added unforce-cxxflags.patch.
---
 debian/changelog                      |  5 +++--
 debian/patches/series                 |  1 +
 debian/patches/unforce-cxxflags.patch | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1409aec..806024e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-physamp (1.0.2-2) UNRELEASED; urgency=medium
+physamp (1.0.2-2.1) UNRELEASED; urgency=medium
 
   * Non-maintainer upload.
   * Added bppsuite conflict statement
   * Updated description to include bppPhySamp program.
+  * Does not override debian cxx flags anymore.
 
- -- Julien Y. Dutheil <julien.dutheil at univ-montp2.fr>  Sat, 05 Aug 2017 21:15:07 +0200
+ -- Julien Dutheil <julien.dutheil at univ-montp2.fr>  Wed, 09 Aug 2017 23:25:04 +0200
 
 physamp (1.0.2-1) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..af33dcc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+unforce-cxxflags.patch
diff --git a/debian/patches/unforce-cxxflags.patch b/debian/patches/unforce-cxxflags.patch
new file mode 100644
index 0000000..4aafc82
--- /dev/null
+++ b/debian/patches/unforce-cxxflags.patch
@@ -0,0 +1,17 @@
+From: Gert Wollny <gw.fossdev at gmail.com>
+Date: Wed, 29 Jun 2014 16:52:43 +0200
+Subject: Do not override Debian CXX flags
+Comment: Upstream version 2.3.0 now has additional -std=c++11 which might
+         be needed to be added explicitly
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
+ PROJECT(physamp CXX)
+ 
+ # Compile options
+-SET (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Weffc++ -Wshadow -Wconversion")
++# SET (CMAKE_CXX_FLAGS "-std=c++11 -Wall -Weffc++ -Wshadow -Wconversion")
+ 
+ IF(NOT CMAKE_BUILD_TYPE)
+   SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/physamp.git