[libcmis] 11/40: Imported Debian patch 0.3.1-4

[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 8951dab47face718cfadb5f841be890dc5f8f8df
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Dec 4 08:08:42 2013 +0000

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

diff --git a/debian/changelog b/debian/changelog
index 03ef48c..0c0f1b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcmis (0.3.1-4) unstable; urgency=low
+
+  * include /usr/share/dpkg/{architecture,buildflags}.mk and
+    build with -O0 on arm to hack around API test crash (closes: #731116) 
+
+ -- Rene Engelhard <rene at debian.org>  Wed, 04 Dec 2013 08:08:42 +0000
+
 libcmis (0.3.1-3) unstable; urgency=low
 
   * build with --disable-werror (closes: #707448) 
diff --git a/debian/control b/debian/control
index 1978f7f..ddd8fb2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: libcmis
 Priority: optional
 Maintainer: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 8.0.0), autotools-dev, libxml2-dev, libboost-dev, libboost-program-options-dev, libcurl4-gnutls-dev, libcppunit-dev, docbook-to-man, libboost-date-time-dev
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, libxml2-dev, libboost-dev, libboost-program-options-dev, libcurl4-gnutls-dev, libcppunit-dev, docbook-to-man, libboost-date-time-dev, dpkg-dev (>= 1.16.1)
 Standards-Version: 3.9.2
 Section: libs
 Homepage: http://libcmis.sourceforge.net/
diff --git a/debian/rules b/debian/rules
index 7485b60..6cad4cf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+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")
+endif
+
+
 %:
 	dh $@ 
 
@@ -18,7 +27,7 @@ override_dh_clean:
 	dh_clean
 
 override_dh_auto_configure:
-	dh_auto_configure -- --disable-long-tests --disable-werror
+	CXXFLAGS="$(C)" 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