linaro-license-protection

Merge lp:~gesha/linaro-license-protection/remove-duplicate-headers into lp:~linaro-automation/linaro-license-protection/trunk

  1. remove-duplicate-headers
  2. Merge into trunk
Proposed by Georgy Redkozubov
Status: Merged
Approved by: James Tunnicliffe
Approved revision: 84
Merged at revision: 84
Proposed branch: lp:~gesha/linaro-license-protection/remove-duplicate-headers
Merge into: lp:~linaro-automation/linaro-license-protection/trunk
Diff against target: 64 lines (+6/-9)
5 files modified
licenses/linaro.html (+0/-2)
licenses/samsung.html (+0/-2)
licenses/samsung.txt (+3/-0)
licenses/ste.html (+0/-5)
licenses/ste.txt (+3/-0)
To merge this branch: bzr merge lp:~gesha/linaro-license-protection/remove-duplicate-headers
Reviewer Review Type Date Requested Status
James Tunnicliffe (community) Approve
Review via email: mp+111237@code.launchpad.net

Description of the change

This branch moves EULA headers for old-style EULA licenses from templates to license files to get rid of duplicate header text in build-info license protection.

To post a comment you must log in.
Revision history for this message
James Tunnicliffe (dooferlad) wrote :

++

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'licenses/linaro.html'
2--- licenses/linaro.html 2012-04-24 08:30:45 +0000
3+++ licenses/linaro.html 2012-06-20 14:36:20 +0000
4@@ -88,8 +88,6 @@
5
6 <div id="head">
7 <h1>
8- END-USER LICENSE AGREEMENT<br>
9- FOR LINARO DEVELOPERS (“Agreement”)
10 </h1>
11 </div>
12
13
14=== modified file 'licenses/samsung.html'
15--- licenses/samsung.html 2012-04-24 08:30:45 +0000
16+++ licenses/samsung.html 2012-06-20 14:36:20 +0000
17@@ -89,8 +89,6 @@
18
19 <div id="head">
20 <h1>
21- SAMSUNG DEVELOPMENT TOOL KIT END-USER LICENSE AGREEMENT FOR LINARO
22- DEVELOPERS (“Agreement”)
23 </h1>
24 </div>
25
26
27=== modified file 'licenses/samsung.txt'
28--- licenses/samsung.txt 2012-04-20 16:00:26 +0000
29+++ licenses/samsung.txt 2012-06-20 14:36:20 +0000
30@@ -1,3 +1,6 @@
31+SAMSUNG DEVELOPMENT TOOL KIT END-USER LICENSE AGREEMENT FOR LINARO
32+DEVELOPERS (“Agreement”)
33+
34 <p>IMPORTANT — PLEASE READ THE FOLLOWING AGREEMENT CAREFULLY.</p>
35
36 <p>
37
38=== modified file 'licenses/ste.html'
39--- licenses/ste.html 2012-04-25 11:08:01 +0000
40+++ licenses/ste.html 2012-06-20 14:36:20 +0000
41@@ -94,12 +94,7 @@
42
43 <div id="head">
44 <h1>
45- SNOWBALL CLICK-WRAP
46- LIMITED LICENSE AGREEMENT FOR APPLICATION DEVELOPERS
47- ("Agreement") ST-Ericsson 2011-10-27
48 </h1>
49-
50-
51 </div>
52
53 <div id="content">
54
55=== modified file 'licenses/ste.txt'
56--- licenses/ste.txt 2012-04-20 16:00:26 +0000
57+++ licenses/ste.txt 2012-06-20 14:36:20 +0000
58@@ -1,3 +1,6 @@
59+SNOWBALL CLICK-WRAP LIMITED LICENSE AGREEMENT FOR APPLICATION DEVELOPERS
60+("Agreement") ST-Ericsson 2011-10-27
61+
62 <p>
63 This Agreement is a legally binding contract between you - either an
64 individual or a legal entity - (hereinafter referred to as "Licensee")

Subscribers

People subscribed via source and target branches