Fixed (build-)depends.

Rewritten-From: 510067643f50899fd208d7ce8fe4878cf854ecd9

diff --git a/trusty/debian/control b/trusty/debian/control
index 2953e02fd0faa4b916fd770dbcf45a377ce4d834..6c2c6b91f103ff6bf1eb072cd3ad7b948b98eda2 100644 (file)
--- a/trusty/debian/control
+++ b/trusty/debian/control
@@ -27,14 +27,14 @@ Build-Depends-Indep: gettext,
                      python-eventlet (>= 0.16.1),
                      python-glanceclient (>= 1:0.15.0),
                      python-hacking (>= 0.8.0),
-                     python-heatclient (>= 0.2.9),
+                     python-heatclient (>= 0.3.0),
                      python-httplib2 (>= 0.7.5),
                      python-iso8601 (>= 0.1.9),
-                     python-keystoneclient (>= 1:1.0.0),
+                     python-keystoneclient (>= 1:1.1.0),
                      python-kombu (>= 2.5.12),
                      python-mox,
                      python-netaddr (>= 0.7.12),
-                     python-neutronclient (>= 2.3.6),
+                     python-neutronclient (>= 2.3.11),
                      python-nose,
                      python-nose-exclude,
                      python-nosehtmloutput,
@@ -43,7 +43,7 @@ Build-Depends-Indep: gettext,
                      python-openstack-auth (>= 1.1.7),
                      python-openstack.nose-plugin,
                      python-oslo.concurrency (>= 1.4.1),
-                     python-oslo.config (>= 1.6.0),
+                     python-oslo.config (>= 1.9.0),
                      python-oslo.i18n (>= 1.3.0),
                      python-oslo.serialization (>= 1.2.0),
                      python-oslo.utils (>= 1.2.0),
@@ -51,7 +51,7 @@ Build-Depends-Indep: gettext,
                      python-pint,
                      python-pyscss (>= 1.2.1),
                      python-saharaclient (>= 0.7.6),
-                     python-six (>= 1.7.0),
+                     python-six (>= 1.9.0),
                      python-swiftclient (>= 1:2.2.0),
                      python-testtools (>= 0.9.34),
                      python-troveclient (>= 1.0.7),
@@ -59,6 +59,7 @@ Build-Depends-Indep: gettext,
                      python-xstatic,
                      python-xstatic-angular (>= 1.3.7),
                      python-xstatic-angular-bootstrap,
+                     python-xstatic-angular-lrdragndrop,
                      python-xstatic-bootstrap-datepicker (>= 0.0.0.1-3~),
                      python-xstatic-bootstrap-scss (>= 3),
                      python-xstatic-d3,
@@ -75,6 +76,7 @@ Build-Depends-Indep: gettext,
                      python-xstatic-rickshaw,
                      python-xstatic-smart-table,
                      python-xstatic-spin,
+                     python-xstatic-term.js,
                      python-xvfbwrapper,
                      python-yaml
 Build-Conflicts: python-unittest2
@@ -98,31 +100,32 @@ Depends: python-babel (>= 1.3),
          python-django-pyscss (>= 1.0.3),
          python-eventlet (>= 0.16.1),
          python-glanceclient (>= 1:0.15.0),
-         python-heatclient (>= 0.2.9),
+         python-heatclient (>= 0.3.0),
          python-httplib2 (>= 0.7.5),
          python-iso8601 (>= 0.1.9),
-         python-keystoneclient (>= 1:1.0.0),
+         python-keystoneclient (>= 1:1.1.0),
          python-kombu (>= 2.5.12),
          python-memcache,
          python-netaddr (>= 0.7.12),
-         python-neutronclient (>= 2.3.6),
+         python-neutronclient (>= 2.3.11),
          python-novaclient (>= 2:2.18.0),
          python-openstack-auth (>= 1.1.7),
          python-oslo.concurrency (>= 1.4.1),
-         python-oslo.config (>= 1.6.0),
+         python-oslo.config (>= 1.9.0),
          python-oslo.i18n (>= 1.3.0),
          python-oslo.serialization (>= 1.2.0),
          python-oslo.utils (>= 1.2.0),
          python-pint,
          python-pyscss (>= 1.2.1),
          python-saharaclient (>= 0.7.6),
-         python-six (>= 1.7.0),
+         python-six (>= 1.9.0),
          python-swiftclient (>= 1:2.2.0),
          python-troveclient (>= 1.0.7),
          python-tz,
          python-xstatic,
          python-xstatic-angular (>= 1.3.7),
          python-xstatic-angular-bootstrap,
+         python-xstatic-angular-lrdragndrop,
          python-xstatic-bootstrap-datepicker (>= 0.0.0.1-3~),
          python-xstatic-bootstrap-scss (>= 3),
          python-xstatic-d3,
@@ -139,6 +142,7 @@ Depends: python-babel (>= 1.3),
          python-xstatic-rickshaw,
          python-xstatic-smart-table,
          python-xstatic-spin,
