launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

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

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1065171 in maas (Ubuntu): "maas-provision: command not found"
  https://bugs.launchpad.net/ubuntu/+source/maas/+bug/1065171

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-10 16:08:56 +0000
+++ debian/changelog	2012-10-11 02:42:21 +0000
@@ -1,9 +1,17 @@
-maas (0.1+bzr1243+dfsg-0ubuntu4) UNRELEASED; urgency=low
+maas (0.1+bzr1251+dfsg-0ubuntu1~ppa1) quantal; urgency=low
+
+  * New upstream release.
 
   [ Raphaël Badin ]
   * debian/maas-region-controller.postinst: Enable proxy_http module.
   * debian/maas-cluster-controller.postinst: Create /var/lib/maas. (LP: #1065062)
 
+  [ Andres Rodriguez ]
+  * Install maas-provision with python-maas-provisioningserver (LP: #1065171):
+    - debian/python-maas-provisioningserver.install: Install
+    - debian/control: Add Conflicts/Replaces with maas-cluster-controller
+      to handle upgrades.
+
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 10 Oct 2012 11:17:21 -0400
 
 maas (0.1+bzr1243+dfsg-0ubuntu3) quantal; urgency=low

=== modified file 'debian/control'
--- debian/control	2012-10-09 17:28:25 +0000
+++ debian/control	2012-10-11 02:42:21 +0000
@@ -110,8 +110,8 @@
          python-zope.interface,
          ${misc:Depends},
          ${python:Depends}
-Conflicts: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
-Replaces: python-django-maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 )
+Conflicts: 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)
 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

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2012-10-02 04:58:38 +0000
+++ debian/maas-cluster-controller.install	2012-10-11 02:42:21 +0000
@@ -15,5 +15,4 @@
 
 # Install all other stuff
 debian/extras/99-maas-sudoers etc/sudoers.d
-debian/extras/maas-provision usr/sbin
 debian/extras/isc-dhcp-server.override etc/init

=== modified file 'debian/python-maas-provisioningserver.install'
--- debian/python-maas-provisioningserver.install	2012-09-25 23:14:52 +0000
+++ debian/python-maas-provisioningserver.install	2012-10-11 02:42:21 +0000
@@ -1,1 +1,4 @@
 debian/tmp/usr/lib/python*/dist-packages/provisioningserver
+
+# Install other stuff
+debian/extras/maas-provision usr/sbin