[med-svn] [jellyfish1] 01/04: Imported Upstream version 2.1.5

[Andreas Tille]

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

tille pushed a commit to annotated tag upstream/2.2.3
in repository jellyfish1.

commit e5b008d7193fcc28fcd5fa6b99f2ecaacceda810
Author: Charles Plessy <plessy at debian.org>
Date:   Wed Jun 17 18:05:27 2015 +0900

    Imported Upstream version 2.1.5
---
 configure.ac                         | 2 +-
 sub_commands/info_main_cmdline.yaggo | 6 ++----
 sub_commands/mem_main_cmdline.yaggo  | 6 ++----
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/configure.ac b/configure.ac
index fba0614..9ddcef5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([jellyfish], [2.1.4], [gmarcais at umd.edu])
+AC_INIT([jellyfish], [2.1.5], [gmarcais at umd.edu])
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([subdir-objects foreign parallel-tests color-tests])
diff --git a/sub_commands/info_main_cmdline.yaggo b/sub_commands/info_main_cmdline.yaggo
index 34d98cf..71b60ab 100644
--- a/sub_commands/info_main_cmdline.yaggo
+++ b/sub_commands/info_main_cmdline.yaggo
@@ -1,11 +1,9 @@
 purpose "Display information about a jellyfish file"
 package "jellyfish info"
 
-description <<EOS
-This command shows some information about how this jellyfish output
+description "This command shows some information about how this jellyfish output
 file was created. Without any argument, it displays the command line
-used, when and where it was run.
-EOS
+used, when and where it was run."
 
 option("s", "skip") {
   description "Skip header and dump remainder of file"
diff --git a/sub_commands/mem_main_cmdline.yaggo b/sub_commands/mem_main_cmdline.yaggo
index e4f5447..168cffc 100644
--- a/sub_commands/mem_main_cmdline.yaggo
+++ b/sub_commands/mem_main_cmdline.yaggo
@@ -1,8 +1,7 @@
 purpose "Give memory usage information"
 package "jellyfish mem"
 
-description <<EOS
-The mem subcommand gives some information about the memory usage of
+description "The mem subcommand gives some information about the memory usage of
 Jellyfish when counting mers. If one replace 'count' by 'mem' in the
 command line, it displays the amount of memory needed. All the
 switches of the count subcommand are supported, although only the
@@ -14,8 +13,7 @@ that amount of memory is returned.
 
 The memory usage information only takes into account the hash to store
 the k-mers, not various buffers (e.g. in parsing the input files). But
-typically those will be small in comparison to the hash.
-EOS
+typically those will be small in comparison to the hash."
 
 option("mer-len", "m") {
   description "Length of mer"

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