launchpad-reviewers team mailing list archive

[Andres Rodriguez <andreserl@xxxxxxxxxxxxx>]

Andres Rodriguez has proposed merging lp:~andreserl/maas/maas.precise.yui into lp:~maas-maintainers/maas/packaging.precise.sru.

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/maas.precise.yui/+merge/146193
-- 
https://code.launchpad.net/~andreserl/maas/maas.precise.yui/+merge/146193
Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/maas.precise.yui into lp:~maas-maintainers/maas/packaging.precise.sru.

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-01 17:53:17 +0000
+++ debian/changelog	2013-02-01 18:11:19 +0000
@@ -1,6 +1,11 @@
-maas (1.2+bzr1351+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (1.2+bzr1351+precise+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
-  * UNRELEASED
+  * debian/maas-dhcp.maas-dhcp-server.upstart: leases file should be owned
+    by user/group 'dhcpd' instead of root
+  * Continue to ship yui3 and raphael with MAAS.
+    - debian/patches/04_precise_no_yui_root.patch: Add.
+    - debian/rules: Remove swf files.
+    - Drop dependencies on yui3 and raphael.
 
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 30 Jan 2013 14:07:52 -0500
 

=== modified file 'debian/control'
--- debian/control	2013-01-24 11:18:40 +0000
+++ debian/control	2013-02-01 18:11:19 +0000
@@ -56,9 +56,6 @@
          bind9utils,
          dbconfig-common,
          libapache2-mod-wsgi,
-         libjs-raphael,
-         libjs-yui3-full,
-         libjs-yui3-min,
          maas-common (= ${binary:Version}),
          postgresql-9.1,
          pwgen,

=== added file 'debian/patches/04_precise_no_yui_root.patch'
--- debian/patches/04_precise_no_yui_root.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_precise_no_yui_root.patch	2013-02-01 18:11:19 +0000
@@ -0,0 +1,17 @@
+Index: maas-1.2+bzr1351+dfsg.orig/contrib/maas_local_settings.py
+===================================================================
+--- maas-1.2+bzr1351+dfsg.orig.orig/contrib/maas_local_settings.py	2013-02-01 12:31:39.505369280 -0500
++++ maas-1.2+bzr1351+dfsg.orig/contrib/maas_local_settings.py	2013-02-01 12:31:39.553369339 -0500
+@@ -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-10-11 14:32:10 +0000
+++ debian/patches/series	2013-02-01 18:11:19 +0000
@@ -1,3 +1,4 @@
 01-fix-database-settings.patch
 02-pserv-config.patch
 03-txlongpoll-config.patch
+04_precise_no_yui_root.patch

=== modified file 'debian/rules'
--- debian/rules	2012-10-17 16:56:50 +0000
+++ debian/rules	2013-02-01 18:11:19 +0000
@@ -57,7 +57,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 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
 	rm -rf maas-$(VER).orig/contrib/python-tx-tftp
 	GZIP=--best tar -cz --owner root --group root --mode a+rX \
                         -f maas_$(VER).orig.tar.gz \