[DRE-commits] [SCM] ruby-bio.git branch, master, updated. debian/1.4.2-2-12-ga3d4b6c

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit d3c0699da82f2f4e1cc56a7296b06f67944f0df9
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue Jun 5 06:24:41 2012 +0200

    Update copyright. Question mark about test/data/uniprot/p53_human.uniprot

diff --git a/debian/copyright b/debian/copyright
index ff3c09d..665bfe7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,102 @@ License: GPL-2 or Ruby
  You can redistribute it and/or modify it under either the terms of the GPL
  version 2 (see the file GPL), or the conditions below.
 
+
+Files: setup.rb
+Copyright 2000-2006 Minero Aoki
+License: LGPL-2.1
+
+Files: sample/any2fasta.rb
+Copyright: 2006 Pjotr Prins <p at bioruby.org>
+License: GPL-2+
+
+Files: sample/biofetch.rb:
+Copyright: 2002-2004 KATAYAMA Toshiaki <k at bioruby.org>
+License: GPL-2+
+
+Files: sample/enzymes.rb:
+Copyright: 2006 Pjotr Prins <p at bioruby.org>
+           2006 Trevor Wennblom <trevor at corevx.com>
+License: GPL-2+
+
+Files: sample/fasta2tab.rb sample/fsplit.rb sample/gb2tab.rb sample/genes2nuc.rb sample/genes2pep.rb sample/genes2tab.rb sample/genome2tab.rb sample/gt2fasta.rb sample/ssearch2tab.rb sample/tfastx2tab.rb sample/vs-genes.rb
+Copyright: 2001 KATAYAMA Toshiaki <k at bioruby.org>
+License: GPL-2+
+
+Files: sample/fastagrep.rb sample/fastasort.rb sample/na2aa.rb
+Copyright: 2008 KATAYAMA Toshiaki <k at bioruby.org>
+           2008 Pjotr Prins <p at bioruby.org>
+License: GPL-2+
+
+FIles: sample/gb2fasta.rb
+Copyright: 2001 KATAYAMA Toshiaki <k at bioruby.org>
+           2002 Yoshinori K. Okuji <o at bioruby.org>
+License: GPL-2+
+
+Files: sample/gbtab2mysql.rb sample/genome2rb.rb sample/pmfetch.rb sample/pmsearch.rb
+Copyright: 2002 KATAYAMA Toshiaki <k at bioruby.org>
+License: GPL-2+
+
+Files: sample/tdiary.rb
+Copyright: 2003 KATAYAMA Toshiaki <k at bioruby.org>
+           2003 Mitsuteru C. Nakao <n at bioruby.org>
+           2003 Itoshi NIKAIDO <itoshi at gsc.riken.go.jp>
+           2003 Takeya KASUKAWA <kasukawa at gsc.riken.go.jp>
+License: GPL-2+
+
+File: test/data/uniprot/p53_human.uniprot
+Copyright: none
+ These files are marked to be copyrighted by the UniProt Consortium, but this
+ applies to the UniProt database as a whole, not to the individual records.
+License: not-the-CC-BY-ND-3.0
+ Despite the following statement:
+ .
+  Copyrighted by the UniProt Consortium, see http://www.uniprot.org/terms
+  Distributed under the Creative Commons Attribution-NoDerivs License
+ .
+ The above files, as individual records, are not copyrighted.  The statement is
+ for the UniProt as a whole
+
+Files: debian/*
+Copyright: Copyright 2011 Lucas Nussbaum <lucas at debian.org>
+License: GPL-2 or Ruby
+
 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 the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later
+ version.
+ .
+ This program 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 package; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA  02110-1301 USA
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
+
+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 the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+ .
+ This program 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 full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
@@ -73,6 +168,3 @@ License: Ruby
       WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
       PURPOSE.
 
-Files: debian/*
-Copyright: Copyright 2011 Lucas Nussbaum <lucas at debian.org>
-License: GPL-2 or Ruby

-- 
ruby-bio.git