X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=samtools.git;a=blobdiff_plain;f=debian%2Fchangelog;fp=debian%2Fchangelog;h=3b575bdcc6faa8671feabe7f74aaa3a8489cba07;hp=e62e68b2cd3a434156a0c11040bb76c72b39dd2d;hb=e582623cf8c4778c7dc792318635821d3c494b0d;hpb=d4f09f4b4e8db48379556de31e6afd22f7979fac

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@debian.org>  Mon, 11 Jul 2011 20:22:01 +0900