[med-svn] [SCM] samtools branch, master, updated. debian/0.1.16-1-6-g5075acd

[Charles Plessy]

The following commit has been merged in the master branch:
commit e582623cf8c4778c7dc792318635821d3c494b0d
Author: Charles Plessy <plessy at debian.org>
Date:   Mon Jul 11 20:32:09 2011 +0900

    bcftools.1 and samtools.1 were merged in upstream release 0.1.17.

diff --git a/debian/changelog b/debian/changelog
index e62e68b..3b575bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 samtools (0.1.17-1) UNRELEASED; urgency=low
 
   * New upstream release 0.1.17 (6 July, 2011).
+  * bcftools.1 and samtools.1 merged (debian/rules, debian/samtools.manpages).
 
  -- Charles Plessy <plessy at debian.org>  Mon, 11 Jul 2011 20:22:01 +0900
 
diff --git a/debian/rules b/debian/rules
index 3605b20..93bf3aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,7 @@ clean::
 
 binary-install/samtools::
 	install -m 644 bcftools/README $(CURDIR)/debian/samtools/usr/share/doc/samtools/README.bcftools
+	ln -s samtools.1.gz $(CURDIR)/debian/samtools/usr/share/man/man1/bcftools.1.gz
 
 binary-fixup/samtools::
 	sed -i 's|^#!/software/bin/python|#!/usr/bin/python|' $(CURDIR)/debian/samtools/usr/share/samtools/varfilter.py
diff --git a/debian/samtools.manpages b/debian/samtools.manpages
index e28faa0..18d2896 100644
--- a/debian/samtools.manpages
+++ b/debian/samtools.manpages
@@ -1,3 +1,2 @@
 samtools.1
 debian/razip.1
-bcftools/bcftools.1

-- 
Processing of sequence alignments in SAM and BAM formats.