pull in build changes from server

django-openstack/Makefile

@@ -33,7 +33,8 @@ builddeb:
 	$(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../
 	rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../*
 	# build the package
-	dpkg-buildpackage -i -I -rfakeroot
+	#dpkg-buildpackage -i -I -rfakeroot
+	dpkg-buildpackage -b -rfakeroot -tc -uc -D
 
 clean:
 	$(PYTHON) setup.py clean

django-openstack/debian/control

@@ -10,8 +10,15 @@ Package: django-openstack
 Architecture: all
 Homepage: https://github.com/4P/openstack-dashboard
 XB-Python-Version: ${python:Versions}
-Depends: ${misc:Depends}, ${python:Depends}
+Depends: ${misc:Depends},
+ python-django (=1.3-2),
+ python-glance,
+ python-boto,
+ python-dateutil,
+ openstackx,
+ ${python:Depends}
 Description: Blah python module that adds blah and bleh
  Here you should put a long description your package. This line *MUST* (this is
  for default printing) begin with a single space.
  Look for more information about this.
+

openstack-dashboard/setup.py

@@ -1,9 +1,18 @@
 import os
+import shutil
 from setuptools import setup, find_packages, findall
 
 def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
+dst = 'debian/openstack-dashboard/var/lib/dash'
+os.system('rm -rf %s' % dst)
+shutil.copytree('media', '%s/media' % dst)
+shutil.copytree('tools', '%s/tools' % dst)
+shutil.copytree('dashboard', '%s/dashboard' % dst)
+shutil.copytree('local', '%s/local' % dst)
+
+
 setup(
     name = "openstack-dashboard",
     version = "0.2",
@@ -13,10 +22,12 @@ setup(
     long_description = read('README'),
     author = 'Devin Carlen',
     author_email = 'devin.carlen@gmail.com',
-    packages = find_packages(),
-    package_data = {'django_openstack':
-                        [s[len('django_openstack/'):] for s in
-                         findall('django_openstack/templates')]},
+#    packages = find_packages(),
+#    package_data = {'openstack-dashboard':
+#                        [s[len('dashboard/'):] for s in
+#                         findall('dashboard/templates')]},
+
+    data_files = [],
     install_requires = ['setuptools', 'mox>=0.5.0'],
     classifiers = [
         'Development Status :: 4 - Beta',