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

Proposed by Chris MacNaughton on 2020-06-09
Status: Merged
Merged at revision: 7f9f0d6b51cd617fd97c3d666de6902b888b8246
Proposed branch: ~chris.macnaughton/ubuntu/+source/horizon:master
Merge into: ~ubuntu-server-dev/ubuntu/+source/horizon:master
Diff against target: 49 lines (+27/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/fix-skipped-config-files.patch (+19/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Ubuntu Server Developers 2020-06-09 Pending
Review via email: mp+385349@code.launchpad.net
To post a comment you must log in.
Albert Damen (albrt) wrote :

Shouldn't it be

++recursive-include openstack_dashboard/conf *

with underscore instead of dash?

Thanks for catching that Albert!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 9e5ddc6..1c90b6e 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,10 @@
6+horizon (3:18.3.2-0ubuntu2) UNRELEASED; urgency=medium
7+
8+ * d/p/fix-skipped-config-files.patch: Ensure that config files
9+ are included in the package (LP: #1872671).
10+
11+ -- Chris MacNaughton <chris.macnaughton@canonical.com> Mon, 08 Jun 2020 09:46:22 +0000
12+
13 horizon (3:18.3.2-0ubuntu1) groovy; urgency=medium
14
15 * New upstream release for OpenStack Ussuri (LP: #1877642).
16diff --git a/debian/patches/fix-skipped-config-files.patch b/debian/patches/fix-skipped-config-files.patch
17new file mode 100644
18index 0000000..0a7c7a8
19--- /dev/null
20+++ b/debian/patches/fix-skipped-config-files.patch
21@@ -0,0 +1,19 @@
22+Description: Policy files are missing
23+ Policy files were not included in the MANIFEST.in leading
24+ to them being removed form the package when the SOURCES.txt
25+ file was deleted to resolve missing translations (LP: #1862343)
26+Author: Chris MacNaughton <Chris.macnaughton@canonical.com>
27+Bug: LP: #1872671
28+Origin: https://review.opendev.org/#/c/734075/
29+---
30+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
31+--- a/MANIFEST.in
32++++ b/MANIFEST.in
33+@@ -2,6 +2,7 @@ recursive-include doc *.py *.rst *.scss
34+ recursive-include horizon *.html *.scss *.js *.csv *.template *.tmpl *.mo *.po
35+ recursive-include openstack_dashboard *.html *.js *.scss *.mo *.po *.example *.eot *.svg *.ttf *.woff *.png *.ico *.wsgi *.gif *.csv *.template
36+ recursive-include tools *.py *.sh
37++recursive-include openstack_dashboard/conf *
38+
39+ include AUTHORS
40+ include ChangeLog
41diff --git a/debian/patches/series b/debian/patches/series
42index 74cbaa8..d2175e0 100644
43--- a/debian/patches/series
44+++ b/debian/patches/series
45@@ -3,3 +3,4 @@ fix-dashboard-django-wsgi.patch
46 fix-dashboard-manage.patch
47 ubuntu_settings.patch
48 embedded-xstatic.patch
49+fix-skipped-config-files.patch

Subscribers

People subscribed via source and target branches