← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~andreserl/maas/maas_release_bzr11655 into lp:~maas-maintainers/maas/packaging

 

Andres Rodriguez has proposed merging lp:~andreserl/maas/maas_release_bzr11655 into lp:~maas-maintainers/maas/packaging.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/maas_release_bzr11655/+merge/188703
-- 
https://code.launchpad.net/~andreserl/maas/maas_release_bzr11655/+merge/188703
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/maas_release_bzr11655 into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/changelog'
--- debian/changelog	2013-09-26 13:43:25 +0000
+++ debian/changelog	2013-10-01 19:49:55 +0000
@@ -1,8 +1,17 @@
-maas (1.4+bzr1645+dfsg-0ubuntu1) UNRELEASED; urgency=low
-
-  * New Upstream release.
-  * debian/control: Depends on python-djorm-ext-pgarray
-  * debian/control: Depends on python-curtin
+maas (1.4+bzr1655+dfsg-0ubuntu2) UNRELEASED; urgency=low
+
+  * UNRELEASED
+
+ -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Tue, 01 Oct 2013 15:26:34 -0400
+
+maas (1.4+bzr1655+dfsg-0ubuntu1) saucy; urgency=low
+
+  * New Upstream release. (LP: #1218526)
+  * debian/control:
+    - Depends on python-djorm-ext-pgarray, python-curtin,
+      python-simplestreams, ubuntu-cloud-keyring.
+    - Depends on maas-dns, maas-dhcp to get them seeded and
+      into main (LP: #1227353)
 
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 28 Aug 2013 11:17:44 -0400
 

=== modified file 'debian/control'
--- debian/control	2013-09-26 13:43:25 +0000
+++ debian/control	2013-10-01 19:49:55 +0000
@@ -57,9 +57,9 @@
          libjs-yui3-full,
          libjs-yui3-min,
          maas-common (= ${binary:Version}),
+         maas-dns (= ${binary:Version}),
          postgresql-9.1,
          pwgen,
-         python-curtin,
          python-django,
          python-django-maas (= ${binary:Version}),
          python-django-piston,
@@ -102,6 +102,7 @@
          python-oops-datedir-repo,
          python-oops-twisted,
          python-pyparsing,
+         python-simplestreams,
          python-tempita,
          python-twisted-core,
          python-twisted-web,
@@ -171,6 +172,7 @@
          freeipmi-tools,
          maas-cli (=${binary:Version}),
          maas-common (=${binary:Version}),
+         maas-dhcp (=${binary:Version}),
          python-celery,
          python-httplib2,
          python-lockfile,
@@ -183,6 +185,7 @@
          rsyslog,
          syslinux-common,
          tgt,
+         ubuntu-cloud-keyring,
          uuid-runtime,
          wget,
          ${misc:Depends},
@@ -211,6 +214,7 @@
 Depends: python-avahi,
          python-celery,
          python-convoy,
+         python-curtin,
          python-dbus,
          python-lockfile,
          python-lxml,