Merge commit '2784e05' into moa.0.11

mfiers · Oct 24, 2012 · ef6a60e · ef6a60e
2 parents bf6f737 + 2784e05
commit ef6a60e
Show file tree

Hide file tree

Showing 25 changed files with 308 additions and 1,474 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -2,24 +2,14 @@ include VERSION
 include README
 include COPYING
 include Changelog.txt
-include etc/bash_completion.d/moa
-include etc/config
 
-include bin/moa
-include bin/moar
-include bin/moainit
-
-recursive-include template2 *.moa *.jinja2
-
-recursive-include lib/jinja2 *jinja2
-
-recursive-include share/test *.fq *fasta
-
-include etc/config
-include etc/bash_completion.d/moa
-include etc/profile.d/moa.sh
-
-include share/logo/moa.logo.txt
+recursive-include moa/data/templates *.moa *.jinja2
+recursive-include moa/data/jinja2 *.jinja2
+recursive-include moa/data/logo *.txt
+recursive-include moa/data/test *.fq *fasta
 
+include moa/data/etc/config
+include moa/data/etc/bash_completion.d/moa
+include moa/data/etc/profile.d/moa.sh
 
 
diff --git a/bin/moa b/bin/moa
diff --git a/bin/moainit b/bin/moainit
diff --git a/bin/moaprompt b/bin/moaprompt
diff --git a/bin/moar b/bin/moar
diff --git a/etc/.gitignore b/etc/.gitignore