From 9d441740c6d8c54a496792089490292640191ebc Mon Sep 17 00:00:00 2001
From: Ghe Rivero <ghe@debian.org>
Date: Wed, 29 Feb 2012 10:03:52 +0100
Subject: [PATCH] fix rules file. No more separate setup.py files

Rewritten-From: 092861292f6bbb55bf21a07e3027ddb0acf6bb04
---
 trusty/debian/changelog |  6 ++++++
 trusty/debian/rules     | 34 ++++++----------------------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 99511f8..0c5ce60 100644
--- a/trusty/debian/changelog
+++ b/trusty/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/trusty/debian/rules b/trusty/debian/rules
index b0f9097..4675af1 100755
--- a/trusty/debian/rules
+++ b/trusty/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
-- 
2.45.2