Merge lp:~andreserl/maas/1.10_packaging_improvements into lp:~maas-maintainers/maas/packaging-1.10

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 442
Merged at revision: 442
Proposed branch: lp:~andreserl/maas/1.10_packaging_improvements
Merge into: lp:~maas-maintainers/maas/packaging-1.10
Diff against target: 65 lines (+15/-7)
3 files modified
debian/changelog (+11/-3)
debian/control (+3/-3)
debian/maas-region-controller.config (+1/-1)
To merge this branch: bzr merge lp:~andreserl/maas/1.10_packaging_improvements
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+284645@code.launchpad.net

Commit message

* debian/maas-region-controller.config: Ensure we truly preseed db setting so we always use localhost and it never asks the user.
* debian/control: Suggests on python3-pyvmomi

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2016-02-01 11:23:12 +0000
+++ debian/changelog 2016-02-01 17:01:21 +0000
@@ -1,6 +1,14 @@
1maas (1.10.0+bzr4570-0ubuntu1) xenial; urgency=medium1maas (1.10.0+bzr4572-0ubuntu2) xenial; urgency=medium
22
3 * New upstram release, 1.10.0 bzr 4570:3 * debian/maas-region-controller.config: Ensure we truly preseed db
4 setting so we always use localhost and it never asks the user.
5 * debian/control: Suggests on python3-pyvmomi
6
7 -- Andres Rodriguez <andreserl@ubuntu.com> Mon, 01 Feb 2016 17:04:27 +0100
8
9maas (1.10.0+bzr4572-0ubuntu1) xenial; urgency=medium
10
11 * New upstram release, 1.10.0 bzr 4572:
4 - Support python3, drop support for python2.12 - Support python3, drop support for python2.
5 - Support django 1.8+.13 - Support django 1.8+.
6 * debian/control:14 * debian/control:
715
=== modified file 'debian/control'
--- debian/control 2016-02-01 11:21:37 +0000
+++ debian/control 2016-02-01 17:01:21 +0000
@@ -51,7 +51,6 @@
51Architecture: all51Architecture: all
52Depends: apache2,52Depends: apache2,
53 bind9utils,53 bind9utils,
54 dbconfig-pgsql,
55 iproute,54 iproute,
56 libjs-angularjs,55 libjs-angularjs,
57 libjs-yui3-full,56 libjs-yui3-full,
@@ -78,7 +77,8 @@
7877
79Package: maas-region-controller78Package: maas-region-controller
80Architecture: all79Architecture: all
81Depends: maas-dns (= ${binary:Version}),80Depends: dbconfig-pgsql,
81 maas-dns (= ${binary:Version}),
82 maas-region-controller-min (= ${binary:Version}),82 maas-region-controller-min (= ${binary:Version}),
83 postgresql (>= 9.1),83 postgresql (>= 9.1),
84 ${misc:Depends},84 ${misc:Depends},
@@ -172,7 +172,7 @@
172 wget,172 wget,
173 ${misc:Depends},173 ${misc:Depends},
174 ${python3:Depends}174 ${python3:Depends}
175Suggests: amtterm, ipmitool, libvirt-bin, python-pyvmomi175Suggests: amtterm, ipmitool, libvirt-bin, python3-pyvmomi
176Conflicts: tftpd-hpa176Conflicts: tftpd-hpa
177Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),177Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ),
178 maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ),178 maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ),
179179
=== modified file 'debian/maas-region-controller.config'
--- debian/maas-region-controller.config 2016-01-28 04:22:01 +0000
+++ debian/maas-region-controller.config 2016-02-01 17:01:21 +0000
@@ -27,7 +27,7 @@
27 # Hide maas/dbconfig-install question by setting default.27 # Hide maas/dbconfig-install question by setting default.
28 set_question maas-region-controller/dbconfig-install true28 set_question maas-region-controller/dbconfig-install true
29 set_question maas-region-controller/pgsql/app-pass ""29 set_question maas-region-controller/pgsql/app-pass ""
30 set_question maas-region-controller/remote/host ""30 set_question maas-region-controller/remote/host "localhost"
3131
32 dbc_dbname="maasdb"32 dbc_dbname="maasdb"
33 dbc_dbuser="maas"33 dbc_dbuser="maas"

Subscribers

People subscribed via source and target branches