Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging.fixes into lp:~maas-maintainers/maas/packaging.quantal.
Commit message: maas-cluster-controller now depends on distro-info instead of maas-region-controoler. maas-region-controller now installs commissioning-user-data Requested reviews: MAAS Maintainers (maas-maintainers) Related bugs: Bug #1103194 in maas (Ubuntu): "maas-import-pxe-files fails when installing maas-cluster-controller only" https://bugs.launchpad.net/ubuntu/+source/maas/+bug/1103194 Bug #1103203 in maas (Ubuntu): "Accept&Commission fails because /etc/maas/commissioning-user-data is missing in maas-region-celery standalone" https://bugs.launchpad.net/ubuntu/+source/maas/+bug/1103203 For more details, see: https://code.launchpad.net/~andreserl/maas/packaging.fixes/+merge/144410 -- https://code.launchpad.net/~andreserl/maas/packaging.fixes/+merge/144410 Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/packaging.fixes into lp:~maas-maintainers/maas/packaging.quantal.
=== modified file 'debian/changelog' --- debian/changelog 2013-01-16 18:07:26 +0000 +++ debian/changelog 2013-01-22 23:00:32 +0000 @@ -1,4 +1,13 @@ -maas (1.2+bzr1349+dfsg-0ubuntu1) UNRELEASED; urgency=low +maas (1.2+bzr1349+dfsg-0ubuntu2) UNRELEASED; urgency=low + + * debian/control: Depends on distro-info for maas-cluster-controller + instead of maas-region-controller (LP: #1103194) + * debian/maas-region-controller.install: Install commissioning-user-data + instead of maas-cluster-controller. (LP: #1103203) + + -- Andres Rodriguez <[email protected]> Tue, 22 Jan 2013 17:51:26 -0500 + +maas (1.2+bzr1349+dfsg-0ubuntu1) raring; urgency=low * New upstream bugfix release. Fixes: - The DNS configuration is not created if maas-dns is installed after === modified file 'debian/control' --- debian/control 2013-01-16 18:07:26 +0000 +++ debian/control 2013-01-22 23:00:32 +0000 @@ -54,7 +54,6 @@ Depends: apache2, avahi-daemon, dbconfig-common, - distro-info, libapache2-mod-wsgi, libjs-raphael, libjs-yui3-full, @@ -167,6 +166,7 @@ Package: maas-cluster-controller Architecture: all Depends: bind9utils, + distro-info, freeipmi-tools, maas-cli (=${binary:Version}), maas-common (=${binary:Version}), === modified file 'debian/maas-cluster-controller.install' --- debian/maas-cluster-controller.install 2012-11-20 22:13:28 +0000 +++ debian/maas-cluster-controller.install 2013-01-22 23:00:32 +0000 @@ -20,7 +20,6 @@ debian/tmp/etc/maas/import_pxe_files debian/tmp/usr/sbin/maas-import-ephemerals debian/tmp/etc/maas/import_ephemerals -debian/tmp/etc/maas/commissioning-user-data # Obsolete, but still available for compatibility: scripts/maas-import-isos usr/sbin === modified file 'debian/maas-cluster-controller.lintian-overrides' --- debian/maas-cluster-controller.lintian-overrides 2013-01-16 18:07:26 +0000 +++ debian/maas-cluster-controller.lintian-overrides 2013-01-22 23:00:32 +0000 @@ -1,3 +1,2 @@ maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-ephemerals maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-isos -maas-cluster-controller: script-not-executable etc/maas/commissioning-user-data === modified file 'debian/maas-region-controller.install' --- debian/maas-region-controller.install 2012-11-20 22:13:28 +0000 +++ debian/maas-region-controller.install 2013-01-22 23:00:32 +0000 @@ -26,6 +26,7 @@ debian/tmp/usr/share/maas/preseeds # Install all other stuff +debian/tmp/etc/maas/commissioning-user-data debian/extras/maas usr/sbin debian/extras/maas-region-celeryd usr/sbin debian/extras/20-maas.conf etc/rsyslog.d === modified file 'debian/maas-region-controller.lintian-overrides' --- debian/maas-region-controller.lintian-overrides 2013-01-16 18:07:26 +0000 +++ debian/maas-region-controller.lintian-overrides 2013-01-22 23:00:32 +0000 @@ -1,2 +1,3 @@ maas-region-controller: binary-without-manpage usr/sbin/maas maas-region-controller: binary-without-manpage usr/sbin/maas-region-celeryd +maas-cluster-controller: script-not-executable etc/maas/commissioning-user-data
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
