[med-svn] [proteinortho] 01/02: Merge branch 'master' 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 proteinortho.

commit 6181a146dfcf4868374b9c3cf3cfd95960986b13
Merge: 642b67d 1c91c01
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jun 7 15:11:21 2017 +0200

    Merge branch 'master' into debian/jessie-backports

 Makefile                       |  14 +-
 basic-types.h                  |  58 +++++
 debian/changelog               |  24 ++
 debian/control                 |   4 +-
 debian/copyright               |   2 +
 debian/patches/hardening.patch |  25 ---
 debian/patches/series          |   1 -
 debian/rules                   |  11 +-
 debian/watch                   |   2 +-
 ffadj_mcs.py                   |   6 +-
 manual.html                    |  21 +-
 po2tree.pl                     | 161 ++++++++++++++
 po_tree.c                      | 484 +++++++++++++++++++++++++++++++++++++++++
 proteinortho5.pl               | 100 +++++----
 proteinortho5_clean_edges.cpp  | 136 ------------
 proteinortho5_clustering.cpp   | 233 ++++++++++++++++----
 16 files changed, 1012 insertions(+), 270 deletions(-)

diff --cc debian/changelog
index 9280a33,9bfe32e..91b2b24
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,33 @@@
+ proteinortho (5.15+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version
+ 
+  -- Andreas Tille <tille at debian.org>  Mon, 29 Aug 2016 15:10:00 +0200
+ 
+ proteinortho (5.13+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version (all patches applied upstream)
+   * cme fix dpkg-control
+ 
+  -- Andreas Tille <tille at debian.org>  Wed, 04 May 2016 14:55:07 +0200
+ 
+ proteinortho (5.12+dfsg-1) unstable; urgency=medium
+ 
+   * new upstream version
+   * make better use of uscan options
+   * cme fix dpkg-control
+   * Fix C-Syntax
+   * Apply fix from upstream to enable building the package
+   * Better hardening
+ 
+  -- Andreas Tille <tille at debian.org>  Thu, 17 Mar 2016 20:40:53 +0100
+ 
 +proteinortho (5.11+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Andreas Tille <tille at debian.org>  Thu, 10 Mar 2016 20:10:59 +0100
 +
  proteinortho (5.11+dfsg-1) unstable; urgency=low
  
    * Initial release (Closes: #804995)

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