Merge lp:~jtv/maas/pkg-bug-1238376 into lp:~maas-maintainers/maas/packaging

[Jeroen T. Vermeulen]

Restore (a new incarnation of) obsolescent /etc/maas/import_ephemerals.

This is part of the fix for bug 1238376. It requires this change to the source tree: https://code.launchpad.net/~jtv/maas/bug-1238376/+merge/190656 (already landed as r1701).

Jeroen

[Andres Rodriguez (andreserl)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-10-10 21:08:07 +0000
+++ debian/changelog	2013-10-11 15:17:53 +0000
@@ -1,7 +1,10 @@
-maas (1.4+bzr1693+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (1.4+bzr1701+dfsg-0ubuntu2) UNRELEASED; urgency=low
 
   * UNRELEASED
 
+  [ Jeroen Vermeulen ]
+  * Keep legacy import_ephemerals config for now.
+
  -- Andres Rodriguez <[e-mail]>  Thu, 10 Oct 2013 17:07:51 -0400
 
 maas (1.4+bzr1693+dfsg-0ubuntu1) saucy; urgency=low

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2013-10-04 14:56:01 +0000
+++ debian/maas-cluster-controller.install	2013-10-11 15:17:53 +0000
@@ -21,6 +21,7 @@
 # Install maas-import-pxe-files and related files
 debian/tmp/usr/sbin/maas-import-pxe-files
 man/maas-import-pxe-files.8 usr/share/man/man8
+debian/tmp/etc/maas/import_ephemerals
 debian/tmp/etc/maas/import_pxe_files
 debian/tmp/usr/sbin/maas-import-ephemerals
 debian/tmp/usr/bin/uec2roottar