[med-svn] [ugene] 04/07: DEP5 fixes

[Andreas Tille]

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

tille pushed a commit to branch master
in repository ugene.

commit 181ff52501da19d259ed99910717bbbfebfc674b
Author: Andreas Tille <tille at debian.org>
Date:   Fri Dec 11 10:14:36 2015 +0100

    DEP5 fixes
---
 debian/changelog |  1 +
 debian/copyright | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9feca6f..6554562 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ ugene (1.19.0+dfsg-1) UNRELEASED; urgency=medium
   * Moved packaging from SVN to Git
   * cme fix dpkg-control
   * override false lintian positives (package-contains-timestamped-gzip)
+  * DEP5 fixes
 
   [Gert Wollny]
   * Update to build with QT5 (thanks to Gianfranco Costamagna for the initial 
diff --git a/debian/copyright b/debian/copyright
index 072ae7c..ac1058e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,8 +8,8 @@ Files-Excluded: */src/libs_3rdparty/zlib
                 */installer/windows
 
 Files: *
-Copyright: © 2008-2012 UniPro <ugene at unipro.ru>
-License: GPL2+
+Copyright: © 2008-2015 UniPro <ugene at unipro.ru>
+License: GPL-2+
 
 Files: src/corelibs/U2Formats/src/ABIFormat.cpp
        src/corelibs/U2Formats/src/SCFFormat.cpp
@@ -24,7 +24,7 @@ License: MCR
 
 Files: src/plugins_3rdparty/hmm2/src/hmmer2/sre_string.cpp
 Copyright: © 1998 Todd C. Miller <Todd.Miller at courtesan.com>
-License: BSD
+License: ISC
  Permission to use, copy, modify, and distribute this software for any
  purpose with or without fee is hereby granted, provided that the above
  copyright notice and this permission notice appear in all copies.
@@ -39,7 +39,7 @@ License: BSD
 
 Files: src/plugins_3rdparty/hmm2/*
 Copyright: © 1992-2003 HHMI/Washington University School of Medicine
-License: GPL2+
+License: GPL-2+
 
 Files: src/plugins_3rdparty/umuscle/src/muscle
 Copyright: © 2004-2011 Robert C. Edgar <muscle at drive5.com>
@@ -132,7 +132,7 @@ License: non-free_in_clause_8
 Files: src/plugins_3rdparty/primer3/src/primer3_core
 Copyright: © 1996-2007 Whitehead Institute for Biomedical Research, Steve Rozen
     (http://jura.wi.mit.edu/rozen), and Helen Skaletsky
-License: BSDlike
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are
  met:
@@ -161,7 +161,7 @@ License: BSDlike
 
 Files: src/plugins_3rdparty/hmm3/src/hmmer3/*
 Copyright: © 2000-2009 Howard Hughes Medical Institute (and others)
-License: GPL3+
+License: GPL-3+
 
 Files: src/plugins_3rdparty/hmm3/src/hmmer3/easel/*
 Copyright: © 2006-2009 Howard Hughes Medical Institute (and others)
@@ -199,7 +199,7 @@ License: JaneliaFarm
 
 Files: src/plugins/biostruct3d_view/src/gl2ps
 Copyright: © 1999-2006 Christophe Geuzaine <geuz at geuz.org>
-License: GPL2+
+License: GPL-2+
 Note: Alternatively you can choose
  the GL2PS License as published by Christophe Geuzaine, either
  version 2 of the License, or (at your option) any later version.
@@ -237,7 +237,7 @@ License: non-free_phylip
 
 Files: src/plugins_3rdparty/kalign/src
 Copyright: © 2006 Timo Lassmann <timolassmann at gmail.com>
-License: GPL2+
+License: GPL-2+
 
 Files: src/libs_3rdparty/sqlite3/src
 Copyright: The author D. Richard Hipp <drh at hwaci.com> disclaims copyright
@@ -274,7 +274,7 @@ License: BSD+Khronos
 
 Files: src/corelibs/U2Private/src/StackWalker.*
 Copyright: © 2005-2011 Jochen Kalmbach
-License: BSD-like
+License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without modification, 
  are permitted provided that the following conditions are met:
  .
@@ -301,9 +301,9 @@ License: BSD-like
 Files: debian/*
 Copyright: © 2008-2011 Ivan Efremov <iefremov at unipro.ru>
 	   © 2012 Andreas Tille <tille at debian.org>
-License: GPL3+
+License: GPL-3+
 
-License: GPL2+
+License: GPL-2+
  This suite of programs is free software. You can redistribute it
  and/or modify it under the terms of the GNU General Public License as
  published by the Free Software Foundation; either version 2 of the
@@ -338,7 +338,7 @@ License: GPL2+
  On Debian systems, see /usr/share/common-licenses/GPL-2 for the complete
  text of the GPL.
 
-License: GPL3+
+License: GPL-3+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation, either version 3 of the License, or (at

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