Hopefully finalising debian/copyright

diff --git a/debian/copyright b/debian/copyright
index 9359c6d725a8b652ca8fd4401f3e5d0353e53dc5..85b2e3d5a2c53493ce3c4e026d448190bb178ed3 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,7 +7,7 @@ Files: *
 Copyright: 2008-2010 Genome Research Ltd.
 License: MIT
 
-Files: samtools/khash.h samtools/kseq.h samtools/khash.h 
+Files: samtools/khash.h samtools/kseq.h
 Copyright: 2008-2011 by Attractive Chaos <attractor@live.co.uk>
 License: MIT
 
@@ -23,15 +23,69 @@ Files: samtools/bcftools/bcf.h
 Copyright: 2010 Broad Institute
 License: MIT
 
-Files: samtools/bgzf.c.pysam.c samtools/bgzf.h tabix/bgzf.c.pysam.c tabix/bgzf.h
+Files: samtools/bgzf.c.pysam.c samtools/bgzf.h tabix/bgzf.c.pysam.c tabix/bgzf.h samtools/knetfile.c.pysam.c
 Copyright: 2008 Broad Institute / Massachusetts Institute of Technology
-           2011,2012 Attractive Chaos <attractor@live.co.uk>
+           2010-2012 Attractive Chaos <attractor@live.co.uk>
 License: MIT
 
 Files: tabix/bgzip.c.pysam.c
 Copyright: 2008 Broad Institute / Massachusetts Institute of Technology
 License: MIT
 
+Files: samtools/kaln.c.pysam.c samtools/kaln.h samtools/kprobaln.h
+Copyright: 2003-2006, 2008, 2009, by Heng Li <lh3lh3@gmail.com>
+License: MIT
+
+Files: samtools/razf.c.pysam.c samtools/razf.h
+Copyright: 2008 Jue Ruan <ruanjue@gmail.com>, Heng Li <lh3@sanger.ac.uk>
+License: BSDlike1
+ 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 AUTHOR 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 AUTHOR 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.
+
+Files: samtools/win32/zconf.h samtools/win32/zlib.h
+Copyright: 1995-2005 Jean-loup Gailly <jloup@gzip.org> and Mark Adler <madler@alumni.caltech.edu>
+License: BSDlike2
+  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.
+ .
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+ .
+  1. 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.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+Comment: These files are not used and could be stripped from the source
+
+Files: samtools/win32/xcurses.h
+Copyright: 2008 wmcbrine
+License: PublicDomain
+ This file is in public domain.
+Comment: These files are not used and could be stripped from the source
+
 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
@@ -51,28 +105,3 @@ License: MIT
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  THE SOFTWARE.
 
-
-=====
-DRAFT
-=====
-
-Files: samtools/kaln.c.pysam.c samtools/kaln.h samtools/kprobaln.h
-Copyright: 2003-2006, 2008, 2009, by Heng Li <lh3lh3@gmail.com>
-
-samtools/khash.h:  @copyright Heng Li
-
-Files: samtools/knetfile.c.pysam.c
-Copyright: (c) 2008 Genome Research Ltd (GRL).
- 2003-2006, 2008-2010, by Heng Li <lh3lh3@live.co.uk>
-
-Files: samtools/razf.c.pysam.c samtools/razf.h
-Copyright:  2008, Jue Ruan <ruanjue@gmail.com>, Heng Li <lh3@sanger.ac.uk>
-
-samtools/sam.h:  @copyright Genome Research Ltd.
-
-samtools/win32/zconf.h: * Copyright (C) 1995-2005 Jean-loup Gailly.
-samtools/win32/zconf.h: * For conditions of distribution and use, see copyright notice in zlib.h
-samtools/win32/zconf.h:#   pragma map(inflate_copyright,"INCOPY")
-samtools/win32/zlib.h:  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
-
-tabix/khash.h:  @copyright Heng Li