Merge branch 'packaging' into debian

diff --git a/.gitignore b/.gitignore
index 87a19be..93891d1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -16,9 +16,9 @@ gwt-unitCache
 *.egg-info
 */dist/
 */build/
-*/pithos_web_client/version.py
-*/pithos_web_client/templates/pithos_web_client/*
-*/pithos_web_client/static/pithos_web_client/*
+*/pithos_webclient/version.py
+*/pithos_webclient/templates/pithos_web_client/*
+*/pithos_webclient/static/pithos_web_client/*
 distribute*.tar.gz
 distribute*.egg
 docs/build

diff --git a/snf-pithos-webclient/MANIFEST.in b/snf-pithos-webclient/MANIFEST.in
index 1d5e110..c5789ce 100644 (file)
--- a/snf-pithos-webclient/MANIFEST.in
+++ b/snf-pithos-webclient/MANIFEST.in
@@ -2,7 +2,7 @@ include README Changelog
 include distribute_setup.py
 global-include */templates/* */fixtures/* */static/*
 global-exclude */.DS_Store
-recursive-include pithos_web_client/templates/ *.html *.txt
-recursive-include pithos_web_client/static/ *.js *.css *.less *.html *.txt *.png *.gif *.jpg
+recursive-include pithos_webclient/templates/ *.html *.txt
+recursive-include pithos_webclient/static/ *.js *.css *.less *.html *.txt *.png *.gif *.jpg
 prune docs
 prune other

diff --git a/snf-pithos-webclient/README b/snf-pithos-webclient/README
index 4c0bee7..cf16a97 100644 (file)
--- a/snf-pithos-webclient/README
+++ b/snf-pithos-webclient/README
@@ -1,4 +1,4 @@
-snf-pithos-web-client
+snf-pithos-webclient
 =====================
 
 This is the python package of the synnefo pithos ui frontend