Now packaging Mitaka rc1.

Rewritten-From: 2ad249dc51afa9b9b3b7524f338b7490f6caef27

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index 565cf853333a840febd78c60ce50fd33a499ae2a..2197c611b94376bd6e28e8e21aeebd357bc9b291 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -1,9 +1,10 @@
-neutron (2:8.0.0~b3-2) UNRELEASED; urgency=medium
+neutron (2:8.0.0~rc1-1) experimental; urgency=medium
 
+  * New upstream release.
   * Fixed ryu version to 3.30, since I could upload it to Experimental after
     current maintainer agreed with team maintenance.
 
- -- Thomas Goirand <zigo@debian.org>  Wed, 09 Mar 2016 00:30:05 +0100
+ -- Thomas Goirand <zigo@debian.org>  Mon, 21 Mar 2016 14:46:45 +0100
 
 neutron (2:8.0.0~b3-1) experimental; urgency=medium
 

diff --git a/xenial/debian/rules b/xenial/debian/rules
index 6f8a0ba28e9d7dd4afbc61b61bb8f81c4f8273c8..b3bf6c1fce746657b638bfe3381fbd890587b10f 100755 (executable)
--- a/xenial/debian/rules
+++ b/xenial/debian/rules
@@ -121,9 +121,9 @@ override_dh_install:
        pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf oslo_concurrency lock_path /var/lock/neutron
 
        # Fix v3 auth for the [nova] section
+       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova auth_type v3password
        pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova user_domain_id default
        pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova project_name admin
-       pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova auth_type v3password
        pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova auth_url http://127.0.0.1:5000/v3
        pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova tenant_name admin
        pkgos-fix-config-default $(CURDIR)/debian/neutron-common/usr/share/neutron-common/neutron.conf nova username admin