Merge lp:~andreserl/maas/fix_packaging_1.10 into lp:~maas-maintainers/maas/packaging-1.10

Proposed by Andres Rodriguez on 2016-01-26
Status: Merged
Approved by: Andres Rodriguez on 2016-01-26
Approved revision: 438
Merged at revision: 438
Proposed branch: lp:~andreserl/maas/fix_packaging_1.10
Merge into: lp:~maas-maintainers/maas/packaging-1.10
Diff against target: 46 lines (+8/-2)
3 files modified
debian/changelog (+5/-1)
debian/control (+1/-1)
debian/maas-region-controller.config (+2/-0)
To merge this branch: bzr merge lp:~andreserl/maas/fix_packaging_1.10
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2016-01-26
Review via email: mp+284044@code.launchpad.net

Commit message

* debian/control:
  - Depends on dbconfig-pgsql instead of dbconfig-common.
* debian/maas-region-controller.config:
  - Preseed dbconfig common to not ask for PG server to use.

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

selfie!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2015-12-20 21:21:02 +0000
3+++ debian/changelog 2016-01-26 23:38:50 +0000
4@@ -1,10 +1,14 @@
5-maas (1.10.0~alpha1+bzr4569-0ubuntu1) UNRELEASED; urgency=medium
6+maas (1.10.0~alpha1+bzr4570-0ubuntu1) UNRELEASED; urgency=medium
7
8 * UNRELEASED
9+ * debian/control:
10 - Remove all Upstart related services.
11 - Remove python-django16 dependency.
12 - Add python-petname dependency.
13 - Change dependency python-django-piston to python-django-piston3.
14+ - Depends on dbconfig-pgsql instead of dbconfig-common.
15+ * debian/maas-region-controller.config:
16+ - Preseed dbconfig common to not ask for PG server to use.
17
18 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 13 Nov 2015 13:13:42 +0000
19
20
21=== modified file 'debian/control'
22--- debian/control 2015-12-20 21:21:02 +0000
23+++ debian/control 2016-01-26 23:38:50 +0000
24@@ -51,7 +51,7 @@
25 Architecture: all
26 Depends: apache2,
27 bind9utils,
28- dbconfig-common,
29+ dbconfig-pgsql,
30 iproute,
31 libjs-angularjs,
32 libjs-yui3-full,
33
34=== modified file 'debian/maas-region-controller.config'
35--- debian/maas-region-controller.config 2015-07-03 14:26:39 +0000
36+++ debian/maas-region-controller.config 2016-01-26 23:38:50 +0000
37@@ -27,7 +27,9 @@
38 # Hide maas/dbconfig-install question by setting default.
39 set_question maas-region-controller/dbconfig-install true
40 set_question maas-region-controller/pgsql/app-pass ""
41+ set_question maas-region-controller/remote/host ""
42
43+ dbc_dbserver="localhost"
44 dbc_dbname="maasdb"
45 dbc_dbuser="maas"
46 dbc_remove="true"

Subscribers

People subscribed via source and target branches