1 files changed, 2 insertions, 21 deletions
diff --git a/meta/files/common-licenses/HPND b/meta/files/common-licenses/HPND
index aa0aeca255..274bbdb8fa 100644
--- a/meta/files/common-licenses/HPND
+++ b/meta/files/common-licenses/HPND
@@ -3,28 +3,9 @@ Historical Permission Notice and Disclaimer
 <copyright notice>
-Permission to use, copy, modify and distribute this software and its
+Permission to use, copy, modify and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies[,] [and] that both [that] [the] copyright notice and this permission notice appear in supporting documentation[, and that the name [of] <copyright holder> [or <related entities>] not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission]. [<copyright holder> makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.]
-documentation for any purpose and without fee is hereby granted, provided that
-the above copyright notice appear in all copies[,] [and] that both [that] [the]
-copyright notice and this permission notice appear in supporting documentation
-[, and that the name [of] <copyright holder> [or <related entities>] not be
-used in advertising or publicity pertaining to distribution of the software
-without specific, written prior permission]. [<copyright holder> makes no
-representations about the suitability of this software for any purpose. It is
-provided "as is" without express or implied warranty.]
-[<copyright holder> DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+[<copyright holder> DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS[,][.] IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.]
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS[,][.] IN NO
-EVENT SHALL <copyright holder> BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
-ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.]
 ---

diff --git a/meta/files/common-licenses/HPND b/meta/files/common-licenses/HPND index aa0aeca255..274bbdb8fa 100644 --- a/meta/files/common-licenses/HPND +++ b/meta/files/common-licenses/HPND
@@ -3,28 +3,9 @@ Historical Permission Notice and Disclaimer
3		3
4	<copyright notice>	4	<copyright notice>
5		5
6	Permission to use, copy, modify and distribute this software and its	6	Permission to use, copy, modify and distribute this software and its documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies[,] [and] that both [that] [the] copyright notice and this permission notice appear in supporting documentation[, and that the name [of] <copyright holder> [or <related entities>] not be used in advertising or publicity pertaining to distribution of the software without specific, written prior permission]. [<copyright holder> makes no representations about the suitability of this software for any purpose. It is provided "as is" without express or implied warranty.]
7	documentation for any purpose and without fee is hereby granted, provided that
8	the above copyright notice appear in all copies[,] [and] that both [that] [the]
9	copyright notice and this permission notice appear in supporting documentation
10	[, and that the name [of] <copyright holder> [or <related entities>] not be
11	used in advertising or publicity pertaining to distribution of the software
12	without specific, written prior permission]. [<copyright holder> makes no
13	representations about the suitability of this software for any purpose. It is
14	provided "as is" without express or implied warranty.]
15		7
16	[<copyright holder> DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,	8	[<copyright holder> DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS[,][.] IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.]
17	INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS[,][.] IN NO
18	EVENT SHALL <copyright holder> BE LIABLE FOR ANY SPECIAL, INDIRECT OR
19	CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
20	DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
21	ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
22	SOFTWARE.]
23		9
24	---	10	---
25		11
26
27
28
29
30