From: Roland Mas <lolando@debian.org>
Date: Mon, 5 Nov 2012 09:21:11 +0000 (+0100)
Subject: Merged from central repo
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5b86e96cf0d5399b72d4c4ec8d499953b5c0c022;p=openstack-build%2Fhorizon-build.git

Merged from central repo

Rewritten-From: ae6bb8f92b6f6be6ac4bddd833c65797f1aa443f
---

5b86e96cf0d5399b72d4c4ec8d499953b5c0c022
diff --cc xenial/debian/control
index 286c908,49286da..5ea2e42
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@@ -63,8 -63,10 +63,10 @@@ Depends: ${shlibs:Depends}
   python-django-horizon (= ${source:Version}),
   libjs-jquery,
   libjs-jquery-cookie,
-  adduser
- Recommends: openstack-dashboard-apache
+  node-less,
+  adduser,
+  libapache2-mod-wsgi (>= 2.3)
 -Recommends: memcached
++Recommends: memcached, openstack-dashboard-apache
  Description: OpenStack Dashboard
   The OpenStack Dashboard is a Web application allowing to control an
   OpenStack cloud.
diff --cc xenial/debian/rules
index fed090f,32d4815..73c6b04
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@@ -34,8 -40,17 +40,17 @@@ override_dh_auto_install
  	chmod 644 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js/*.js
  	chmod 644 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css/*.css
  	chmod 644 $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/manifest.json
 -	
 +
- 	dh_auto_install
+ 	# openstack-dashboard-apache
+ 	install -D -m 0644 $(CURDIR)/debian/openstack-dashboard-apache.conf $(CURDIR)/debian/tmp/etc/apache2/sites-available/openstack-dashboard
+ 	install -D -m 0644 $(CURDIR)/debian/openstack-dashboard-apache-ssl.conf $(CURDIR)/debian/tmp/etc/apache2/sites-available/openstack-dashboard-ssl
+ 
+ override_dh_install:
+ 	dh_install
+ 	rm -r $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js
+ 	rm -r $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css
+ 	ln -s /var/lib/openstack-dashboard/static/js $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js
+ 	ln -s /var/lib/openstack-dashboard/static/css $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/css
  
  override_dh_builddeb:
  	dh_builddeb -- -Zxz -z9