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

[Andres Rodriguez]

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

[Andres Rodriguez (andreserl)]

review: Approve

[Julian Edwards (julian-edwards)]

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!

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-07 19:23:21 +0000
+++ debian/changelog	2013-03-08 22:40:29 +0000
@@ -1,6 +1,6 @@
-maas (1.2+bzr1370+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (1.2+bzr1372+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
-  * UNRELEASED
+  * debian/control: Drop Conflicts/replaces on maas-provision.
 
  -- Andres Rodriguez <[e-mail]>  Thu, 07 Mar 2013 14:22:35 -0500
 
 
=== modified file 'debian/control'
--- debian/control	2013-02-14 18:30:53 +0000
+++ debian/control	2013-03-08 22:40:29 +0000
@@ -16,8 +16,6 @@
 Architecture: all
 Pre-Depends: ${misc:Pre-Depends}, ${misc:Depends}
 Depends: maas-cluster-controller, maas-region-controller, python-django-maas
-Conflicts: maas-provision
-Replaces: maas-provision
 Description: Ubuntu MAAS Server
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
  nice UI to provision your Ubuntu servers. Each physical server