Merge ~chris.macnaughton/ubuntu/+source/horizon:master into ~ubuntu-server-dev/ubuntu/+source/horizon:master

[Chris MacNaughton]

[Albert Damen (albrt)]

Shouldn't it be

++recursive-include openstack_dashboard/conf *

with underscore instead of dash?

[Chris MacNaughton (chris.macnaughton)]

Thanks for catching that Albert!

diff --git a/debian/changelog b/debian/changelog
index 9e5ddc6..1c90b6e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+horizon (3:18.3.2-0ubuntu2) UNRELEASED; urgency=medium
+
+  * d/p/fix-skipped-config-files.patch: Ensure that config files
+    are included in the package (LP: #1872671). 
+
+ -- Chris MacNaughton <[e-mail]>  Mon, 08 Jun 2020 09:46:22 +0000
+
 horizon (3:18.3.2-0ubuntu1) groovy; urgency=medium
 
   * New upstream release for OpenStack Ussuri (LP: #1877642).
diff --git a/debian/patches/fix-skipped-config-files.patch b/debian/patches/fix-skipped-config-files.patch
new file mode 100644
index 0000000..0a7c7a8
--- /dev/null
+++ b/debian/patches/fix-skipped-config-files.patch
@@ -0,0 +1,19 @@
+Description: Policy files are missing
+ Policy files were not included in the MANIFEST.in leading
+ to them being removed form the package when the SOURCES.txt
+ file was deleted to resolve missing translations (LP: #1862343)
+Author: Chris MacNaughton <[e-mail]>
+Bug: LP: #1872671
+Origin: https://review.opendev.org/#/c/734075/
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -2,6 +2,7 @@ recursive-include doc *.py *.rst *.scss
+ recursive-include horizon *.html *.scss *.js *.csv *.template *.tmpl *.mo *.po
+ recursive-include openstack_dashboard *.html *.js *.scss *.mo *.po *.example *.eot *.svg *.ttf *.woff *.png *.ico *.wsgi *.gif *.csv *.template
+ recursive-include tools *.py *.sh
++recursive-include openstack_dashboard/conf *
+ 
+ include AUTHORS
+ include ChangeLog
diff --git a/debian/patches/series b/debian/patches/series
index 74cbaa8..d2175e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ fix-dashboard-django-wsgi.patch
 fix-dashboard-manage.patch
 ubuntu_settings.patch
 embedded-xstatic.patch
+fix-skipped-config-files.patch