[libcmis] 14/40: Imported Debian patch 0.4.1-2

[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 263fd90b3904a17eda29604250d0ad62e424b534
Author: Rene Engelhard <rene at debian.org>
Date:   Wed Dec 4 09:23:49 2013 +0000

    Imported Debian patch 0.4.1-2
---
 debian/changelog |  9 +++++++++
 debian/control   |  2 +-
 debian/copyright |  2 ++
 debian/rules     | 11 ++++++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a53cb0e..85eb787 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libcmis (0.4.1-2) experimental; urgency=low
+
+  * explicitely mention Cedric Bosdonnat and Cao Cuong Ngo
+    in debian/copyright
+  * 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 09:23:49 +0000
+
 libcmis (0.4.1-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index d9f7c49..05226f4 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/copyright b/debian/copyright
index 6f438e2..8492b91 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,6 +17,8 @@ License: MPL | GPL2+ | LGPL2+
  *
  * Major Contributor(s):
  * Copyright (C) 2011 SUSE <cbosdonnat at suse.com>
+ * Copyright (C) 2011 Cédric Bosdonnat <cbosdo at users.sourceforge.net>
+ * Copyright (C) 2013 Cao Cuong Ngo <cao.cuong.ngo at gmail.com>
  *
  *
  * All Rights Reserved.
diff --git a/debian/rules b/debian/rules
index 307677b..5e24a61 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 --disable-silent-rules
+	CXXFLAGS="$(C)" dh_auto_configure -- --disable-long-tests --disable-werror --disable-silent-rules
 
 override_dh_auto_build:
 	$(MAKE)

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