Merge lp:~julian-edwards/maas/packaging-1.6.0 into lp:~maas-maintainers/maas/packaging.trusty

[Julian Edwards]

Packaging release for 1.6.0

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-11 00:00:58 +0000
+++ debian/changelog	2014-08-19 03:02:00 +0000
@@ -1,13 +1,6 @@
-maas (1.5.4+bzr2294-0ubuntu1) trusty; urgency=medium
+maas (1.6.0+bzr2545-0ubuntu1~ppa1) trusty; urgency=medium
 
-  * New upstream bug fix release:
-    - Package fails to install when the default route is through an
-     aliased/tagged interface (LP: #1350235)
-    - ERROR Nonce already used (LP: #1190986)
-    - Add MAAS arm64/xgene support (LP: #1338851)
-    - Add utopic support (LP: #1337437)
-    - API documentation for nodegroup op=details missing parameter
-      (LP: #1331982)
+  * New upstream release 1.6.0
 
   [ Greg Lutostanski ]
    * debian/control:
@@ -25,7 +18,11 @@
    * debian/control:
     - python-maas-provisioningserver depends on python-paramiko (LP: #1334401)
 
- -- Julian Edwards <[e-mail]>  Wed, 30 Jul 2014 17:32:00 +0100
+  [ Julian Edwards ]
+  * debian/maas-cluster-controller.install: don't install bootresources.yaml
+    any more, it's not there in 1.6.0
+
+ -- Julian Edwards <[e-mail]>  Tue, 19 Aug 2014 12:56:37 +1000
 
 maas (1.5.3+bzr2287-0ubuntu1) trusty; urgency=medium
 
 
=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2014-03-28 18:32:24 +0000
+++ debian/maas-cluster-controller.install	2014-08-19 03:02:00 +0000
@@ -3,7 +3,6 @@
 
 # Install PSERV config files
 debian/tmp/etc/maas/pserv.yaml
-debian/tmp/etc/maas/bootresources.yaml
 
 # Install cluster config file
 debian/tmp/etc/maas/maas_cluster.conf
 
=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2014-04-11 13:20:01 +0000
+++ debian/maas-region-controller.postinst	2014-08-19 03:02:00 +0000
@@ -219,8 +219,10 @@
 	########## Configure worker rabbitmq config ###########
 	#########################################################
 
-	# Handle celery/rabbitmq publishing
-	configure_maas_workers_rabbitmq_user "$ipaddr"
+	if dpkg --compare-versions "$2" lt 1.5+bzr2252-0ubuntu1; then
+		# Handle celery/rabbitmq publishing
+		configure_maas_workers_rabbitmq_user "$ipaddr"
+	fi
 
 	#########################################################
 	################  Configure Database  ###################