[Debian-astro-commits] [gyoto] 04/05: Merge branch 'debian' into lorene

[Thibaut Jean-Claude Paumard]

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

thibaut pushed a commit to branch lorene
in repository gyoto.

commit c1d36e38af8af41ce191aef8dc398ccd44da090b
Merge: 00fa18b c822f70
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Thu Oct 13 13:00:53 2016 +0200

    Merge branch 'debian' into lorene
    
    Conflicts:
    	debian/rules

 debian/changelog             | 11 +++++++++--
 debian/libgyoto5-dev.install |  3 ++-
 debian/libgyoto5.install     |  1 -
 debian/rules                 |  9 +++++----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index 74bd13b,e0c9e36..4f26407
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,16 +1,17 @@@
- gyoto (1.1.0-2) UNRELEASED; urgency=low
+ 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
 +  * Compile LORENE plug-in
    * Reactivate test suite on kfreebsd
  
-  -- Thibaut Paumard <thibaut at debian.org>  Tue, 20 Sep 2016 15:53:18 +0200
+  -- Thibaut Paumard <thibaut at debian.org>  Tue, 04 Oct 2016 10:32:18 +0200
  
  gyoto (1.1.0-1) experimental; urgency=low
  
diff --cc debian/rules
index 165f1c7,faae970..37797f5
--- a/debian/rules
+++ b/debian/rules
@@@ -6,11 -6,10 +6,11 @@@
  export DH_OPTIONS
  
  DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
- DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
  
  # Hardened flags
 -export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 +# LORENE has a couple of undefined symbols, we can't use bindnow until this is fixed
 +# export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
  DPKG_EXPORT_BUILDFLAGS = 1
  -include /usr/share/dpkg/buildflags.mk
  
@@@ -22,10 -21,10 +22,11 @@@ DEB_GYOTO_SOVERS := $(shell grep VERSIN
  export DEB_GYOTO_SOVERS
  
  configure_flags = --with-yorick=/usr/bin/yorick --with-udunits --with-xerces \
--	--without-lorene --enable-static --enable-shared \
++	--enable-static --enable-shared \
  	--with-boost --enable-c++11 --enable-release \
  	--with-mpi --without-virtualenv --enable-doc \
- 	--with-lorene=/usr/lib/$(DEB_HOST_MULTIARCH)/lorene
++	--with-lorene=/usr/lib/$(DEB_HOST_MULTIARCH)/lorene \
+ 	--includedir=/usr/include/$(DEB_HOST_MULTIARCH)
  
  %:
  	dh $@ --with python2,python3,autoreconf

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