← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~rvb/maas/packaging-use-new-script into lp:~maas-maintainers/maas/packaging

 

Raphaël Badin has proposed merging lp:~rvb/maas/packaging-use-new-script into lp:~maas-maintainers/maas/packaging.

Commit message:
Use maas-import-ephemerals.py instead of maas-import-ephemerals.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/packaging-use-new-script/+merge/189017

Note that you need the changes from https://code.launchpad.net/~rvb/maas/use-new-import-script/+merge/189015 for this to work.
-- 
https://code.launchpad.net/~rvb/maas/packaging-use-new-script/+merge/189017
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/packaging-use-new-script into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/changelog'
--- debian/changelog	2013-10-02 19:37:31 +0000
+++ debian/changelog	2013-10-03 09:29:57 +0000
@@ -1,8 +1,12 @@
-maas (1.4+bzr1656+dfsg-0ubuntu1) UNRELEASED; urgency=low
+maas (1.4+bzr1657+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
-  * New upstream bugfix release.
+  * New upstream release.
   * debian/control: Depends on ubuntu-cloudimage-keyring instead of
     ubuntu-cloud-keyring; depends on python-distro-info.
+  * debian/maas-cluster-controller.install and
+    debian/maas-cluster-controller.lintian-overrides: use new
+    maas-import-ephemerals.py script instead of
+    maas-import-ephemerals
 
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Tue, 01 Oct 2013 15:26:34 -0400
 

=== modified file 'debian/maas-cluster-controller.install'
--- debian/maas-cluster-controller.install	2013-06-03 18:01:00 +0000
+++ debian/maas-cluster-controller.install	2013-10-03 09:29:57 +0000
@@ -22,7 +22,7 @@
 debian/tmp/usr/sbin/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-ephemerals
+debian/tmp/usr/sbin/maas-import-ephemerals.py
 debian/tmp/etc/maas/import_ephemerals
 debian/tmp/usr/bin/uec2roottar
 

=== modified file 'debian/maas-cluster-controller.lintian-overrides'
--- debian/maas-cluster-controller.lintian-overrides	2013-07-18 14:14:21 +0000
+++ debian/maas-cluster-controller.lintian-overrides	2013-10-03 09:29:57 +0000
@@ -1,2 +1,2 @@
-maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-ephemerals
+maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-ephemerals.py
 maas-cluster-controller: binary-without-manpage usr/bin/uec2roottar


Follow ups