[Debian-astro-commits] [gyoto] 01/01: gyoto (1.1.0-3) unstable; urgency=low

[Thibaut Jean-Claude Paumard]

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

thibaut pushed a commit to branch master
in repository gyoto.

commit c822f70ffc255fa04257d4cefef115f492f52a13
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Thu Oct 13 12:32:53 2016 +0200

    gyoto (1.1.0-3) unstable; urgency=low
    
      * Bug fix: "arch-dependent file in "Multi-Arch: same"
        package", thanks to Jakub Wilk (Closes: #839810).
    
     -- Thibaut Paumard <thibaut at debian.org>  Wed, 05 Oct 2016 20:12:30 +0200
---
 debian/changelog             | 7 +++++++
 debian/libgyoto5-dev.install | 3 ++-
 debian/rules                 | 6 ++++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2b2ee09..e0c9e36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gyoto (1.1.0-3) unstable; urgency=low
+
+  * Bug fix: "arch-dependent file in "Multi-Arch: same"
+    package", thanks to Jakub Wilk (Closes: #839810).
+
+ -- Thibaut Paumard <thibaut at debian.org>  Wed, 05 Oct 2016 20:12:30 +0200
+
 gyoto (1.1.0-2) unstable; urgency=low
 
   * Add Multi-Arch field for each binary package
diff --git a/debian/libgyoto5-dev.install b/debian/libgyoto5-dev.install
old mode 100644
new mode 100755
index e711077..72fce9d
--- a/debian/libgyoto5-dev.install
+++ b/debian/libgyoto5-dev.install
@@ -1,5 +1,6 @@
+#! /usr/bin/dh-exec
 usr/include
-python/*.i usr/include/Gyoto
+python/*.i usr/include/${DEB_HOST_MULTIARCH}/Gyoto
 usr/lib/*/*.a
 usr/lib/*/gyoto/*/*.a
 usr/lib/*/pkgconfig
diff --git a/debian/rules b/debian/rules
index adeb182..faae970 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@
 export DH_OPTIONS
 
 DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # Hardened flags
 export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
@@ -22,7 +23,8 @@ export DEB_GYOTO_SOVERS
 configure_flags = --with-yorick=/usr/bin/yorick --with-udunits --with-xerces \
 	--without-lorene --enable-static --enable-shared \
 	--with-boost --enable-c++11 --enable-release \
-	--with-mpi --without-virtualenv --enable-doc
+	--with-mpi --without-virtualenv --enable-doc \
+	--includedir=/usr/include/$(DEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --with python2,python3,autoreconf
@@ -52,7 +54,7 @@ override_dh_auto_build-arch:
 	     Y_LDFLAGS="$(LDFLAGS)" \
 	     lib bin yorick
 	for badflag in -g -O2 -Werror=format-security -Wformat ; do \
-	 sed s/$${badflag}// -i lib/gyoto.pc ; \
+	 sed "s/ $${badflag}//" -i lib/gyoto.pc ; \
 	done
 	mkdir -p python-plugins
 	set -e; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/gyoto.git