[magics] 02/02: disable c++11 changes for first release

[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 9a2741fb9cb52c7658b6603ed4f003cdd76a66a6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Mar 29 10:40:02 2016 +0100

    disable c++11 changes for first release
---
 debian/changelog      | 3 +--
 debian/patches/series | 2 +-
 debian/rules          | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ac1579..91add04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,8 @@ magics++ (2.28.0-1) unstable; urgency=medium
   * New upstream release.
   * Refresh patches:
     - compile-fixes.patch: fixed upstream
-  * Move auto_ptr -> unique_ptr for c++11 (G++ 6) move
 
- -- Alastair McKinstry <mckinstry at debian.org>  Tue, 22 Mar 2016 18:44:16 +0000
+ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 29 Mar 2016 07:44:16 +0000
 
 magics++ (2.26.2-3) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index 2d4a019..cedf697 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,5 @@ soname-version.patch
 reproducibility.patch
 pkgconfig-fix.patch
 cmake-config.patch
-unique-ptr.patch
+#unique-ptr.patch
 compile-fixes.patch
diff --git a/debian/rules b/debian/rules
index 90d9ad1..4a5aa40 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ BUILDDIR = $(CURDIR)/debian/build
 
 # 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++11
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export QT_SELECT=5

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