Fixed debian/changelog to match reality.

Rewritten-From: d68005f81ac615b69f8a4b94a7c59b39d175c5ab

diff --git a/xenial/debian/changelog b/xenial/debian/changelog
index d39886f2d916ca76c7c2101dadc4e92cd66aa9f7..7d4b84a2cc8721fd6205a1e81029dfba7e417225 100644 (file)
--- a/xenial/debian/changelog
+++ b/xenial/debian/changelog
@@ -8,20 +8,9 @@ horizon (2:9.0.0~rc1-1) experimental; urgency=medium
   * Fixed (build-)depends for this release.
   * Added python-selenium as build-depends, to satisfy the imports.
   * Fixed debian/copyright.
-
- -- Thomas Goirand <zigo@debian.org>  Fri, 04 Mar 2016 16:56:53 +0800
-
-horizon (2:9.0.0~b2+2016.02.18.git.cda9604792-1) experimental; urgency=medium
-
-  * New upstream release, based on commit cda9604792.
-  * Fixed (build-)depends for this release.
-  * Added patch: Provide_2_simple_methods_to_check_for_disabled_panels.patch
-  * Added patch: 0100-add-openstack_auth-in-INSTALLED_APPS.patch
-  * Added patch: 0090-explicitly-declare-app_label.patch
   * Added patch: Fix_remaining_Django_1.9_test_failures.patch
-  * Added patch: Only_import_selenium_if_WITH_SELENIUM_is_set.patch
 
- -- Thomas Goirand <zigo@debian.org>  Wed, 09 Dec 2015 11:37:40 +0100
+ -- Thomas Goirand <zigo@debian.org>  Fri, 04 Mar 2016 16:56:53 +0800
 
 horizon (2:8.0.0-3) unstable; urgency=medium
 

diff --git a/xenial/debian/patches/enable_identity_users_panel.patch b/xenial/debian/patches/enable_identity_users_panel.patch
deleted file mode 100644 (file)
index cbf936d..0000000
--- a/xenial/debian/patches/enable_identity_users_panel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Enable identity_users_panel
- Otherwise, there's too many errors.
-Author: Thomas Goirand <zigo@debian.org>
-Forwarded: no
-Last-Update: 2016-02-18
-
---- horizon-9.0.0~b2+2016.02.18.git.cda9604792.orig/openstack_dashboard/enabled/_3031_identity_users_panel.py
-+++ horizon-9.0.0~b2+2016.02.18.git.cda9604792/openstack_dashboard/enabled/_3031_identity_users_panel.py
-@@ -24,7 +24,7 @@ PANEL_GROUP = 'default'
- PANEL = 'ngusers'
- 
- # If set to True, this settings file will not be added to the settings.
--DISABLED = True
-+DISABLED = False
- 
- # Python panel class of the PANEL to be added.
- ADD_PANEL = 'openstack_dashboard.dashboards.identity.ngusers.panel.NGUsers'

diff --git a/xenial/debian/patches/series b/xenial/debian/patches/series
index 878ef1b5b8eeb6faba58106902a65593c2c81c93..41ab217c395057629851cedb0f3b80b76d8082a2 100644 (file)
--- a/xenial/debian/patches/series
+++ b/xenial/debian/patches/series
@@ -1,5 +1,4 @@
 fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 fixed-horizon-MANIFEST.in.patch
-#enable_identity_users_panel.patch
 Fix_remaining_Django_1.9_test_failures.patch