[med-svn] [seaview] 07/08: Merge commit '0331dd04457af55df20ab1e72f0f452e61d7092b' into debian/jessie-backports

[Andreas Tille]

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

tille pushed a commit to branch debian/jessie-backports
in repository seaview.

commit 60901087c8e3a8a0ba384dd6d6e9274b205bb513
Merge: eca054b 0331dd0
Author: Andreas Tille <tille at debian.org>
Date:   Fri Nov 18 08:48:54 2016 +0100

    Merge commit '0331dd04457af55df20ab1e72f0f452e61d7092b' into debian/jessie-backports
    
    Conflicts:
    	debian/changelog

 align.cxx                           |   2 +-
 csrc/misc_acnuc.c                   |  16 +++-
 csrc/raa_acnuc.c                    |  48 ++++++----
 csrc/raa_acnuc.h                    |   2 +
 debian/changelog                    |  16 ++++
 debian/compat                       |   2 +-
 debian/control                      |   4 +-
 debian/patches/no-interactive.patch |  14 ---
 debian/patches/series               |   1 -
 debian/seaview.desktop              |   1 +
 debian/watch                        |   2 +-
 load_seq.cxx                        |  77 +++++++++------
 macos_extras.mm                     |   3 +
 pdf_or_ps.h                         |  32 +++++++
 seaview.appdata.xml                 |  14 ++-
 seaview.cxx                         |  15 +--
 seaview.h                           |   3 +-
 seaview.html                        |  31 +++++-
 svg.cxx                             |  15 ++-
 svg.h                               |  34 +++++++
 treedraw.cxx                        | 184 +++++++++++++++++++++++++++++++-----
 treedraw.h                          |  12 +++
 trees.cxx                           |  16 ++++
 unrooted.cxx                        |  42 ++++----
 unrooted.h                          |   2 +
 25 files changed, 470 insertions(+), 118 deletions(-)

diff --cc debian/changelog
index 9bf6a91,c60d310..61fb124
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,19 +1,25 @@@
+ seaview (1:4.6.1.2-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * debhelper 10
+   * d/watch: version=4
+   * Add Keyword to desktop file
+ 
+  -- Andreas Tille <tille at debian.org>  Fri, 18 Nov 2016 08:26:19 +0100
+ 
+ seaview (1:4.6.1.1-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * cme fix dpkg-control
+ 
+  -- Andreas Tille <tille at debian.org>  Sat, 10 Sep 2016 07:10:54 +0200
+ 
 +seaview (1:4.6-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Andreas Tille <tille at debian.org>  Wed, 04 May 2016 14:07:07 +0200
 +
  seaview (1:4.6-2) unstable; urgency=medium
  
    * Do not require user input at stdin when calling phyml

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/seaview.git