[med-svn] [SCM] jellyfish branch, master, updated. upstream/1.1.5-30-gfa1dfe3

[Andreas Tille]

The following commit has been merged in the master branch:
commit a237c5b6a60ede98890261eb4ef3361a98f94070
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jun 5 14:31:55 2013 +0200

    debian/patches/man: refreshed + DEP3 description

diff --git a/debian/changelog b/debian/changelog
index 725bd4a..5dc0647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ jellyfish (1.1.10-1) UNRELEASED; urgency=low
   * debian/lintian-overrides: Upstream decided to use a dynamic library
     without really intending to make this a development package
   * debian/doc-base: docbase control file
+  * debian/patches/man: refreshed + DEP3 description
 
  -- Andreas Tille <tille at debian.org>  Wed, 05 Jun 2013 11:58:53 +0200
 
diff --git a/debian/patches/man b/debian/patches/man
index 11dcb7d..d8e1760 100644
--- a/debian/patches/man
+++ b/debian/patches/man
@@ -1,5 +1,8 @@
---- jellyfish.orig/doc/jellyfish.man
-+++ jellyfish/doc/jellyfish.man
+Author: Andreas Tille
+Description: Fix NAME section in manpage
+
+--- a/doc/jellyfish.man
++++ b/doc/jellyfish.man
 @@ -12,11 +12,7 @@
  ..
  .TH "JELLYFISH" "1" "2010/10/1" "k\-mer counter " "k\-mer counter "

-- 
count k-mers of DNA