launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

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

Commit message:
Add conflicts/replaces for maas-region-controller to maas-cluster-controller.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/raring_packaging_update/+merge/136787
-- 
https://code.launchpad.net/~andreserl/maas/raring_packaging_update/+merge/136787
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/raring_packaging_update into lp:~maas-maintainers/maas/packaging.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-27 14:08:08 +0000
+++ debian/changelog	2012-11-28 20:53:25 +0000
@@ -44,6 +44,8 @@
   * debian/control:
     - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
     - maas-dns: Conflicts with dnsmasq
+    - maas-cluster-controller Conflicts/Replaces maas-region-controller as import
+      scripts are no longer shipped in the region.
   * debian/maas-cluster-controller.config: If URL has been detected, add /MAAS if
     it doesn't contain it. This helps upgrades from versions where DEFAULT_MAAS_URL
     didn't use /MAAS.

=== modified file 'debian/control'
--- debian/control	2012-11-13 20:15:32 +0000
+++ debian/control	2012-11-28 20:53:25 +0000
@@ -184,8 +184,8 @@
          ${misc:Depends},
          ${python:Depends}
 Suggests: maas-dhcp (= ${binary:Version})
-Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), tftpd-hpa
-Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ), tftpd-hpa
+Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 )
 Description: Ubuntu MAAS Cluster Controller
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
  nice UI to provision your Ubuntu servers. Each physical server