[SCM] QJson library packaging branch, master, updated. debian/0.7.1-5-4-gd480419

[Lisandro Damián Nicanor Pérez]

The following commit has been merged in the master branch:
commit d480419a1eaa12df20a4cc6d723e3cad7a6c7fec
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Nov 7 22:44:36 2011 -0300

    Use DEB_CXXFLAGS_MAINT_APPEND instead of exporting CXXFLAGS.
    
    Thanks Felix Geyer for the bug + solution (Closes: #647282).
---
 debian/changelog |    2 ++
 debian/control   |    4 ++--
 debian/rules     |    3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3324105..ee9cddd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qjson (0.7.1-6) UNRELEASED; urgency=low
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Change my e-mail address.
   * Remove the DM-Upload-Allowed flag. It is no longer needed.
+  * Use DEB_CXXFLAGS_MAINT_APPEND instead of exporting CXXFLAGS. Thanks
+    Felix Geyer for the bug + solution (Closes: #647282).
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 25 Sep 2011 14:42:11 -0300
 
diff --git a/debian/control b/debian/control
index 8dd0ee9..976b03a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: qjson
 Priority: extra
 Maintainer: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>
-Build-Depends: debhelper (>= 8.1.3), cmake (>= 2.8.5), libqt4-dev,
- pkg-kde-tools (>= 0.6)
+Build-Depends: dpkg (>= 1.16.1~), debhelper (>= 8.1.3), cmake (>= 2.8.5),
+ libqt4-dev, pkg-kde-tools (>= 0.6)
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://qjson.sourceforge.net/
diff --git a/debian/rules b/debian/rules
index 2618552..ad7d9eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden \
+        -fvisibility-inlines-hidden
 
 %:
 	dh $@ --dbg-package=libqjson-dbg \

-- 
QJson library packaging