Updated usage message; added test for newmerge.

Makefile

@@ -25,6 +25,12 @@ test_onecore_precomp: precompdir
 	${AUDFPRINT} merge --dbase fpdbase.pklz fpdbase0.pklz
 	${AUDFPRINT} match --dbase fpdbase.pklz precompdir/query.afpt
 
+test_onecore_newmerge: precompdir
+	${AUDFPRINT} new --dbase fpdbase0.pklz precompdir/Nine_Lives/0*
+	${AUDFPRINT} new --dbase fpdbase.pklz precompdir/Nine_Lives/1*
+	${AUDFPRINT} newmerge --dbase fpdbase_new.pklz fpdbase.pklz fpdbase0.pklz
+	${AUDFPRINT} match --dbase fpdbase_new.pklz precompdir/query.afpt
+
 precompdir: audfprint.py audfprint_analyze.py audfprint_match.py hash_table.py
 	rm -rf precompdir
 	mkdir precompdir

audfprint.py

@@ -292,12 +292,15 @@ def report(msglist):
 
 # CLI specified via usage message thanks to docopt
 USAGE = """
-Audio landmark-based fingerprinting.
-Create a new fingerprint dbase with new,
-append new files to an existing database with add,
-or identify noisy query excerpts with match.
-"Precompute" writes a *.fpt file under fptdir with
-precomputed fingerprint for each input wav file.
+Landmark-based audio fingerprinting.
+Create a new fingerprint dbase with "new",
+append new files to an existing database with "add",
+or identify noisy query excerpts with "match".
+"precompute" writes a *.fpt file under precompdir
+with precomputed fingerprint for each input wav file.
+"merge" combines previously-created databases into
+an existing database; "newmerge" combines existing
+databases to create a new one.
 
 Usage: audfprint (new | add | match | precompute | merge | newmerge) [options] <file>...
 
@@ -334,7 +337,7 @@ def report(msglist):
   --help                          Print this message
 """
 
-__version__ = 20140906
+__version__ = 20150406
 
 def main(argv):
     """ Main routine for the command-line interface to audfprint """