[magics] 29/63: Undo g++ changes for now. Closes: #830467.

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository magics.

commit 5e7813434f1154e4d0c8247bfbb38466808534cf
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sat Jul 9 09:19:45 2016 +0100

    Undo g++ changes for now. Closes: #830467.
---
 debian/changelog      | 5 +++--
 debian/patches/series | 2 +-
 debian/rules          | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f59fec4..b415af5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-magics++ (2.29.2-1) UNRELEASED; urgency=medium
+magics++ (2.29.2-1) unstable; urgency=medium
 
   * New upstream release
    - compile_fixes.patch merged upstream
@@ -6,8 +6,9 @@ magics++ (2.29.2-1) UNRELEASED; urgency=medium
   * Fix python3 support: indentation errors in macro.py. Closes: #827850.
   * Loosen the libemos-dev depends, to allow backports
   * Set LC_ALL=C during build to aid reproducibility
+  * Undo g++ changes for now. Closes: #830467.
 
- -- Alastair McKinstry <mckinstry at debian.org>  Tue, 05 Jul 2016 16:07:22 +0100
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 08 Jul 2016 22:28:12 +0100
 
 magics++ (2.28.0-4) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 4b600a5..289b14d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,5 +4,5 @@ soname-version.patch
 reproducibility.patch
 pkgconfig-fix.patch
 cmake-config.patch
-unique-ptr.patch
+#unique-ptr.patch
 numpy-fixes.patch
diff --git a/debian/rules b/debian/rules
index 988cbe7..8aaa3a8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ export DH_VERBOSE=1
 
 # To enable all, uncomment following line
 # DEB_BUILD_MAINT_OPTIONS:= hardening=+all,-pie
-CXXFLAGS:= -fPIC $(shell dpkg-buildflags --get CXXFLAGS) -std=c++11
+CXXFLAGS:= -fPIC $(shell dpkg-buildflags --get CXXFLAGS) # -std=c++14
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Set for build reproducibility

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/magics.git