[libcmis] 12/40: Imported Debian patch 0.3.1-5

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libcmis.

commit f1bad66d84a78c44688aedbc6c89c3471b934705
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Dec 4 12:18:02 2013 +0100

    Imported Debian patch 0.3.1-5
---
 debian/changelog | 7 +++++++
 debian/rules     | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c0f1b9..7d3d050 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcmis (0.3.1-5) unstable; urgency=low
+
+  * actually use buildflags.mk's CXXFLAGS everywhere, not only on arm,
+    and fix logic...
+
+ -- Rene Engelhard <rene at debian.org>  Wed, 04 Dec 2013 12:18:02 +0100
+
 libcmis (0.3.1-4) unstable; urgency=low
 
   * include /usr/share/dpkg/{architecture,buildflags}.mk and
diff --git a/debian/rules b/debian/rules
index 6cad4cf..2a5c3d7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,11 +13,11 @@ include /usr/share/dpkg/architecture.mk
 
 include /usr/share/dpkg/buildflags.mk
 
-ifneq (,$(findstring arm,$(DEB_BUILD_ARCH)))
-export C=$(shell echo $(CXXFLAGS) | sed -e "s/\-O2/-O0/g")
+ifneq (,$(findstring arm,$(DEB_HOST_ARCH)))
+	CXXFLAGS += -O0
+	export CXXFLAGS
 endif
 
-
 %:
 	dh $@ 
 
@@ -27,7 +27,7 @@ override_dh_clean:
 	dh_clean
 
 override_dh_auto_configure:
-	CXXFLAGS="$(C)" dh_auto_configure -- --disable-long-tests --disable-werror
+	dh_auto_configure -- --disable-long-tests --disable-werror
 
 override_dh_auto_build:
 	$(MAKE) V=1

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