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

[Andres Rodriguez]

Fix changelog to match what's to be released.

[Graham Binns (gmb)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-11 03:35:57 +0000
+++ debian/changelog	2014-04-11 13:30:18 +0000
@@ -1,13 +1,20 @@
-maas (1.5+bzr2241-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.5+bzr2240-0ubuntu2) UNRELEASED; urgency=medium
 
-  [ Andres Rodriguez ]
   * UNRELEASED
 
-  [ Julian Edwards ]
-  * debian/maas-region-controller-min.install: Ensure drivers.yaml is
-    installed.
-
- -- Julian Edwards <[e-mail]>  Fri, 11 Apr 2014 13:34:47 +1000
+ -- Andres Rodriguez <[e-mail]>  Fri, 11 Apr 2014 09:20:08 -0400
+
+maas (1.5+bzr2240-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release
+    - Add support to install Third Party Drivers. In order for this to be
+      used the user will have to go to the Settings page to enable the
+      installation of these drivers. (LP: #1305839)
+  * debian/maas-region-controller-min.install: Install drivers.yaml.
+  * debian/debian/maas-region-controller.postinst: No longer show the
+    installation note by default. (LP: #1284652)
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 09 Apr 2014 19:02:00 -0400
 
 maas (1.5+bzr2236-0ubuntu1) trusty; urgency=medium
 

=== modified file 'debian/maas-region-controller.postinst'
--- debian/maas-region-controller.postinst	2014-03-14 14:27:48 +0000
+++ debian/maas-region-controller.postinst	2014-04-11 13:30:18 +0000
@@ -240,7 +240,7 @@
 	fi
 
 	# Display installation note
-	db_input high maas/installation-note || true
+	db_input low maas/installation-note || true
 	db_go
 
 elif [ -n "$DEBCONF_RECONFIGURE" ]; then