DEP5 fixes

diff --git a/debian/changelog b/debian/changelog
index c790c612241c1239552d59213413a395440d026b..1e82ca93bd2c249d0044bcc049d2654adba37d46 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ncbi-blast+ (2.2.31-3) UNRELEASED; urgency=medium
   * Enable building architecture independent package separately
     Closes: #809120
   * Override false lintian error
+  * DEP5 fixes
 
  -- Andreas Tille <tille@debian.org>  Mon, 28 Dec 2015 09:01:16 +0100
 

diff --git a/debian/copyright b/debian/copyright
index 8a82b50fda9a837a2736dbf795eb574b5f4cfe2e..e18a3adc34568e8bf5e4d15d253224f7071e60f5 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: blastsoft@ncbi.nlm.nih.gov
 
 Files: c++/*/util/compress/zlib/*
 Copyright: 1995-2004 Jean-loup Gailly and Mark Adler
-License:
+License: BSD-3-clause
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
   arising from the use of this software.
@@ -24,37 +24,13 @@ License:
 Files: c++/*/util/regexp/*
 Copyright: 1997-2009 University of Cambridge
            2008-2009 Google Inc
-License: BSD
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
- 2. The origin of this software must not be misrepresented; you must
-   not claim that you wrote the original software.  If you use this
-   software in a product, an acknowledgment in the product
-   documentation would be appreciated but is not required.
- 3. Altered source versions must be plainly marked as such, and must
-   not be misrepresented as being the original software.
- 4. The name of the author may not be used to endorse or promote
-   products derived from this software without specific prior written
-   permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
- OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
+License: BSD-4-clause
 
 Files: c++/*/util/compress/bzip2/*
 Copyright: 1996-2002 Julian R Seward
-License: BSD
+License: BSD-4-clause
+
+License: BSD-4-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -85,35 +61,18 @@ License: BSD
 Files: c++/src/build-system/config.*s* c++/src/util/regexp/missing
 Copyright: 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc
 License: GPL-2
- This package 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 License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
 
 Files: c++/src/build-system/ax_jni_include_dir.m4
 Copyright: 2008 Don Anderson <dda@sleepycat.com>
-License:
+License: as_is
    Copying and distribution of this file, with or without modification, are
    permitted in any medium without royalty provided the copyright notice
    and this notice are preserved. This file is offered as-is, without any
    warranty.
 
-
 Files: c++/include/util/impl/floating_point_comparison.hpp
 Copyright: 2001-2008 Gennadiy Rozental
-License: Boost software license
+License: Boost
  Permission is hereby granted, free of charge, to any person or organization
  obtaining a copy of the software and accompanying documentation covered by
  this license (the "Software") to use, reproduce, display, distribute,
@@ -138,6 +97,8 @@ License: Boost software license
 
 Files: c++/include/dbapi/driver/odbc/unix_odbc/sqlfront.h
 Copyright: 1998-1999  Brian Bruns
+License: GPL-2
+
 License: GPL-2
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by