Removed all instances of pyshared, now using lib/python2.7 instead.

Rewritten-From: 12544ec4477d60def4b620c7c20b18e86acf78f1

diff --git a/trusty/debian/apache-sites-available/openstack-dashboard-ssl.conf b/trusty/debian/apache-sites-available/openstack-dashboard-ssl.conf
index 3d5b30b0ad7375121192d6d0287612f4dd037b9f..3d13018aefbedd9b5399b8b00fb7a24edfb8717d 100644 (file)
--- a/trusty/debian/apache-sites-available/openstack-dashboard-ssl.conf
+++ b/trusty/debian/apache-sites-available/openstack-dashboard-ssl.conf
@@ -24,7 +24,7 @@
        Allow from all
     </Directory>
 
-    <Directory /usr/share/pyshared/horizon/static/horizon>
+    <Directory /usr/lib/python2.7/dist-packages/horizon/static/horizon>
        Order allow,deny
        Allow from all
     </Directory>

diff --git a/trusty/debian/apache-sites-available/openstack-dashboard.conf b/trusty/debian/apache-sites-available/openstack-dashboard.conf
index 59a64eb615297ef9705cbd03d2385a8d78d18dc3..39276f5d175096aa07fc17fc91fd2166fcf71f9c 100644 (file)
--- a/trusty/debian/apache-sites-available/openstack-dashboard.conf
+++ b/trusty/debian/apache-sites-available/openstack-dashboard.conf
@@ -16,15 +16,13 @@
        Allow from all
     </Directory>
 
-    Alias /static/horizon /usr/share/pyshared/horizon/static/horizon
+    Alias /static/horizon /usr/lib/python2.7/dist-packages/horizon/static/horizon
 
-    <Directory /usr/share/pyshared/horizon/static/horizon>
+    <Directory /usr/lib/python2.7/dist-packages/horizon/static/horizon>
        Order allow,deny
        Allow from all
     </Directory>
 
-    #Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
-
     <Directory /usr/share/openstack-dashboard/openstack_dashboard/static/>
        Order allow,deny
        Allow from all

diff --git a/trusty/debian/changelog b/trusty/debian/changelog
index 159dbb7a3cc816fa75cc6a0e3744231b70d7bdae..3308652fa8aeb335f92b4850f03bf99b1c5e0bab 100644 (file)
--- a/trusty/debian/changelog
+++ b/trusty/debian/changelog
@@ -1,6 +1,7 @@
 horizon (1:8.0.0~b3-2) experimental; urgency=medium
 
   * Added Improving_find_static_robustness.patch.
+  * Removed all instances of pyshared, now using lib/python2.7 instead.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 21 Sep 2015 13:21:22 +0000
 

diff --git a/trusty/debian/openstack-dashboard.links b/trusty/debian/openstack-dashboard.links
index 87ee563df4fe12983d8b8ef3d5ee52a13f62e7f8..15177f058c8883d04c504c4dc3a391d9bdc632f1 100644 (file)
--- a/trusty/debian/openstack-dashboard.links
+++ b/trusty/debian/openstack-dashboard.links
@@ -1,8 +1,8 @@
 /usr/bin/lessc                                         /usr/share/openstack-dashboard/bin/less/lessc
 
 /usr/share/openstack-dashboard/openstack_dashboard/static /usr/share/openstack-dashboard/static
-/usr/share/pyshared/horizon/static/horizon             /usr/share/openstack-dashboard/openstack_dashboard/static/horizon
+/usr/lib/python2.7/dist-packages/horizon/static/horizon                /usr/share/openstack-dashboard/openstack_dashboard/static/horizon
 /var/lib/openstack-dashboard/static/scss /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss
 /var/lib/openstack-dashboard/static/js /usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/js
 
-/usr/share/fonts-font-awesome/fonts /usr/share/pyshared/horizon/static/horizon/lib/font-awesome/fonts
+/usr/share/fonts-font-awesome/fonts /usr/lib/python2.7/dist-packages/horizon/static/horizon/lib/font-awesome/fonts

diff --git a/trusty/debian/python-django-horizon.links b/trusty/debian/python-django-horizon.links
index 302aab6bde0cef105a9ddf7a40177e52a7d54f29..0752090ec15d9dc2c19f75554d21010c1975ad5e 100644 (file)
--- a/trusty/debian/python-django-horizon.links
+++ b/trusty/debian/python-django-horizon.links
@@ -1,2 +1,2 @@
-/usr/share/javascript/jquery-cookie/jquery.cookie.js /usr/share/pyshared/horizon/static/horizon/lib/jquery/jquery.cookie.js
-/usr/share/javascript/jquery/jquery.min.js /usr/share/pyshared/horizon/static/horizon/lib/jquery/jquery.min.js
+/usr/share/javascript/jquery-cookie/jquery.cookie.js /usr/lib/python2.7/dist-packages/horizon/static/horizon/lib/jquery/jquery.cookie.js
+/usr/share/javascript/jquery/jquery.min.js /usr/lib/python2.7/dist-packages/horizon/static/horizon/lib/jquery/jquery.min.js

diff --git a/trusty/debian/python-django-horizon.lintian-overrides b/trusty/debian/python-django-horizon.lintian-overrides
deleted file mode 100644 (file)
index deb1954..0000000
--- a/trusty/debian/python-django-horizon.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Templates are not intended to be executed directly:
-python-django-horizon binary: script-not-executable usr/share/pyshared/horizon/dashboards/settings/project/templates/project/openrc.sh.template
-python-django-horizon binary: script-not-executable usr/share/pyshared/horizon/dashboards/settings/ec2/templates/ec2/ec2rc.sh.template