DEP5 fixes and upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 1e82ca93bd2c249d0044bcc049d2654adba37d46..107727637d37e37e7dc543f3361c9ca695e39e4f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ncbi-blast+ (2.2.31-3) UNRELEASED; urgency=medium
+ncbi-blast+ (2.2.31-3) unstable; urgency=medium
 
   * Drop explicite mentioning of quilt
   * Enable building architecture independent package separately
@@ -6,7 +6,7 @@ ncbi-blast+ (2.2.31-3) UNRELEASED; urgency=medium
   * Override false lintian error
   * DEP5 fixes
 
- -- Andreas Tille <tille@debian.org>  Mon, 28 Dec 2015 09:01:16 +0100
+ -- Andreas Tille <tille@debian.org>  Mon, 28 Dec 2015 12:32:23 +0100
 
 ncbi-blast+ (2.2.31-2) unstable; urgency=medium
 

diff --git a/debian/copyright b/debian/copyright
index e18a3adc34568e8bf5e4d15d253224f7071e60f5..e20323a496ef2ae83d03053a1c013fa7e2b597ca 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,29 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ncbi-blast+
 Upstream-Contact: blastsoft@ncbi.nlm.nih.gov
 
+Files: c++/*
+Copyright: NCBI
+License: PD
+                                  PUBLIC DOMAIN NOTICE
+                     National Center for Biotechnology Information
+ .
+        This software/database is a "United States Government Work" under the
+        terms of the United States Copyright Act.  It was written as part of
+        the author's official duties as a United States Government employee and
+        thus cannot be copyrighted.  This software/database is freely available
+        to the public for use. The National Library of Medicine and the U.S.
+        Government have not placed any restriction on its use or reproduction.
+ .
+        Although all reasonable efforts have been taken to ensure the accuracy
+        and reliability of the software and data, the NLM and the U.S.
+        Government do not and cannot warrant the performance or results that
+        may be obtained by using this software or data. The NLM and the U.S.
+        Government disclaim all warranties, express or implied, including
+        warranties of performance, merchantability or fitness for any particular
+        purpose.
+ .
+        Please cite the author in any work or product based on this material.
+
 Files: c++/*/util/compress/zlib/*
 Copyright: 1995-2004 Jean-loup Gailly and Mark Adler
 License: BSD-3-clause
@@ -146,28 +169,6 @@ License: MIT
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
 
-Files: c++/*
-Copyright: NCBI
-License: PD
-                                  PUBLIC DOMAIN NOTICE
-                     National Center for Biotechnology Information
- .
-        This software/database is a "United States Government Work" under the
-        terms of the United States Copyright Act.  It was written as part of
-        the author's official duties as a United States Government employee and
-        thus cannot be copyrighted.  This software/database is freely available
-        to the public for use. The National Library of Medicine and the U.S.
-        Government have not placed any restriction on its use or reproduction.
- .
-        Although all reasonable efforts have been taken to ensure the accuracy
-        and reliability of the software and data, the NLM and the U.S.
-        Government do not and cannot warrant the performance or results that
-        may be obtained by using this software or data. The NLM and the U.S.
-        Government disclaim all warranties, express or implied, including
-        warranties of performance, merchantability or fitness for any particular
-        purpose.
- .
-        Please cite the author in any work or product based on this material.
 
 Files: debian/*
 Copyright: 2011 Olivier Sallou <olivier.sallou@irisa.fr>