Julian Edwards has proposed merging lp:~julian-edwards/maas/packaging.precise into lp:~maas-maintainers/maas/packaging.
Requested reviews: MAAS Maintainers (maas-maintainers) For more details, see: https://code.launchpad.net/~julian-edwards/maas/packaging.precise/+merge/122177 Update packaging to use latest trunk -- https://code.launchpad.net/~julian-edwards/maas/packaging.precise/+merge/122177 Your team MAAS Maintainers is requested to review the proposed merge of lp:~julian-edwards/maas/packaging.precise into lp:~maas-maintainers/maas/packaging.
=== modified file 'debian/changelog' --- debian/changelog 2012-08-29 04:00:40 +0000 +++ debian/changelog 2012-08-31 01:18:20 +0000 @@ -1,4 +1,14 @@ +<<<<<<< TREE maas (0.1+bzr941+dfsg-0ubuntu1) UNRELEASED; urgency=low +======= +maas (0.1+bzr950+dfsg-0ubuntu1~precise1) precise; urgency=low + + * New upstream release for Precise + + -- Andres Rodriguez <[email protected]> Mon, 27 Aug 2012 16:12:34 -0400 + +maas (0.1+bzr937+dfsg-0ubuntu1) quantal; urgency=low +>>>>>>> MERGE-SOURCE * New upstream release * debian/maas.postinst: === modified file 'debian/control' --- debian/control 2012-08-29 02:56:47 +0000 +++ debian/control 2012-08-31 01:18:20 +0000 @@ -17,9 +17,6 @@ distro-info, ipmitool, libapache2-mod-wsgi, - libjs-raphael, - libjs-yui3-full, - libjs-yui3-min, postgresql-9.1, pwgen, python-django, @@ -68,7 +65,6 @@ python-twisted, python-txamqp, python-txlongpoll, - python-txtftp, python-zope.interface, ${misc:Depends}, ${python:Depends} @@ -87,8 +83,8 @@ Package: maas-dhcp Architecture: all Depends: maas (= ${binary:Version}), isc-dhcp-server -Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) -Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) +Conflicts: maas-dhcp (<= 0.1+bzr482+dfsg-0ubuntu1) +Replaces: maas-dhcp (<= 0.1+bzr482+dfsg-0ubuntu1) Description: Ubuntu MAAS Server - DHCP Configuration (meta-package) Ubuntu MAAS Server is the successor to Orchestra. It offers a nice UI to provision your Ubuntu servers. Each physical server @@ -104,8 +100,8 @@ Package: maas-dns Architecture: all Depends: ${misc:Depends}, maas (= ${binary:Version}), bind9 -Conflicts: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) -Replaces: maas-dhcp (<= 0.1+bzr777+dfsg-0ubuntu1) +Conflicts: maas-dhcp (<= 0.1+bzr482+dfsg-0ubuntu1) +Replaces: maas-dhcp (<= 0.1+bzr482+dfsg-0ubuntu1) Description: Ubuntu MAAS Server - DNS configuration (metapackage) Ubuntu MAAS Server is the successor to Orchestra. It offers a nice UI to provision your Ubuntu servers. Each physical server === modified file 'debian/maas.install' --- debian/maas.install 2012-08-29 02:56:47 +0000 +++ debian/maas.install 2012-08-31 01:18:20 +0000 @@ -1,6 +1,8 @@ # Install project debian/tmp/usr/lib/python*/dist-packages/maas usr/share/maas twisted/plugins/maasps.py usr/share/pyshared/twisted/plugins +contrib/python-tx-tftp/twisted/plugins/tftp_plugin.py usr/share/pyshared/twisted/plugins +contrib/python-tx-tftp/tftp/* usr/share/pyshared/tftp debian/tmp/usr/lib/python*/dist-packages/apiclient usr/share/maas # Install static files === modified file 'debian/patches/02-pserv-config.patch' --- debian/patches/02-pserv-config.patch 2012-08-23 21:32:31 +0000 +++ debian/patches/02-pserv-config.patch 2012-08-31 01:18:20 +0000 @@ -27,7 +27,7 @@ @@ -33,10 +33,8 @@ tftp: - # root: /var/lib/tftpboot + # root: /var/lib/maas/tftp # port: 69 - port: 5244 ## The URL to be contacted to generate PXE configurations. === added file 'debian/patches/99_precise_no_yui_root.patch' --- debian/patches/99_precise_no_yui_root.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/99_precise_no_yui_root.patch 2012-08-31 01:18:20 +0000 @@ -0,0 +1,17 @@ +Index: maas-0.1+bzr740+dfsg.orig/contrib/maas_local_settings.py +=================================================================== +--- maas-0.1+bzr740+dfsg.orig.orig/contrib/maas_local_settings.py 2012-07-12 17:15:08.310416293 -0400 ++++ maas-0.1+bzr740+dfsg.orig/contrib/maas_local_settings.py 2012-07-12 17:15:08.406416295 -0400 +@@ -18,10 +18,10 @@ + MEDIA_ROOT = '/var/lib/maas/media/' + + # Use the (libjs-yui) package's files to serve YUI3. +-YUI_LOCATION = '/usr/share/javascript/yui3/' ++#YUI_LOCATION = '/usr/share/javascript/yui3/' + + # Use the package's files to serve RaphaelJS. +-RAPHAELJS_LOCATION = '/usr/share/javascript/raphael/' ++#RAPHAELJS_LOCATION = '/usr/share/javascript/raphael/' + + # RabbitMQ settings. + RABBITMQ_HOST = 'localhost' === modified file 'debian/patches/series' --- debian/patches/series 2012-08-29 02:56:47 +0000 +++ debian/patches/series 2012-08-31 01:18:20 +0000 @@ -1,3 +1,4 @@ 01-fix-database-settings.patch 02-pserv-config.patch 03-txlongpoll-config.patch +99_precise_no_yui_root.patch === modified file 'debian/rules' --- debian/rules 2012-08-29 02:56:47 +0000 +++ debian/rules 2012-08-31 01:18:20 +0000 @@ -50,8 +50,8 @@ rm -rf maas-$(VER) tar -xf maas_$(VER).orig.tar.gz rm maas_$(VER).orig.tar.gz - rm -rf maas-$(VER).orig/src/maasserver/static/jslibs/ - rm -rf maas-$(VER).orig/contrib/python-tx-tftp + rm maas-$(VER).orig/src/maasserver/static/jslibs/yui/uploader/assets/flashuploader.swf + rm maas-$(VER).orig/src/maasserver/static/jslibs/yui/io-xdr/io.swf GZIP=--best tar -cz --owner root --group root --mode a+rX \ -f maas_$(VER).orig.tar.gz \ maas-$(VER).orig
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
