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

[Andres Rodriguez]

* Fix Changelog
* debian/maas-dns.postinst: Drop write_dns_config as this is run by
  celery jobs.
* debian/maas-region-controller.templates: Rename template to
  maas-region-controller-min.templates

[Andres Rodriguez (andreserl)]

review: Approve

[lp:~andreserl/maas/packaging_makes_trusty_installable]

218. By Andres Rodriguez on 2014-01-13

Bump Revision

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-03 10:19:34 +0000
+++ debian/changelog	2014-01-13 13:32:16 +0000
@@ -1,7 +1,19 @@
-maas (1.4+bzr1805+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (1.4+bzr1814+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * UNRELEASED
 
+  [ Andres Rodriguez ]
+  * debian/maas-dns.postinst: Drop write_dns_config as this is run by
+    celery jobs.
+  * debian/maas-region-controller.templates: Rename template to
+    maas-region-controller-min.templates
+
+ -- Andres Rodriguez <[e-mail]>  Tue, 24 Dec 2013 14:07:14 -0500
+
+maas (1.4+bzr1789+dfsg-0ubuntu1) trusty; urgency=low
+
+  * New upstream release
+
   [ Jeroen Vermeulen ]
   * Keep legacy import_ephemerals config for now.
 
 
=== modified file 'debian/maas-dns.postinst'
--- debian/maas-dns.postinst	2013-12-10 17:14:17 +0000
+++ debian/maas-dns.postinst	2014-01-13 13:32:16 +0000
@@ -28,8 +28,6 @@
     sed -i '/^include\s.*maas/d' /etc/bind/named.conf.local
     maas get_named_conf --edit --config_path /etc/bind/named.conf.local
 
-    maas write_dns_config
-
     invoke-rc.d bind9 restart || true
 fi
 
 
=== renamed file 'debian/maas-region-controller.templates' => 'debian/maas-region-controller-min.templates'