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

diff --git a/debian/changelog b/debian/changelog
index e62e68b2cd3a434156a0c11040bb76c72b39dd2d..3b575bdcc6faa8671feabe7f74aaa3a8489cba07 100644 (file)
--- 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).
 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@debian.org>  Mon, 11 Jul 2011 20:22:01 +0900
 
 
  -- Charles Plessy <plessy@debian.org>  Mon, 11 Jul 2011 20:22:01 +0900
 

diff --git a/debian/rules b/debian/rules
index 3605b20bc981cf33522c4e01119f03acea2a3bd0..93bf3aa3c1166305dfd02400d4dfe366ec9d2f79 100755 (executable)
--- 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
 
 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
 
 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 e28faa0d04f1eb0ea5cb85d112663f3b59d179cc..18d2896b1e7865327ed42d6dbc9942998edb906d 100644 (file)
--- a/debian/samtools.manpages
+++ b/debian/samtools.manpages
@@ -1,3 +1,2 @@
 samtools.1
 debian/razip.1
 samtools.1
 debian/razip.1

-bcftools/bcftools.1