[med-svn] [Git][med-team/qiime][master] Adapt d/copyright to Qiime2

Liubov Chuprikova gitlab at salsa.debian.org
Sat Nov 3 13:21:50 GMT 2018


Liubov Chuprikova pushed to branch master at Debian Med / qiime


Commits:
20bdd0c7 by Liubov Chuprikova at 2018-11-03T13:21:30Z
Adapt d/copyright to Qiime2

- - - - -


2 changed files:

- debian/changelog
- debian/copyright


Changes:

=====================================
debian/changelog
=====================================
@@ -7,6 +7,7 @@ qiime (2018.8.0-1) UNRELEASED; urgency=medium
 
   [ Liubov Chuprikova ]
   * Make .egg-info available for build time tests
+  * Adapt d/copyright to Qiime2
 
  -- Andreas Tille <tille at debian.org>  Fri, 19 Oct 2018 15:20:48 +0200
 


=====================================
debian/copyright
=====================================
@@ -1,55 +1,10 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: QIIME 2
-Upstream-Contact: Greg Caporaso <gregcaporaso at gmail.com>
 Source: https://github.com/qiime2/qiime2/releases
-Files-Excluded: 
-    *.jar
 
 Files: *
-Copyright: 2010-2012 Greg Caporaso <gregcaporaso at gmail.com>,
-                     Jens Reeder <jens.reeder at gmail.com>,
-                     Kyle Bittinger and others
-License: GPL-2+
-
-Files: qiime_test_data/align_seqs/core_set_aligned.fasta.imputed
-Copyright: (C) The Greengenes Database Consortium <http://greengenes.secondgenome.com/>
-License: CC-BY-SA 
- The Greengenes Database by The Greengenes Database Consortium is licensed under
- a Creative Commons Attribution-ShareAlike 3.0 Unported License.
- .
- Academic users should cite:
-   DeSantis, T. Z., P. Hugenholtz, N. Larsen, M. Rojas, E. L. Brodie, K. Keller,
-   T. Huber, D. Dalevi, P. Hu, and G. L. Andersen. 2006.
-   Greengenes, a Chimera-Checked 16S rRNA Gene Database and Workbench Compatible
-   with ARB. Appl Environ Microbiol 72:5069-72.
-
-Files: qiime/support_files/js/jquery.js
-Copyright: John Resig <jquery.com>
-License: GPL-2+ or MIT
-Comment: Dual licensed under the MIT (MIT-LICENSE.txt)
- and GPL (GPL-LICENSE.txt) licenses.
-
-Files: qiime/support_files/js/jquery.tablednd_0_5.js
-Copyright: Denis Howlett <denish at isocra.com>
-License: MIT
-
-Files: qiime/support_files/js/overlib.js
-Copyright: 1998-2004 Erik Bosrup. All rights reserved.
-License: overlib
- Contributors are listed on the homepage.
- This file might be old, always check for the latest version at:
-   https://github.com/overlib/overlib
- .
- Please read the license agreement (available through the link above)
- before using overLIB. Direct any licensing questions to erik at bosrup.com.
- .
- Do not sell this as your own work or remove this copyright notice.
- For full details on copying or changing this script please read the
- license agreement at the link above. Please give credit on sites that
- use overLIB and submit changes of the script so other people can use
- them as well.
-Comment: The link above throws 404
- Project moved to Github but the License file was not moved.
+Copyright: 2016-2018 QIIME 2 development team
+License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2010 Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>
@@ -58,6 +13,32 @@ Copyright: 2010 Sri Girish Srinivasa Murthy <srigirish at evolbio.mpg.de>
                 Andreas Tille <tille at debian.org>
 License: GPL-2+
 
+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:
+  .
+  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.
+  .
+  3.  Neither the name of the copyright holder nor the names of its
+      contributors may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+  .
+  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 HOLDER 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.
+
 License: GPL-2+
  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
@@ -77,24 +58,3 @@ License: GPL-2+
  .
  On a Debian system, the GNU GPL license version 2 is distributed in the
  file /usr/share/common-licenses/GPL-2.
-
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a
- copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 
-



View it on GitLab: https://salsa.debian.org/med-team/qiime/commit/20bdd0c76a715b2f010dc37308f4efce0e674317

-- 
View it on GitLab: https://salsa.debian.org/med-team/qiime/commit/20bdd0c76a715b2f010dc37308f4efce0e674317
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181103/7eb338f5/attachment-0001.html>


More information about the debian-med-commit mailing list