[SCM] Qt 4 packaging branch, master, updated. debian/4.8.7+dfsg-6-7-gc633d0e

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=c633d0e

The following commit has been merged in the master branch:
commit c633d0e851ae64de8e55a592aee17fae7d8ae51a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 4 00:24:58 2016 +0000

    Set std=gnu++98 to workaround class std::auto_ptr deprecation in GCC6
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index afa5863..ac9b0f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ qt4-x11 (4:4.8.7+dfsg-7) UNRELEASED; urgency=medium
     issues while building with GCC6.
   * Apply Better-handling-of-invalid-font-tables.patch, which is a backport
     from Qt 5 meant to improve the handling of invalid font tables.
+  * Set std=gnu++98 to workaround class std::auto_ptr deprecation in GCC6, also
+    hinted by Fedora's packaging.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 21 Mar 2016 21:26:26 +0100
 
diff --git a/debian/rules b/debian/rules
index e9f64ca..5a88c75 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export QTDIR := $(shell pwd)
 export PATH := $(QTDIR)/bin:$(PATH)
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
-export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
+export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -std=gnu++98
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 # workaround to use lrelease.
 export LD_LIBRARY_PATH := $(QTDIR)/lib:$(LD_LIBRARY_PATH)

-- 
Qt 4 packaging