Merge lp:~andreserl/maas/maas_packaging_update_upgrade into lp:~maas-maintainers/maas/packaging.quantal

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: 164
Merged at revision: 164
Proposed branch: lp:~andreserl/maas/maas_packaging_update_upgrade
Merge into: lp:~maas-maintainers/maas/packaging.quantal
Diff against target: 25 lines (+2/-4)
2 files modified
debian/changelog (+2/-2)
debian/control (+0/-2)
To merge this branch: bzr merge lp:~andreserl/maas/maas_packaging_update_upgrade
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+152528@code.launchpad.net

Commit message

debian/control: Drop Conflicts/replaces on maas-provision.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) :
review: Approve
Revision history for this message
Julian Edwards (julian-edwards) wrote :

On 09/03/13 08:41, Andres Rodriguez wrote:
> Commit message:
> debian/control: Drop Conflicts/replaces on maas-provision.

Hi there. Just a small piece of advice - it would be useful if you said
why you need to do this in the commit message / changelog, as as it
stands it doesn't add any more information than I can see by looking at
the diff.

Thanks!

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 2013-03-07 19:23:21 +0000
3+++ debian/changelog 2013-03-08 22:40:29 +0000
4@@ -1,6 +1,6 @@
5-maas (1.2+bzr1370+dfsg-0ubuntu2) UNRELEASED; urgency=low
6+maas (1.2+bzr1372+dfsg-0ubuntu1) UNRELEASED; urgency=low
7
8- * UNRELEASED
9+ * debian/control: Drop Conflicts/replaces on maas-provision.
10
11 -- Andres Rodriguez <andreserl@ubuntu.com> Thu, 07 Mar 2013 14:22:35 -0500
12
13
14=== modified file 'debian/control'
15--- debian/control 2013-02-14 18:30:53 +0000
16+++ debian/control 2013-03-08 22:40:29 +0000
17@@ -16,8 +16,6 @@
18 Architecture: all
19 Pre-Depends: ${misc:Pre-Depends}, ${misc:Depends}
20 Depends: maas-cluster-controller, maas-region-controller, python-django-maas
21-Conflicts: maas-provision
22-Replaces: maas-provision
23 Description: Ubuntu MAAS Server
24 Ubuntu MAAS Server is the successor to Orchestra. It offers a
25 nice UI to provision your Ubuntu servers. Each physical server

Subscribers

People subscribed via source and target branches