← Back to team overview

launchpad-reviewers team mailing list archive

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

 

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/packaging_bzr1656/+merge/189104
-- 
https://code.launchpad.net/~andreserl/maas/packaging_bzr1656/+merge/189104
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/packaging_bzr1656 into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/changelog'
--- debian/changelog	2013-10-02 19:37:31 +0000
+++ debian/changelog	2013-10-03 14:49:11 +0000
@@ -1,8 +1,23 @@
-maas (1.4+bzr1656+dfsg-0ubuntu1) UNRELEASED; urgency=low
-
+maas (1.4+bzr1656+dfsg-0ubuntu2) UNRELEASED; urgency=low
+
+  * UNRELEASED
+
+ -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Thu, 03 Oct 2013 10:36:20 -0400
+
+maas (1.4+bzr1656+dfsg-0ubuntu1) saucy; urgency=low
+
+  [ Andres Rodriguez ]
   * New upstream bugfix release.
+    - Respect filters for ephemerals_script.py.
   * debian/control: Depends on ubuntu-cloudimage-keyring instead of
     ubuntu-cloud-keyring; depends on python-distro-info.
+  * debian/control: Remove suggests on maas-dhcp and maas-dns as they are
+    now dependencies.
+
+  [ Scott Moser ]
+  * debian/control: Bump depends on isc-dhcp-server to 4.2.4
+  * debian/maas-dhcp.maas-dhcp-server.upstart: Change ownership of leases
+    file to root:root, and run the daemon as dhcpd:dhcpd.
 
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Tue, 01 Oct 2013 15:26:34 -0400
 

=== modified file 'debian/control'
--- debian/control	2013-10-02 21:31:11 +0000
+++ debian/control	2013-10-03 14:49:11 +0000
@@ -72,7 +72,6 @@
          ${misc:Depends},
          ${python:Depends}
 Recommends: openssh-server
-Suggests: maas-dns
 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
 Description: Ubuntu MAAS Server
@@ -191,7 +190,6 @@
          wget,
          ${misc:Depends},
          ${python:Depends}
-Suggests: maas-dhcp (= ${binary:Version})
 Conflicts: tftpd-hpa
 Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
 Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )


Follow ups