[Debian-astro-commits] [gyoto] 03/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 00fa18b1d254025fd954da1852ed3a59daffcd4c
Merge: c4d4195 af6392f
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Wed Sep 21 05:03:49 2016 +0200

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

 debian/changelog                   | 1 +
 debian/control                     | 8 ++++----
 debian/python-gyoto.README.Debian  | 4 ++--
 debian/python3-gyoto.README.Debian | 4 ++--
 debian/rules                       | 3 +--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --cc debian/changelog
index 0b4e8b6,8759d5c..74bd13b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,7 -1,7 +1,8 @@@
  gyoto (1.1.0-2) UNRELEASED; 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
  
diff --cc debian/rules
index 1f8f499,adeb182..165f1c7
--- a/debian/rules
+++ b/debian/rules
@@@ -91,10 -88,9 +91,9 @@@ override_dh_auto_clean
  override_dh_auto_test-indep:
  
  override_dh_auto_test-arch:
- ifeq (,$(filter $(DEB_HOST_ARCH), kfreebsd-i386 kfreebsd-amd64 mips))
- # skip the test suite on kfreebsd-any as gyoto package not beeing built
+ ifeq (,$(filter $(DEB_HOST_ARCH), mips))
  # skip on mips as lucatelli2 fails on it (but the binary works on other boxes)
 -	LC_ALL=C.UTF-8 dh_auto_test
 +	LC_ALL=C.UTF-8 dh_auto_test -- check-lorene
  endif
  
  override_dh_strip:

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