From fe158fb3c6dc2b2c9b89399eb57f40e17443688f Mon Sep 17 00:00:00 2001 From: Thomas Goirand <thomas@goirand.fr> Date: Tue, 22 Sep 2015 09:04:06 +0000 Subject: [PATCH] Removed all instances of pyshared, now using lib/python2.7 instead. Rewritten-From: 12544ec4477d60def4b620c7c20b18e86acf78f1 --- .../apache-sites-available/openstack-dashboard-ssl.conf | 2 +- .../debian/apache-sites-available/openstack-dashboard.conf | 6 ++---- xenial/debian/changelog | 1 + xenial/debian/openstack-dashboard.links | 4 ++-- xenial/debian/python-django-horizon.links | 4 ++-- xenial/debian/python-django-horizon.lintian-overrides | 3 --- 6 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 xenial/debian/python-django-horizon.lintian-overrides diff --git a/xenial/debian/apache-sites-available/openstack-dashboard-ssl.conf b/xenial/debian/apache-sites-available/openstack-dashboard-ssl.conf index 3d5b30b..3d13018 100644 --- a/xenial/debian/apache-sites-available/openstack-dashboard-ssl.conf +++ b/xenial/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/xenial/debian/apache-sites-available/openstack-dashboard.conf b/xenial/debian/apache-sites-available/openstack-dashboard.conf index 59a64eb..39276f5 100644 --- a/xenial/debian/apache-sites-available/openstack-dashboard.conf +++ b/xenial/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/xenial/debian/changelog b/xenial/debian/changelog index 159dbb7..3308652 100644 --- a/xenial/debian/changelog +++ b/xenial/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/xenial/debian/openstack-dashboard.links b/xenial/debian/openstack-dashboard.links index 87ee563..15177f0 100644 --- a/xenial/debian/openstack-dashboard.links +++ b/xenial/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/xenial/debian/python-django-horizon.links b/xenial/debian/python-django-horizon.links index 302aab6..0752090 100644 --- a/xenial/debian/python-django-horizon.links +++ b/xenial/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/xenial/debian/python-django-horizon.lintian-overrides b/xenial/debian/python-django-horizon.lintian-overrides deleted file mode 100644 index deb1954..0000000 --- a/xenial/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 -- 2.45.2