Merge lp:~allenap/maas/packaging.remove-squashfs into lp:~maas-maintainers/maas/packaging

[Gavin Panella]

Remove all install-via-squashfs support.

Counterpart to lp:~allenap/maas/remove-squashfs.

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-06 17:36:39 +0000
+++ debian/changelog	2012-11-13 12:13:28 +0000
@@ -23,6 +23,11 @@
   * debian/maas-region-controller.postinst: Remove tgt config.
   * debian/maas-region-controller.postrm: Remove tgt config cleanup.
 
+  [ Gavin Panella ]
+  * debian/extras/99-maas: squashfs image download is no longer needed.
+  * debian/maas-cluster-controller.install: maas-import-squashfs and its
+    configuration file are no longer part of upstream.
+
  -- Julian Edwards <[e-mail]>  Fri, 26 Oct 2012 12:50:20 +0200
 
 maas (0.1+bzr1269+dfsg-0ubuntu1) quantal-proposed; urgency=low
 
=== modified file 'debian/extras/99-maas'
--- debian/extras/99-maas	2012-10-04 18:52:27 +0000
+++ debian/extras/99-maas	2012-11-13 12:13:28 +0000
@@ -1,7 +1,4 @@
 # /etc/squid-deb-proxy/mirror-dstdomain.acl.d/99-maas
-# 
+#
 # Enable launchpad personal package archives for squid-deb-proxy
 ppa.launchpad.net
-# Enable access to MAAS server HTTP to allow squashfs download
-# during install
-maas.internal.example.com # maasurl
 
=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2012-11-06 16:41:05 +0000
+++ debian/maas-cluster-controller.install	2012-11-13 12:13:28 +0000
@@ -18,8 +18,6 @@
 etc/cron.d/maas-import-pxe-files
 man/maas-import-pxe-files.8 usr/share/man/man8
 debian/tmp/etc/maas/import_pxe_files
-debian/tmp/usr/sbin/maas-import-squashfs
-debian/tmp/etc/maas/import_squashfs
 debian/tmp/usr/sbin/maas-import-ephemerals
 debian/tmp/etc/maas/import_ephemerals
 debian/tmp/etc/maas/commissioning-user-data