[SCM] Akonadi packaging branch, master, updated. debian/1.5.3-2-11-g5bdc3d9

[Felix Geyer]

The following commit has been merged in the master branch:
commit 71b8b60908e7759455143f2b579a0a2d2a3088fa
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Wed Nov 2 00:37:42 2011 +0100

    Use DEB_*_MAINT_APPEND instead of setting CFLAGS/CXXFLAGS.
---
 debian/changelog |    1 +
 debian/rules     |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f87ad08..8097967 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ akonadi (1.6.0-0r1) UNRELEASED; urgency=low
 
   [ Felix Geyer ]
   * Add a watch file.
+  * Use DEB_*_MAINT_APPEND instead of setting CFLAGS/CXXFLAGS.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 09 Aug 2011 17:23:09 +0200
 
diff --git a/debian/rules b/debian/rules
index 7448b3a..d593834 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
-export CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-export CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+export DEB_CFLAGS_MAINT_APPEND += -fvisibility=hidden -fvisibility-inlines-hidden
+export DEB_CXXFLAGS_MAINT_APPEND = -fvisibility=hidden -fvisibility-inlines-hidden
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)

-- 
Akonadi packaging