From: Thomas Goirand <thomas@goirand.fr>
Date: Tue, 4 Aug 2015 09:34:06 +0000 (+0000)
Subject: Declares incompatibility with Django 1.8.
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c61326dff95bb910b85cda110a7717e525785d4d;p=openstack-build%2Fhorizon-build.git

Declares incompatibility with Django 1.8.

Rewritten-From: d5131c0080d03f25c3275a795f6e4a21a6f90b4a
---

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index d425a28..243618d 100644
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -2,6 +2,9 @@ horizon (1:8.0.0~b2-1) experimental; urgency=medium
 
   * New upstream release.
   * Fixed (build-)depends for this release.
+  * Remobed build-conflicts on python-unittest2.
+  * Removed the manual copy of the angular folder in debian/rules.
+  * Declares incompatibility with Django 1.8.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 03 Aug 2015 16:16:25 +0200
 
diff --git a/xenial/debian/control b/xenial/debian/control
index da03de4..952e378 100644
--- a/xenial/debian/control
+++ b/xenial/debian/control
@@ -17,7 +17,7 @@ Build-Depends-Indep: gettext,
                      python-cinderclient (>= 1:1.3.0),
                      python-compressor,
                      python-coverage,
-                     python-django,
+                     python-django (<< 1.8),
                      python-django-babel,
                      python-django-nose,
                      python-django-pyscss (>= 2.0.2),
@@ -88,12 +88,11 @@ Vcs-Git: git://anonscm.debian.org/openstack/horizon.git
 Package: python-django-horizon
 Section: python
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~),
 Depends: python-babel,
          python-ceilometerclient (>= 1.0.13),
          python-cinderclient (>= 1:1.3.0),
          python-compressor,
-         python-django,
+         python-django (<< 1.8),
          python-django-babel,
          python-django-pyscss (>= 2.0.2),
          python-eventlet (>= 0.17.4),
@@ -160,7 +159,6 @@ Description: Django module providing web interaction with OpenStack
 
 Package: openstack-dashboard
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~),
 Depends: adduser,
          libjs-jquery,
          libjs-jquery-cookie,
@@ -178,7 +176,6 @@ Description: web application to control an OpenStack cloud
 
 Package: openstack-dashboard-apache
 Architecture: all
-Pre-Depends: dpkg (>= 1.15.6~),
 Depends: debconf,
          libapache2-mod-wsgi (>= 2.3),
          openstack-dashboard,
diff --git a/xenial/debian/rules b/xenial/debian/rules
index 277bc99..4690366 100755
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -38,9 +38,6 @@ override_dh_auto_install:
 	ln -fs /etc/openstack-dashboard/local_settings.py \
 		$(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/local/local_settings.py
 
-	# Copy the missing angular folder
-	cp -auxf horizon/static/angular $(CURDIR)/debian/tmp/usr/share/openstack-dashboard/openstack_dashboard/static
-
 override_dh_link:
 	mkdir -p $(CURDIR)/debian/openstack-dashboard/var/lib/openstack-dashboard/static/scss
 	mv $(CURDIR)/debian/openstack-dashboard/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/scss/* $(CURDIR)/debian/openstack-dashboard/var/lib/openstack-dashboard/static/scss