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

[Andres Rodriguez]

* New Upstream Release, Beta 2 Snapshot, bzr2967
* debian/maas-region-controller-min.postrm: Cleanup lefover files.
* debian/maas-dhcp.postrm: Clean lefover configs.

[Andres Rodriguez (andreserl)]

self approving.

review: Approve

[Julian Edwards (julian-edwards)]

On Friday 12 Sep 2014 19:13:23 you wrote:
> + * New Upstream Release, Beta 2 Snapshot, bzr2967

You should just call this a snapshot, there is no release upstream.

=== modified file 'debian/changelog'
--- debian/changelog	2014-09-12 00:38:09 +0000
+++ debian/changelog	2014-09-12 19:12:31 +0000
@@ -1,6 +1,6 @@
-maas (1.7.0~beta1+bzr2967-0ubuntu1) UNRELEASED; urgency=medium
+maas (1.7.0~beta2+bzr2967-0ubuntu1) UNRELEASED; urgency=medium
 
-  * UNRELEASED
+  * New Upstream Release, Beta 2 Snapshot, bzr2967
 
   [ Jeroen Vermeulen ]
   * debian/extras/99-maas-sudoers
@@ -18,6 +18,8 @@
   [ Andres Rodriguez ]
   * debian/maas-region-controller.postinst: Ensure cluster celery is
     started if it also runs on the region.
+  * debian/maas-region-controller-min.postrm: Cleanup lefover files.
+  * debian/maas-dhcp.postrm: Clean lefover configs.
 
   [ Jason Hobbs ]
   * debian/maas-region-controller-min.install: Install
@@ -32,7 +34,7 @@
     - Exclude /var/log/maas/rsyslog when changing ownership
       (LP: #1346703)
 
- -- Julian Edwards <[e-mail]>  Fri, 12 Sep 2014 10:31:21 +1000
+ -- Andres Rodriguez <[e-mail]>  Thu, 21 Aug 2014 19:36:30 -0400
 
 maas (1.7.0~beta1+bzr2781-0ubuntu1) utopic; urgency=medium
 

=== modified file 'debian/maas-dhcp.postrm'
--- debian/maas-dhcp.postrm	2013-03-19 23:39:35 +0000
+++ debian/maas-dhcp.postrm	2014-09-12 19:12:31 +0000
@@ -8,6 +8,10 @@
       command -v apparmor_parser >/dev/null 2>&1; then
       apparmor_parser --replace --write-cache --skip-read-cache "${dhcpd_prof}"
    fi
+   if [ "$1" = "purge" ]; then
+      rm -rf /etc/maas/dhcpd.conf
+      rm -rf /etc/maas/dhcpd6.conf
+   fi
 fi
 
 #DEBHELPER#

=== modified file 'debian/maas-region-controller-min.postrm'
--- debian/maas-region-controller-min.postrm	2013-12-09 20:27:48 +0000
+++ debian/maas-region-controller-min.postrm	2014-09-12 19:12:31 +0000
@@ -32,6 +32,9 @@
         if [ -L /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas ]; then
             rm -rf /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
         fi
+
+        # Delete any remaining / leftover file
+        rm -rf /usr/share/maas/maas/
 esac
 
 #DEBHELPER#