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

Proposed by Andres Rodriguez on 2013-02-20
Status: Merged
Approved by: Andres Rodriguez on 2013-02-20
Approved revision: 165
Merged at revision: 165
Proposed branch: lp:~andreserl/maas/sru.packaging.update
Merge into: lp:~maas-maintainers/maas/packaging.precise.sru
Diff against target: 92 lines (+62/-1)
2 files modified
debian/changelog (+2/-1)
debian/copyright (+60/-0)
To merge this branch: bzr merge lp:~andreserl/maas/sru.packaging.update
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve on 2013-02-20
Review via email: mp+149690@code.launchpad.net

Commit message

Update debian/changelog:
  - Update revision to latest
  - Update to reflect jslibs changes
Update debian/copyright

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

Approving it myself

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-02-02 01:10:17 +0000
3+++ debian/changelog 2013-02-20 21:00:52 +0000
4@@ -1,4 +1,4 @@
5-maas (1.2+bzr1351+dfsg-0ubuntu2) UNRELEASED; urgency=low
6+maas (1.2+bzr1359+dfsg-0ubuntu1) UNRELEASED; urgency=low
7
8 * debian/maas-dhcp.maas-dhcp-server.upstart: leases file should be owned
9 by user/group 'dhcpd' instead of root.
10@@ -8,6 +8,7 @@
11 - debian/patches/04_precise_no_yui_root.patch: Add.
12 - debian/control: Drop dependencies on yui3 and raphael.
13 - debian/source/include-binaries: Add to not FTBFS
14+ - debian/extras/jslibs: Ship JS libraries.
15
16 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 30 Jan 2013 14:07:52 -0500
17
18
19=== modified file 'debian/copyright'
20--- debian/copyright 2012-01-18 14:23:31 +0000
21+++ debian/copyright 2013-02-20 21:00:52 +0000
22@@ -10,6 +10,15 @@
23 Copyright: 2012 Canonical Ltd.
24 License: AGPL-3.0+
25
26+Files: debian/extras/jslibs/yui3/*
27+Copyright: (C) 2006-2012 Yahoo! Inc.
28+License: BSD
29+
30+Files: debian/extras/jslibs/raphael/*
31+Copyright: (C) 2008-2011 Dmitry Baranovskiy (http://raphaeljs.com)
32+ (C) 2008-2011 Sencha Labs (http://sencha.com)
33+License: MIT
34+
35 License: AGPL-3.0+
36 This program is free software: you can redistribute it and/or modify
37 it under the terms of the GNU Affero General Public License as
38@@ -23,3 +32,54 @@
39 .
40 You should have received a copy of the GNU Affero General Public License
41 along with this program. If not, see <http://www.gnu.org/licenses/>.
42+
43+License: BSD
44+ Redistribution and use of this software in source and binary forms,
45+ with or without modification, are permitted provided that the
46+ following conditions are met:
47+ .
48+ * Redistributions of source code must retain the above copyright
49+ notice, this list of conditions and the following disclaimer.
50+ .
51+ * Redistributions in binary form must reproduce the above copyright
52+ notice, this list of conditions and the following disclaimer in the
53+ documentation and/or other materials provided with the distribution.
54+ .
55+ * Neither the name of Yahoo! Inc. nor the names of its contributors
56+ may be used to endorse or promote products derived from this
57+ software without specific prior written permission of Yahoo! Inc.
58+ .
59+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
60+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
61+ TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
62+ PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
63+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
64+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
65+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
66+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
67+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
68+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
69+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
70+
71+License: MIT
72+ This program is free software; you can redistribute it and/or modify
73+ it under the terms of the MIT license:
74+
75+ Permission is hereby granted, free of charge, to any person obtaining
76+ a copy of this software and associated documentation files (the
77+ "Software"), to deal in the Software without restriction, including
78+ without limitation the rights to use, copy, modify, merge, publish,
79+ distribute, sublicense, and/or sell copies of the Software, and to
80+ permit persons to whom the Software is furnished to do so, subject to
81+ the following conditions:
82+
83+ The above copyright notice and this permission notice shall be
84+ included in all copies or substantial portions of the Software.
85+
86+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
87+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
88+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
89+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
90+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
91+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
92+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Subscribers

People subscribed via source and target branches