Update horizon package [MOS 9.0]

* Revert changes to openstack-dashboard package.

Change-Id: I30e3f767dae68e6a23b09771a2a6661c76617991
Counter: #2

diff --git a/tests/runtests.sh b/tests/runtests.sh
index 1d4e119afb2f38a39499a455b93c3c6772041687..640c7f7e7b8863a8499e65bfa9550bf7aa0bc8ef 100755 (executable)
--- a/tests/runtests.sh
+++ b/tests/runtests.sh
@@ -9,10 +9,10 @@ grep -qi 'ubuntu' /etc/*-release && DISTR='Ubuntu'
 }
 
 case $1 in
-   openstack-dashboard|openstack-dashboard-apache|openstack-dashboard-common)
+   openstack-dashboard|openstack-dashboard-apache)
       get_distr_name
 
-      if [ "$DISTR" = "Ubuntu" ] && [ "$1" = "openstack-dashboard-common" ]; then
+      if [ "$DISTR" = "Ubuntu" ] && [ "$1" = "openstack-dashboard" ]; then
           echo 'Test is not defined.'
           exit 0
       fi

diff --git a/trusty/debian/control b/trusty/debian/control
index 9f87b96fff07ca237046dd3d9818dd15e84b7b0a..fff0b7be083d030de4b3370b580a7bbdcb199bfd 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -155,15 +155,6 @@ Description: Django module providing web interaction with OpenStack
 
 Package: openstack-dashboard
 Architecture: all
-Depends: openstack-dashboard-apache (= ${source:Version})
-Description: web application to control an OpenStack cloud
- The OpenStack Dashboard is a web application to control an OpenStack
- cloud. It connects to OpenStack services such as Nova, Swift, or Keystone
- using the OpenStack REST API just as you would with the command line
- clients.
-
-Package: openstack-dashboard-common
-Architecture: all
 Depends: adduser,
          libjs-jquery,
          libjs-jquery-cookie,
@@ -184,7 +175,7 @@ Architecture: all
 Depends: apache2 (>= 2.4),
          debconf,
          libapache2-mod-wsgi (>= 2.3),
-         openstack-dashboard-common,
+         openstack-dashboard,
          ${misc:Depends},
 Description: web application to control an OpenStack cloud - Apache support
  The OpenStack Dashboard is a web application to control an OpenStack
@@ -193,7 +184,7 @@ Description: web application to control an OpenStack cloud - Apache support
  clients.
  .
  This package includes the configuration files to use within Apache. If you
- wish to configure Apache yourself, use only openstack-dashboard-common.
+ wish to configure Apache yourself, use only openstack-dashboard.
 
 Package: horizon-doc
 Section: doc

diff --git a/trusty/debian/openstack-dashboard-common.dirs b/trusty/debian/openstack-dashboard.dirs
similarity index 100%
rename from trusty/debian/openstack-dashboard-common.dirs
rename to trusty/debian/openstack-dashboard.dirs

diff --git a/trusty/debian/openstack-dashboard-common.install b/trusty/debian/openstack-dashboard.install
similarity index 100%
rename from trusty/debian/openstack-dashboard-common.install
rename to trusty/debian/openstack-dashboard.install

diff --git a/trusty/debian/openstack-dashboard-common.links b/trusty/debian/openstack-dashboard.links
similarity index 100%
rename from trusty/debian/openstack-dashboard-common.links
rename to trusty/debian/openstack-dashboard.links

diff --git a/trusty/debian/openstack-dashboard-common.postinst b/trusty/debian/openstack-dashboard.postinst
similarity index 100%
rename from trusty/debian/openstack-dashboard-common.postinst
rename to trusty/debian/openstack-dashboard.postinst

diff --git a/trusty/debian/openstack-dashboard-common.postrm b/trusty/debian/openstack-dashboard.postrm
similarity index 100%
rename from trusty/debian/openstack-dashboard-common.postrm
rename to trusty/debian/openstack-dashboard.postrm

diff --git a/trusty/debian/openstack-dashboard-common.triggers b/trusty/debian/openstack-dashboard.triggers
similarity index 100%
rename from trusty/debian/openstack-dashboard-common.triggers
rename to trusty/debian/openstack-dashboard.triggers

diff --git a/trusty/debian/rules b/trusty/debian/rules
index 76022dbc6978a7ca8c0d2dbedf1ad979a76ce574..562bff46829e0367aacd479611b811ed164f3ac3 100755 (executable)
--- a/trusty/debian/rules
+++ b/trusty/debian/rules
@@ -26,10 +26,10 @@ override_dh_auto_install:
        cp -a $(CURDIR)/openstack_dashboard/ $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/
 
        # Sets memcached by default in local_settings.py
-       cp $(CURDIR)/openstack_dashboard/local/local_settings.py.example $(CURDIR)/debian/openstack-dashboard-common/usr/share/openstack-dashboard/local_settings.py
-       sed -i -e 's/os.path.join(LOCAL_PATH,/os.path.join("\/","var","lib","openstack-dashboard","secret-key",/' $(CURDIR)/debian/openstack-dashboard-common/usr/share/openstack-dashboard/local_settings.py
-       echo "COMPRESS_OFFLINE=True" >> $(CURDIR)/debian/openstack-dashboard-common/usr/share/openstack-dashboard/local_settings.py
-       install -d -m 755 $(CURDIR)/debian/openstack-dashboard-common/var/lib/openstack-dashboard/static
+       cp $(CURDIR)/openstack_dashboard/local/local_settings.py.example $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/local_settings.py
+       sed -i -e 's/os.path.join(LOCAL_PATH,/os.path.join("\/","var","lib","openstack-dashboard","secret-key",/' $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/local_settings.py
+       echo "COMPRESS_OFFLINE=True" >> $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/local_settings.py
+       install -d -m 755 $(CURDIR)/debian/openstack-dashboard/var/lib/openstack-dashboard/static
 
 
        cp $(CURDIR)/manage.py \