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

[Andres Rodriguez]

debian/control: python-maas-provisioningserver Breaks/Replaces for
maas-dhcp due to moving files around packages.

[Jeroen T. Vermeulen (jtv)]

This implicitly answers two things I wasn't sure about:

1. Do we need to bump the version number?

2. Has packaging for Trusty branched yet?

Thanks for the fix. Technically I guess the problem only affects one release of the maas-dhcp package, but I don't suppose it matters much.

Jeroen

review: Approve

[Andres Rodriguez (andreserl)]

1. Not really, the ubuntu revision number should take care of this. However, the new release will have a newer upstream rev number.

2. lp:~maas-maintianers/maas/packaging is always the packaging of the development release (the trunk of the packaging) so we won't branch it until released.

The problem is really when we try to upgrade, dpkg will complain that the file in question is already installed by a different package, so 2 packages won't be able to have the same package.

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-15 15:38:32 +0000
+++ debian/changelog	2014-01-16 14:46:21 +0000
@@ -8,6 +8,8 @@
   [ Andres Rodriguez ]
   * debian/maas-region-controller.postinst: Make sure maas-txlongpoll and
     maas-region-celery get restarted.
+  * debian/control: python-maas-provisioningserver Breaks/Replaces for
+    maas-dhcp due to moving files around packages.
 
  -- Andres Rodriguez <[e-mail]>  Wed, 15 Jan 2014 00:24:58 -0500
 
 
=== modified file 'debian/control'
--- debian/control	2014-01-15 05:22:12 +0000
+++ debian/control	2014-01-16 14:46:21 +0000
@@ -130,8 +130,8 @@
          python-zope.interface,
          ${misc:Depends},
          ${python:Depends}
-Breaks: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3)
-Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3)
+Breaks: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1)
+Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-cluster-controller (<= 0.1+bzr1243+dfsg-0ubuntu3), maas-dhcp (<= 1.4+bzr1817+dfsg-0ubuntu1)
 Conflicts: python-librabbitmq
 Description: Ubuntu MAAS Server
  Ubuntu MAAS Server is the successor to Orchestra. It offers a