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

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 207
Merged at revision: 205
Proposed branch: lp:~andreserl/maas/packaging_bzr1656
Merge into: lp:~maas-maintainers/maas/packaging
Diff against target: 49 lines (+17/-4)
2 files modified
debian/changelog (+17/-2)
debian/control (+0/-2)
To merge this branch: bzr merge lp:~andreserl/maas/packaging_bzr1656
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Launchpad code reviewers Pending
Review via email: mp+189104@code.launchpad.net

Commit message

Releasing 1.4+bzr1656+dfsg-0ubuntu1
Opening 1.4+bzr1656+dfsg-0ubuntu2

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
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 2013-10-02 19:37:31 +0000
+++ debian/changelog 2013-10-03 14:49:11 +0000
@@ -1,8 +1,23 @@
1maas (1.4+bzr1656+dfsg-0ubuntu1) UNRELEASED; urgency=low1maas (1.4+bzr1656+dfsg-0ubuntu2) UNRELEASED; urgency=low
22
3 * UNRELEASED
4
5 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 03 Oct 2013 10:36:20 -0400
6
7maas (1.4+bzr1656+dfsg-0ubuntu1) saucy; urgency=low
8
9 [ Andres Rodriguez ]
3 * New upstream bugfix release.10 * New upstream bugfix release.
11 - Respect filters for ephemerals_script.py.
4 * debian/control: Depends on ubuntu-cloudimage-keyring instead of12 * debian/control: Depends on ubuntu-cloudimage-keyring instead of
5 ubuntu-cloud-keyring; depends on python-distro-info.13 ubuntu-cloud-keyring; depends on python-distro-info.
14 * debian/control: Remove suggests on maas-dhcp and maas-dns as they are
15 now dependencies.
16
17 [ Scott Moser ]
18 * debian/control: Bump depends on isc-dhcp-server to 4.2.4
19 * debian/maas-dhcp.maas-dhcp-server.upstart: Change ownership of leases
20 file to root:root, and run the daemon as dhcpd:dhcpd.
621
7 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 01 Oct 2013 15:26:34 -040022 -- Andres Rodriguez <andreserl@ubuntu.com> Tue, 01 Oct 2013 15:26:34 -0400
823
924
=== 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 @@
72 ${misc:Depends},72 ${misc:Depends},
73 ${python:Depends}73 ${python:Depends}
74Recommends: openssh-server74Recommends: openssh-server
75Suggests: maas-dns
76Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )75Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
77Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )76Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
78Description: Ubuntu MAAS Server77Description: Ubuntu MAAS Server
@@ -191,7 +190,6 @@
191 wget,190 wget,
192 ${misc:Depends},191 ${misc:Depends},
193 ${python:Depends}192 ${python:Depends}
194Suggests: maas-dhcp (= ${binary:Version})
195Conflicts: tftpd-hpa193Conflicts: tftpd-hpa
196Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )194Breaks: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
197Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )195Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )

Subscribers

People subscribed via source and target branches

to all changes: