[med-svn] [salmon] 01/01: copyright update

[Michael Crusoe]

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

misterc-guest pushed a commit to branch master
in repository salmon.

commit 46458a9a709b79e02049bf9c234dd67c8d0d1721
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Date:   Fri Feb 5 02:00:11 2016 -0800

    copyright update
---
 debian/control   | 10 ++++++----
 debian/copyright | 31 ++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/debian/control b/debian/control
index 8c89c79..a26eaba 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: salmon
-Section: science
-Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Michael R. Crusoe <crusoe at ucdavis.edu>,
            Kevin Murray <spam at kdmurray.id.au>
+Section: science
+Priority: optional
 Build-Depends: debhelper (>= 9),
                cmake,
                libboost-filesystem-dev,
@@ -24,14 +24,16 @@ Build-Depends: debhelper (>= 9),
                python-sphinx | python3-sphinx,
                zlib1g-dev,
                libeigen3-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/salmon.git
 Vcs-Git: https://anonscm.debian.org/debian-med/salmon.git
 Homepage: https://github.com/COMBINE-lab/salmon
 
 Package: salmon
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${sphinxdoc:Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${sphinxdoc:Depends}
 Description: wicked-fast transcript quantification from RNA-seq data
  Salmon is a wicked-fast program to produce a highly-accurate, transcript-level
  quantification estimates from RNA-seq data. Salmon achieves is accuracy and
diff --git a/debian/copyright b/debian/copyright
index 2d47792..1a7040d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -43,17 +43,21 @@ License: Apache-2.0
 
 Files: include/ezETAProgressBar.hpp
        include/fastapprox.h
-       include/format.h
        src/bwtindex.c
-       src/format.cc
        src/is.c
 Copyright: 2011, 2012 Remik Ziemlinski
            2011, 2012 Paul Mineiro <paul at mineiro.com>
-           (c) 2012 - 2015, Victor Zverovich
            (c) 2008 Genome Research Ltd (GRL)
            (c) 2008 Yuta Mori All Rights Reserved
 License: Expat
 
+Files: include/format.h
+       include/posix.h
+       src/format.cc
+       src/posix.cc
+Copyright: (c) 2012 - 2015, Victor Zverovich
+License: BSD-2-clause
+
 Files: src/QSufSort.c
 Copyright: 1999, N. Jesper Larsson <jesper at cs.lth.se>
 License: other
@@ -165,3 +169,24 @@ License: Apache-2.0
    .
    On Debian systems, the full text of the Apache License, Version 2.0 can be
    found in the file `/usr/share/common-licenses/Apache-2.0'
+
+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:
+ .
+ 1. Redistributions of source code must retain the above copyright notice, this
+    list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT OWNER OR CONTRIBUTORS 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.

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