[med-svn] [pysam] 03/03: Duplicated code was verified. It seems to be quite hard to link against Debian packaged samtools - so work down the draft in debian/copyright and upload

[Andreas Tille]

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

tille pushed a commit to branch master
in repository pysam.

commit 3720252df4455022c4c9ae123c86249a07239070
Author: Andreas Tille <tille at debian.org>
Date:   Tue Feb 11 16:45:06 2014 +0100

    Duplicated code was verified.  It seems to be quite hard to link against Debian packaged samtools - so work down the draft in debian/copyright and upload
---
 debian/DRAFT     |  5 -----
 debian/copyright | 41 +++++++++++++++++++++++++++--------------
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/debian/DRAFT b/debian/DRAFT
deleted file mode 100644
index 663482e..0000000
--- a/debian/DRAFT
+++ /dev/null
@@ -1,5 +0,0 @@
-This is a draft package. Everybody is welcome to polish and upload it.
-
-Current issues:
-
- * Uses local copies of samtools and tabix.
diff --git a/debian/copyright b/debian/copyright
index 93c7aec..9359c6d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,35 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: pysam
+Upstream-Contact: Heng Li <lh3 at sanger.ac.uk>
 Source: http://pysam.googlecode.com/files/pysam-0.7.tar.gz
 
 Files: *
-Copyright: © 2008-2009 Genome Research Ltd.
+Copyright: 2008-2010 Genome Research Ltd.
+License: MIT
+
+Files: samtools/khash.h samtools/kseq.h samtools/khash.h 
+Copyright: 2008-2011 by Attractive Chaos <attractor at live.co.uk>
+License: MIT
+
+Files: samtools/kprobaln.c.pysam.c
+Copyright: 2003-2006, 2008-2010, by Heng Li <lh3lh3 at live.co.uk>
+License: MIT
+
+Files: tabix/tabix.h
+Copyright: 2009 Genome Research Ltd (GRL), 2010 Broad Institute
+License: MIT
+
+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
+Copyright: 2008 Broad Institute / Massachusetts Institute of Technology
+           2011,2012 Attractive Chaos <attractor at live.co.uk>
+License: MIT
+
+Files: tabix/bgzip.c.pysam.c
+Copyright: 2008 Broad Institute / Massachusetts Institute of Technology
 License: MIT
 
 License: MIT
@@ -30,19 +56,6 @@ License: MIT
 DRAFT
 =====
 
-The copyright of samtools and tabix must be documented as well !
-
-Files: samtools/bam.h samtools/faidx.h samtools/khash.h samtools/kseq.h samtools/ksort.h tabix/khash.h tabix/knetfile.c.pysam.c tabix/ksort.h tabix/tabix.h
-Copyright: 2008-2010 Genome Research Ltd (GRL).
-
-Files: samtools/bcftools/bcf.h
-Copyright: (c) 2010 Broad Institute
-
-Files: samtools/bgzf.c.pysam.c samtools/bgzf.h tabix/bgzf.c.pysam.c tabix/bgzf.h tabix/bgzip.c.pysam.c
-Copyright: 2008 Broad Institute / Massachusetts Institute of Technology
-
-samtools/faidx.h:  @copyright The Wellcome Trust Sanger Institute.
-
 Files: samtools/kaln.c.pysam.c samtools/kaln.h samtools/kprobaln.h
 Copyright: 2003-2006, 2008, 2009, by Heng Li <lh3lh3 at gmail.com>
 

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