+         python-xstatic-term.js,
          python-yaml,
          ${misc:Depends},
          ${python:Depends}

diff --git a/trusty/debian/patches/fix-using-lrdnd-instead-of-irdnd.patch b/trusty/debian/patches/fix-using-lrdnd-instead-of-irdnd.patch
new file mode 100644 (file)
index 0000000..e6b721f
--- /dev/null
+++ b/trusty/debian/patches/fix-using-lrdnd-instead-of-irdnd.patch
@@ -0,0 +1,59 @@
+Description: Upstream was using the wrong package name.
+ Upstream was using i instead of l, this fixes it.
+Author: Thomas Goirand <zigo@debian.org>
+Forwarded: no
+Last-Update: 2015-03-23
+
+--- horizon-2015.1~b3.orig/horizon/templates/horizon/_scripts.html
++++ horizon-2015.1~b3/horizon/templates/horizon/_scripts.html
+@@ -11,7 +11,7 @@
+ {% compress js %}
+ <script type="text/javascript">var STATIC_URL = "{{ STATIC_URL }}";</script>
+ <script src='{{ STATIC_URL }}horizon/lib/angular/angular-cookies.js'></script>
+-<script src="{{ STATIC_URL }}horizon/lib/angular/irdragndrop.js"></script>
++<script src="{{ STATIC_URL }}horizon/lib/angular/lrdragndrop.js"></script>
+ <script src="{{ STATIC_URL }}horizon/lib/angular/smart-table.js"></script>
+ 
+ <script src='{{ STATIC_URL }}horizon/js/angular/controllers/namespace-controller.js'></script>
+--- horizon-2015.1~b3.orig/horizon/templates/horizon/jasmine/jasmine.html
++++ horizon-2015.1~b3/horizon/templates/horizon/jasmine/jasmine.html
+@@ -15,7 +15,7 @@
+   <script src="{{ STATIC_URL }}horizon/lib/angular/angular-cookies.js"></script>
+   <script src="{{ STATIC_URL }}horizon/lib/angular/angular-bootstrap.js"></script>
+   <script src="{{ STATIC_URL }}horizon/lib/angular/smart-table.js"></script>
+-  <script src="{{ STATIC_URL }}horizon/lib/angular/irdragndrop.js"></script>
++  <script src="{{ STATIC_URL }}horizon/lib/angular/lrdragndrop.js"></script>
+   <script src="{{ STATIC_URL }}horizon/lib/d3.js"></script>
+ 
+   <script type="text/javascript">
+--- horizon-2015.1~b3.orig/openstack_dashboard/static_settings.py
++++ horizon-2015.1~b3/openstack_dashboard/static_settings.py
+@@ -20,7 +20,7 @@ to match their distribution's standards.
+ import xstatic.main
+ import xstatic.pkg.angular
+ import xstatic.pkg.angular_bootstrap
+-import xstatic.pkg.angular_irdragndrop
++import xstatic.pkg.angular_lrdragndrop
+ import xstatic.pkg.angular_smart_table
+ import xstatic.pkg.bootstrap_datepicker
+ import xstatic.pkg.bootstrap_scss
+@@ -46,7 +46,7 @@ STATICFILES_DIRS = [
+     ('horizon/lib/angular',
+         xstatic.main.XStatic(xstatic.pkg.angular_bootstrap).base_dir),
+     ('horizon/lib/angular',
+-        xstatic.main.XStatic(xstatic.pkg.angular_irdragndrop).base_dir),
++        xstatic.main.XStatic(xstatic.pkg.angular_lrdragndrop).base_dir),
+     ('horizon/lib/angular',
+         xstatic.main.XStatic(xstatic.pkg.angular_smart_table).base_dir),
+     ('horizon/lib/bootstrap_datepicker',
+--- horizon-2015.1~b3.orig/requirements.txt
++++ horizon-2015.1~b3/requirements.txt
+@@ -42,7 +42,7 @@ six>=1.9.0
+ XStatic>=1.0.0  # MIT License
+ XStatic-Angular>=1.3.7  # MIT License
+ XStatic-Angular-Bootstrap>=0.11.0.2  # MIT License
+-XStatic-Angular-Irdragndrop>=1.0.2.1  # MIT License
++XStatic-Angular-Lrdragndrop>=1.0.2.1  # MIT License
+ XStatic-Bootstrap-Datepicker>=1.3.1.0  # Apache 2.0 License
+ XStatic-Bootstrap-SCSS>=3  # Apache 2.0 License
+ XStatic-D3>=3.1.6.2  # BSD License (3 clause)

diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series
index e883b0358c2035eff2581538e242ec72baf1c5fe..d98dec161552233a10e02e132883ca53b3cf0a82 100644 (file)
--- a/trusty/debian/patches/series
+++ b/trusty/debian/patches/series
@@ -1,3 +1,4 @@
 fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
+fix-using-lrdnd-instead-of-irdnd.patch