[med-svn] [maffilter] 02/02: Merge branch 'master' of git+ssh://anonscm.debian.org/git/debian-med/maffilter

[Steffen Möller]

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

moeller pushed a commit to branch master
in repository maffilter.

commit 1f4ac88e44006e2431547c8628b49a219e7d2eb1
Merge: 1074927 ce9be36
Author: Steffen Moeller <moeller at debian.org>
Date:   Sat Jul 29 22:01:50 2017 +0200

    Merge branch 'master' of git+ssh://anonscm.debian.org/git/debian-med/maffilter

 AUTHORS.txt => AUTHORS                             |   0
 CMakeLists.txt                                     | 277 +++-----
 COPYING.txt                                        | 506 ---------------
 ChangeLog                                          |  44 +-
 INSTALL.txt => INSTALL                             |   2 +-
 LICENSE                                            | 674 ++++++++++++++++++++
 MafFilter/CMakeLists.txt                           |  23 +-
 MafFilter/MafFilter.cpp                            | 605 ++++++++++++++++--
 MafFilter/SystemCallMafIterator.cpp                |  84 +++
 MafFilter/SystemCallMafIterator.h                  | 110 ++++
 MafFilter/TreeBuildingSystemCallMafIterator.cpp    |  82 +++
 MafFilter/TreeBuildingSystemCallMafIterator.h      | 115 ++++
 buildBin.sh                                        |   7 +
 debian/changelog                                   |  12 +-
 debian/compat                                      |   2 +-
 debian/control                                     |   4 +-
 debian/maffilter.docs                              |   2 +-
 debian/rules                                       |   3 +-
 debian/watch                                       |   4 +-
 doc/CMakeLists.txt                                 |  80 ++-
 doc/maffilter.texi                                 | 695 +++++++++++++++++----
 ...projected.chr22.subset.nogap.cleaned_aln.maf.gz | Bin 0 -> 13206362 bytes
 examples/UCSC46ways/MafFilter.bpp                  |   2 +-
 examples/UCSC46ways/README                         |   1 +
 ...Mgraminicolav2.FrozenGeneCatalog20080910.gff.gz | Bin 0 -> 809905 bytes
 examples/Ztritici/tba_refIPO323.maf.gz             | Bin 0 -> 60513136 bytes
 maffilter.spec                                     |  66 +-
 man/CMakeLists.txt                                 |  47 +-
 man/{maffilter.1.txt => maffilter.1}               |   2 +-
 29 files changed, 2488 insertions(+), 961 deletions(-)

diff --cc debian/changelog
index b5e9e0f,3d94f04..c76cb53
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,20 @@@
- maffilter (1.1.0-1+dfsg-3) UNRELEASED; urgency=medium
++maffilter (1.2.1-1+dfsg-2) UNRELEASED; urgency=medium
 +
 +  * Added ref to OMICtools registry
 +    (bio.tools and RRID entries not available)
 +
 + -- Steffen Moeller <moeller at debian.org>  Sat, 29 Jul 2017 19:29:20 +0200
 +
+ maffilter (1.2.1+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream version
+   * Fix watch file
+   * debhelper 10
+   * adjust versioned Build-Depends
+   * hardening=+all
+ 
+  -- Andreas Tille <tille at debian.org>  Thu, 22 Jun 2017 09:09:21 +0200
+ 
  maffilter (1.1.0-1+dfsg-2) unstable; urgency=medium
  
    * Fix permissions

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