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

[Andres Rodriguez]

Do no longer manually install templaes, now they are part of provisioningserver.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-08-15 11:21:11 +0000
+++ debian/changelog	2016-08-25 17:47:12 +0000
@@ -1,4 +1,4 @@
-maas (2.1.0~alpha1+bzr5222-0ubuntu1) UNRELEASED; urgency=medium
+maas (2.1.0~alpha1+bzr5294-0ubuntu1) UNRELEASED; urgency=medium
 
   * Give MAAS on both region and rack the ability to start, restart, and
     get the status of the local NTP service.
 
=== modified file 'debian/maas-rack-controller.install'
--- debian/maas-rack-controller.install	2016-07-18 23:28:26 +0000
+++ debian/maas-rack-controller.install	2016-08-25 17:47:12 +0000
@@ -1,7 +1,3 @@
-# Install templates
-debian/tmp/etc/maas/templates/pxe
-debian/tmp/etc/maas/templates/uefi
-
 # Install uec2roottar
 debian/tmp/usr/bin/uec2roottar
 
 
=== modified file 'debian/maas-region-api.install'
--- debian/maas-region-api.install	2016-06-13 21:22:58 +0000
+++ debian/maas-region-api.install	2016-08-25 17:47:12 +0000
@@ -10,9 +10,6 @@
 # Install new preseed files
 debian/tmp/etc/maas/preseeds
 
-# Install templates
-debian/tmp/etc/maas/templates/commissioning-user-data
-
 # Install driver configuration file
 debian/tmp/etc/maas/drivers.yaml