Andres Rodriguez has proposed merging lp:~andreserl/maas/packaging.precise.sru.rebase into lp:~maas-maintainers/maas/packaging.precise.sru.
Requested reviews: MAAS Maintainers (maas-maintainers) For more details, see: https://code.launchpad.net/~andreserl/maas/packaging.precise.sru.rebase/+merge/144411 -- https://code.launchpad.net/~andreserl/maas/packaging.precise.sru.rebase/+merge/144411 Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/packaging.precise.sru.rebase into lp:~maas-maintainers/maas/packaging.precise.sru.
=== modified file 'debian/changelog' --- debian/changelog 2013-01-16 18:13:17 +0000 +++ debian/changelog 2013-01-22 23:18:20 +0000 @@ -1,4 +1,15 @@ -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) + * debian/maas-dhcp.maas-dhcp-server.upstart: leases file should be owned + by user/group 'dhcpd' instead of root. + + -- 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 @@ -37,10 +48,6 @@ * debian/maas-region-controller.install: Remove installation of maas-gc; it is no longer required as upstream no longer stores files in the filesystem. (LP: #1069734) - * maas-dhcp.maas-dhcp-server.upstart: - - Remove -user and -group args from dhcpd invocation - - Make leases file owned by dhcpd. - (LP: #1079030) * debian/maas-cluster-controller.postinst: Ensure that /etc/maas/pserv.yaml is updated when reconfiguring. (LP: #1081212) === modified file 'debian/control' --- debian/control 2013-01-16 18:13:17 +0000 +++ debian/control 2013-01-22 23:18:20 +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}), @@ -187,8 +187,8 @@ ${misc:Depends}, ${python:Depends} Suggests: maas-dhcp (= ${binary:Version}) -Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), tftpd-hpa -Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ) +Conflicts: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ), tftpd-hpa +Replaces: maas ( <= 0.1+bzr1048+dfsg-0ubuntu1 ), maas-region-controller ( <= 0.1+bzr1314+dfsg-0ubuntu1 ) Description: Ubuntu MAAS Cluster Controller Ubuntu MAAS Server is the successor to Orchestra. It offers a nice UI to provision your Ubuntu servers. Each physical server === added file 'debian/maas-cli.lintian-overrides' --- debian/maas-cli.lintian-overrides 1970-01-01 00:00:00 +0000 +++ debian/maas-cli.lintian-overrides 2013-01-22 23:18:20 +0000 @@ -0,0 +1,1 @@ +maas-cli: binary-without-manpage usr/bin/maas-cli === removed file 'debian/maas-cli.lintian-overrides' --- debian/maas-cli.lintian-overrides 2013-01-16 18:13:17 +0000 +++ debian/maas-cli.lintian-overrides 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -maas-cli: binary-without-manpage usr/bin/maas-cli === 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:18:20 +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 === added file 'debian/maas-cluster-controller.lintian-overrides' --- debian/maas-cluster-controller.lintian-overrides 1970-01-01 00:00:00 +0000 +++ debian/maas-cluster-controller.lintian-overrides 2013-01-22 23:18:20 +0000 @@ -0,0 +1,2 @@ +maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-ephemerals +maas-cluster-controller: binary-without-manpage usr/sbin/maas-import-isos === removed file 'debian/maas-cluster-controller.lintian-overrides' --- debian/maas-cluster-controller.lintian-overrides 2013-01-16 18:13:17 +0000 +++ debian/maas-cluster-controller.lintian-overrides 1970-01-01 00:00:00 +0000 @@ -1,3 +0,0 @@ -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:18:20 +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:13:17 +0000 +++ debian/maas-region-controller.lintian-overrides 2013-01-22 23:18:20 +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 === added file 'debian/python-maas-provisioningserver.lintian-overrides' --- debian/python-maas-provisioningserver.lintian-overrides 1970-01-01 00:00:00 +0000 +++ debian/python-maas-provisioningserver.lintian-overrides 2013-01-22 23:18:20 +0000 @@ -0,0 +1,1 @@ +python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-provision === removed file 'debian/python-maas-provisioningserver.lintian-overrides' --- debian/python-maas-provisioningserver.lintian-overrides 2013-01-16 18:13:17 +0000 +++ debian/python-maas-provisioningserver.lintian-overrides 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -python-maas-provisioningserver: binary-without-manpage usr/sbin/maas-provision
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
