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

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
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
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.
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 2015-12-20 21:21:02 +0000
+++ debian/changelog 2016-01-26 23:38:50 +0000
@@ -1,10 +1,14 @@
1maas (1.10.0~alpha1+bzr4569-0ubuntu1) UNRELEASED; urgency=medium1maas (1.10.0~alpha1+bzr4570-0ubuntu1) UNRELEASED; urgency=medium
22
3 * UNRELEASED3 * UNRELEASED
4 * debian/control:
4 - Remove all Upstart related services.5 - Remove all Upstart related services.
5 - Remove python-django16 dependency.6 - Remove python-django16 dependency.
6 - Add python-petname dependency.7 - Add python-petname dependency.
7 - Change dependency python-django-piston to python-django-piston3.8 - Change dependency python-django-piston to python-django-piston3.
9 - Depends on dbconfig-pgsql instead of dbconfig-common.
10 * debian/maas-region-controller.config:
11 - Preseed dbconfig common to not ask for PG server to use.
812
9 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 13 Nov 2015 13:13:42 +000013 -- Andres Rodriguez <andreserl@ubuntu.com> Fri, 13 Nov 2015 13:13:42 +0000
1014
1115
=== modified file 'debian/control'
--- debian/control 2015-12-20 21:21:02 +0000
+++ debian/control 2016-01-26 23:38:50 +0000
@@ -51,7 +51,7 @@
51Architecture: all51Architecture: all
52Depends: apache2,52Depends: apache2,
53 bind9utils,53 bind9utils,
54 dbconfig-common,54 dbconfig-pgsql,
55 iproute,55 iproute,
56 libjs-angularjs,56 libjs-angularjs,
57 libjs-yui3-full,57 libjs-yui3-full,
5858
=== modified file 'debian/maas-region-controller.config'
--- debian/maas-region-controller.config 2015-07-03 14:26:39 +0000
+++ debian/maas-region-controller.config 2016-01-26 23:38:50 +0000
@@ -27,7 +27,9 @@
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 ""
3031
32 dbc_dbserver="localhost"
31 dbc_dbname="maasdb"33 dbc_dbname="maasdb"
32 dbc_dbuser="maas"34 dbc_dbuser="maas"
33 dbc_remove="true"35 dbc_remove="true"

Subscribers

People subscribed via source and target branches