[Pkg-gnupg-commit] r426 - in /libgpg-error/trunk/debian: changelog rules

[dkg at users.alioth.debian.org]

Author: dkg
Date: Fri Aug  8 02:01:07 2014
New Revision: 426

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=426
Log:
address cross-building issues

Modified:
    libgpg-error/trunk/debian/changelog
    libgpg-error/trunk/debian/rules

Modified: libgpg-error/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/changelog?rev=426&op=diff
==============================================================================
--- libgpg-error/trunk/debian/changelog	(original)
+++ libgpg-error/trunk/debian/changelog	Fri Aug  8 02:01:07 2014
@@ -1,3 +1,11 @@
+libgpg-error (1.13-3) UNRELEASED; urgency=medium
+
+  * Avoid dumping the native lock-obj header when cross-building, since it
+    will not exist.  I think this resolves the FTCBFS issue.  Thanks to
+    Helmut Grohne for all the useful guidance! (Closes: #753047)
+
+ -- Daniel Kahn Gillmor <dkg at fifthhorseman.net>  Thu, 07 Aug 2014 21:32:09 -0400
+
 libgpg-error (1.13-2) unstable; urgency=medium
 
   * adopt upstream's variant of the hppa tuning.

Modified: libgpg-error/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnupg/libgpg-error/trunk/debian/rules?rev=426&op=diff
==============================================================================
--- libgpg-error/trunk/debian/rules	(original)
+++ libgpg-error/trunk/debian/rules	Fri Aug  8 02:01:07 2014
@@ -7,6 +7,7 @@
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
 export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS)
 
+export DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
 export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
@@ -21,7 +22,9 @@
 
 override_dh_auto_build:
 	dh_auto_build --with autotools-dev --parallel
+ifeq ($(DEB_HOST_MULTIARCH),$(DEB_BUILD_MULTIARCH))
 	tail -vn+0 src/lock-obj-pub.native.h
+endif
 
 override_dh_clean:
 	dh_clean debian/libgpg-error0.install