[liblas] 05/10: Disable GCC-5 changes.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository liblas.

commit 64c03f0971c71ca3701b695dd45be4c1f4a8fd46
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jul 4 22:04:35 2015 +0200

    Disable GCC-5 changes.
---
 debian/changelog      | 7 -------
 debian/patches/series | 2 +-
 debian/rules          | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 13605c5..72ac22d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-liblas (1.8.0-3) UNRELEASED; urgency=medium
-
-  * Append -D_GLIBCXX_USE_CXX11_ABI=0 to CXXFLAGS to fix build with GCC 5.
-    (closes: 777955)
-
- -- Bas Couwenberg <sebastic at debian.org>  Sun, 28 Jun 2015 00:18:19 +0200
-
 liblas (1.8.0-2) unstable; urgency=medium
 
   * Update symbols for: arm64, armel, armhf, hurd-i386, i386, kfreebsd-i386,
diff --git a/debian/patches/series b/debian/patches/series
index e900c05..ab17c1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 fix_library_search
 accommodate-typo
-disable-bigfile_boost_iostreams_test.patch
+#disable-bigfile_boost_iostreams_test.patch
diff --git a/debian/rules b/debian/rules
index b0c0d98..f0c21ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ BUILD_DATE=$(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date
 MANPAGES:=$(wildcard debian/man/*.*.xml)
 
 #777955: liblas: ftbfs with GCC-5
-CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
+#CXXFLAGS += -D_GLIBCXX_USE_CXX11_ABI=0
 
 %:
 	dh $@ --buildsystem cmake \

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