launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

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

Requested reviews:
  MAAS Maintainers (maas-maintainers)

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-08-22 20:29:35 +0000
+++ debian/changelog	2012-08-23 18:23:52 +0000
@@ -1,4 +1,4 @@
-maas (0.1+bzr911+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (0.1+bzr916+dfsg-0ubuntu1~ppa2) quantal; urgency=low
 
   * New upstream release
   * debian/maas.postinst:
@@ -10,6 +10,8 @@
     - debian/maas.postinst: Drop cobbler configuration
     - debian/maas.install: Drop installation of snippets/preseeds.
     - debian/control: Drop Depends on maas-provision. Depends on bind9utils.
+      Add necessary Conflicts/Replaces.
+    - debian/extras/maas-provision: Add missing arg.
     - debian/patches:
       + 02-pserv-config.patch: Updated. Do not patch cobbler related bits.
 

=== modified file 'debian/control'
--- debian/control	2012-08-21 19:33:41 +0000
+++ debian/control	2012-08-23 18:23:52 +0000
@@ -33,6 +33,8 @@
          ${misc:Depends},
          ${python:Depends}
 Recommends: openssh-server, maas-dns
+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
@@ -83,6 +85,8 @@
 Package: maas-dhcp
 Architecture: all
 Depends: maas, maas-dns
+Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
+Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1)
 Description: Ubuntu MAAS Server (transitional package)
  Ubuntu MAAS Server is the successor to Orchestra. It offers a
  nice UI to provision your Ubuntu servers. Each physical server

=== modified file 'debian/extras/maas-provision'
--- debian/extras/maas-provision	2012-07-25 15:28:33 +0000
+++ debian/extras/maas-provision	2012-08-23 18:23:52 +0000
@@ -4,4 +4,4 @@
 	exit 1
 fi
 export PYTHONPATH="/usr/share/maas${PYTHONPATH:+:}${PYTHONPATH}"
-exec /usr/bin/python -m provisioningserver
+exec /usr/bin/python -m provisioningserver $@

=== modified file 'debian/maas.postinst'
--- debian/maas.postinst	2012-08-21 19:33:41 +0000
+++ debian/maas.postinst	2012-08-23 18:23:52 +0000
@@ -241,9 +241,9 @@
 	if dpkg --compare-versions "$2" lt 0.1+bzr459+dfsg-0ubuntu1; then
 		configure_maas_tgt
 	fi
-	# If upgrading from any version lower than 0.1+bzr908+dfsg-0ubuntu1
+	# If upgrading from any version lower than 0.1+bzr916+dfsg-0ubuntu1
 	# we need to regenerate the passwords and update configs.
-	if dpkg --compare-versions "$2" lt 0.1+bzr908+dfsg-0ubuntu1; then
+	if dpkg --compare-versions "$2" lt 0.1+bzr916+dfsg-0ubuntu1; then
 		# configure maas default url
 		db_get maas/default-maas-url
 		ipaddr="$RET"