Merge lp:~lamont/maas/packaging-1581729 into lp:~maas-maintainers/maas/packaging

[LaMont Jones]

/etc/maas/templates/dns is obsolete.

/etc/maas/templates/dns is obsolete.

[Gavin Panella (allenap)]

review: Approve

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-06 22:54:32 +0000
+++ debian/changelog	2016-06-13 21:25:46 +0000
@@ -1,6 +1,7 @@
 maas (2.0.0~beta7+bzr5073-0ubuntu2) UNRELEASED; urgency=medium
 
   * UNRELEASED
+  * /etc/maas/templates/dns is obsolete. (LP: #1581729)
 
  -- Andres Rodriguez <[e-mail]>  Mon, 06 Jun 2016 18:54:19 -0400
 

=== modified file 'debian/maas-region-api.install'
--- debian/maas-region-api.install	2016-03-31 14:04:18 +0000
+++ debian/maas-region-api.install	2016-06-13 21:25:46 +0000
@@ -11,7 +11,6 @@
 debian/tmp/etc/maas/preseeds
 
 # Install templates
-debian/tmp/etc/maas/templates/dns
 debian/tmp/etc/maas/templates/commissioning-user-data
 
 # Install driver configuration file

=== modified file 'debian/maas-region-api.postrm'
--- debian/maas-region-api.postrm	2016-03-31 21:43:42 +0000
+++ debian/maas-region-api.postrm	2016-06-13 21:25:46 +0000
@@ -42,6 +42,7 @@
         # Delete any remaining / leftover file
         rm -rf /usr/share/maas/maas/
         rm -rf /etc/maas/regiond.conf
+        rm -rf /etc/maas/templates/dns.maas-old
 esac
 
 #DEBHELPER#

=== modified file 'debian/maas-region-api.preinst'
--- debian/maas-region-api.preinst	2016-04-01 13:23:48 +0000
+++ debian/maas-region-api.preinst	2016-06-13 21:25:46 +0000
@@ -30,5 +30,9 @@
         rm -rf /var/lib/maas/media
     fi
 
+    if [ -d /etc/maas/templates/dns ]; then
+        mv /etc/maas/templates/dns /etc/maas/templates/dns.maas-old
+    fi
+
 fi
 #DEBHELPER#