fixes for packaging

diff --git a/debian/unfold.install b/debian/unfold.install
index fb54250..f058d15 100644 (file)
--- a/debian/unfold.install
+++ b/debian/unfold.install
@@ -1,6 +1,5 @@
 usr/lib*/python*/dist-packages/auth
 usr/lib*/python*/dist-packages/insert_above
-usr/lib*/python*/dist-packages/manifold
 usr/lib*/python*/dist-packages/plugins
 usr/lib*/python*/dist-packages/unfold
 usr/lib*/python*/dist-packages/ui

diff --git a/setup.py b/setup.py
index c5890d5..07e121b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -17,13 +17,24 @@ print packages
 # Avoid troubles : clean /usr/share/unfold/
 #shutil.rmtree('/usr/share/unfold/')
 
+def images (dir):
+    return glob( dir+"/*.png") + glob ( dir+"/*.gif")
+def javascript (dir):
+    return glob( dir+"/*.js")
+def stylesheets (dir):
+    return glob( dir+"/*.css")
+
+
 setup(packages = packages,
       # xxx somehow this does not seem to show up in debian packaging
       scripts = [ 'apache/unfold-init-ssl.sh' ],
       data_files = [ 
-          ( '/usr/share/unfold/static/js', glob ('static/js/*')),
-          ( '/usr/share/unfold/static/css', glob ('static/css/*')),
-          ( '/usr/share/unfold/static/img', glob ('static/img/*')),
+          ( '/usr/share/unfold/static/js', javascript('static/js')),
+          ( '/usr/share/unfold/static/css', stylesheets ('static/css')),
+          ( '/usr/share/unfold/static/img', images ('static/img')),
+# for portal/          
+          ( '/usr/share/unfold/static/img/institutions', images ('static/img/institutions')),
+          ( '/usr/share/unfold/static/img/testbeds', images ('static/img/testbeds')),
           ( '/usr/share/unfold/static/fonts', glob ('static/fonts/*')),
           ( '/usr/share/unfold/templates', glob ('templates/*')),
           ( 'apache', [ 'apache/unfold.conf', 'apache/unfold-ssl.conf', 'apache/unfold.wsgi' ]),