launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

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

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

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/quantal_packaging_changes/+merge/136788
-- 
https://code.launchpad.net/~andreserl/maas/quantal_packaging_changes/+merge/136788
Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/quantal_packaging_changes into lp:~maas-maintainers/maas/packaging.quantal.

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-22 02:55:25 +0000
+++ debian/changelog	2012-11-28 20:53:26 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr1309+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr1314+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream bugfix release. Fixes:
     - IPMI detection ends up with power_address of 0.0.0.0 (LP: #1064224)
@@ -38,6 +38,7 @@
     - maas-cluster-controller Conflicts with tftpd-hpa (LP: #1076028)
     - maas-dns: Conflicts with dnsmasq
     - Drop Dependency on rabbitmq-server for maas-cluster-controller. (LP: #1072744)
+    - Add conflicts/replaces for maas-region-controller to maas-cluster-controller.
   * 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:42:13 +0000
+++ debian/control	2012-11-28 20:53:26 +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