[Debian-astro-commits] [gyoto] 01/01: 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 3091fde026347f4693772b7aa579ef35125a30bf
Merge: bc8c380 dd3c5fa
Author: Thibaut Paumard <paumard at users.sourceforge.net>
Date:   Fri Nov 18 10:15:25 2016 +0100

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

 debian/changelog                       | 12 +++++++++---
 debian/patches/acos-locking-workaround | 28 ++++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 debian/rules                           |  4 ++++
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 4861578,5b1e5b0..e5b594a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- gyoto (1.1.1-2+lorene1) UNRELEASED; urgency=low
++gyoto (1.1.1-3+lorene1) experimental; urgency=low
 +
-   * Compile LORENE plug-in.
++  * Compile the LORENE plug-in.
 +
-  -- Thibaut Paumard <thibaut at debian.org>  Mon, 31 Oct 2016 16:23:45 +0100
++ -- Thibaut Paumard <thibaut at debian.org>  Fri, 18 Nov 2016 09:28:15 +0100
++
+ gyoto (1.1.1-3) unstable; urgency=medium
+ 
+   * Bug fix: "FTBFS with boost1.62" (Closes: #844490).
+ 
+  -- Thibaut Paumard <thibaut at debian.org>  Thu, 17 Nov 2016 22:29:08 +0100
  
  gyoto (1.1.1-2) unstable; urgency=low
  

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