← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~andreserl/maas/sru.packaging.update into lp:~maas-maintainers/maas/packaging.precise.sru

 

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

Requested reviews:
  MAAS Maintainers (maas-maintainers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/sru.packaging.update/+merge/149690
-- 
https://code.launchpad.net/~andreserl/maas/sru.packaging.update/+merge/149690
Your team MAAS Maintainers is requested to review the proposed merge of lp:~andreserl/maas/sru.packaging.update into lp:~maas-maintainers/maas/packaging.precise.sru.
=== modified file 'debian/changelog'
--- debian/changelog	2013-02-02 01:10:17 +0000
+++ debian/changelog	2013-02-20 21:00:52 +0000
@@ -1,4 +1,4 @@
-maas (1.2+bzr1351+dfsg-0ubuntu2) UNRELEASED; urgency=low
+maas (1.2+bzr1359+dfsg-0ubuntu1) UNRELEASED; urgency=low
 
   * debian/maas-dhcp.maas-dhcp-server.upstart: leases file should be owned
     by user/group 'dhcpd' instead of root.
@@ -8,6 +8,7 @@
     - debian/patches/04_precise_no_yui_root.patch: Add.
     - debian/control: Drop dependencies on yui3 and raphael.
     - debian/source/include-binaries: Add to not FTBFS
+    - debian/extras/jslibs: Ship JS libraries.
 
  -- Andres Rodriguez <andreserl@xxxxxxxxxx>  Wed, 30 Jan 2013 14:07:52 -0500
 

=== modified file 'debian/copyright'
--- debian/copyright	2012-01-18 14:23:31 +0000
+++ debian/copyright	2013-02-20 21:00:52 +0000
@@ -10,6 +10,15 @@
 Copyright: 2012 Canonical Ltd.
 License: AGPL-3.0+
 
+Files: debian/extras/jslibs/yui3/*
+Copyright: (C) 2006-2012 Yahoo! Inc.
+License: BSD
+
+Files: debian/extras/jslibs/raphael/*
+Copyright: (C) 2008-2011 Dmitry Baranovskiy (http://raphaeljs.com)
+           (C) 2008-2011 Sencha Labs (http://sencha.com)
+License: MIT
+
 License: AGPL-3.0+
  This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU Affero General Public License as
@@ -23,3 +32,54 @@
  .
  You should have received a copy of the GNU Affero General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+License: BSD
+ Redistribution and use of this software in source and binary forms,
+ with or without modification, are permitted provided that the
+ following conditions are met:
+ .
+   * Redistributions of source code must retain the above copyright
+     notice, this list of conditions and the following disclaimer.
+ .
+   * Redistributions in binary form must reproduce the above copyright
+     notice, this list of conditions and the following disclaimer in the
+     documentation and/or other materials provided with the distribution.
+ .
+   * Neither the name of Yahoo! Inc. nor the names of its contributors
+     may be used to endorse or promote products derived from this
+     software without specific prior written permission of Yahoo! Inc.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: MIT
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the MIT license:
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.


Follow ups