fix rules file. No more separate setup.py files

Rewritten-From: 092861292f6bbb55bf21a07e3027ddb0acf6bb04

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 99511f8cb693f65a34f9100ca4a70ef312b2b18a..0c5ce600fa62c3ad7f0edc2536346ea4ab76da8f 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,3 +1,9 @@
+horizon (2012.1~e3+git134-g052aa55-1) unstable; urgency=low
+
+  * some testing
+
+ -- Ghe Rivero <ghe@debian.org>  Wed, 29 Feb 2012 10:12:59 +0100
+
 horizon (2012.1~e3-3) unstable; urgency=low
 
   * Added manage.py to openstack-dashboard pkg

diff --git a/xenial/debian/rules b/xenial/debian/rules
index b0f9097053153d7e0112c8c518b8ae429a6ef39f..4675af1b6a9f74c5c54123c9fb8481079cc8fc9c 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -2,42 +2,20 @@
 %:
        dh $@ --with python2
 
-SOURCE_DIRS=horizon openstack-dashboard
-
-# Add -B so we do not pollute the source tree
-PYTHON=python -B
-
-override_dh_auto_build:
-       dh_auto_build
-       for d in $(SOURCE_DIRS); \
-       do \
-               cd $(CURDIR)/$$d && $(PYTHON) setup.py build; \
-       done
-
 override_dh_auto_install:
-       dh_auto_install
-       for d in $(SOURCE_DIRS); \
-       do \
-               cd $(CURDIR)/$$d && $(PYTHON) setup.py install --install-layout=deb --root=$(CURDIR)/debian/tmp; \
-       done
-       # Actually the setup.py from openstack-dashboard does not install anything…
+       python setup.py install --root=$(CURDIR)/debian/tmp --no-compile -O0 --install-layout=deb
        install -d -m 755  $(CURDIR)/debian/tmp/usr/share/openstack-dashboard
-       cp -a $(CURDIR)/openstack-dashboard/dashboard $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
-       cp -a $(CURDIR)/openstack-dashboard/local $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
+       cp -a $(CURDIR)/openstack_dashboard/local $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
        install -d -m 755 $(CURDIR)/debian/tmp/etc/openstack-dashboard
-       cp $(CURDIR)/openstack-dashboard/local/local_settings.py.example \
+       cp $(CURDIR)/openstack_dashboard/local/local_settings.py.example \
                $(CURDIR)/debian/tmp/etc/openstack-dashboard/settings.py
-       cp $(CURDIR)/openstack-dashboard/manage.py \
+       cp $(CURDIR)/manage.py \
                $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/manage.py
 
-       ln -s /etc/openstack-dashboard/settings.py $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/local/local_settings.py
+       ln -s /etc/openstack_dashboard/settings.py $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/local/local_settings.py
 
 override_dh_auto_clean:
        dh_auto_clean
-       for d in $(SOURCE_DIRS); \
-       do \
-               cd $(CURDIR)/$$d && $(PYTHON) setup.py clean; \
-       done
        rm -rf $(CURDIR)/horizon/build
        rm -rf $(CURDIR)/horizon/horizon.egg-info
-       rm -rf $(CURDIR)/openstack-dashboard/openstack_dashboard.egg-info
+       rm -rf $(CURDIR)/openstack_dashboard/openstack_dashboard.egg-info
\ No newline at end of file