[openoffice] branch trunk updated: Small updates to copyright

[ms...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 58fb31b   Small updates to copyright
58fb31b is described below

commit 58fb31b192f5e6f271e69be6a976a99d6a6ba589
Author: mseidel <ms...@apache.org>
AuthorDate: Thu Dec 26 14:02:45 2019 +0100

     Small updates to copyright
---
 main/LICENSE | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/main/LICENSE b/main/LICENSE
index dfc13c4..18f7f8c 100644
--- a/main/LICENSE
+++ b/main/LICENSE
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2012, 2013 Apache Software Foundation
+   Copyright 2011-2019 Apache Software Foundation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
@@ -314,7 +314,7 @@ http://java.sun.com/j2se/1.3/docs/api/java/util/Properties.html
 
 Missing:
 - Currently, u\XXXX sequences are escaped when saving, but not unescaped
-  when read..
+  when read...
 
 License: Python License
 http://www.opensource.org/licenses/PythonSoftFoundation.php
@@ -1004,7 +1004,7 @@ ____
 For integration of the library curl - built in main/curl/
 - license like MIT license
 
-Copyright (c) 1996 - 2016, Daniel Stenberg, <da...@haxx.se>, and many
+Copyright (c) 1996 - 2019, Daniel Stenberg, <da...@haxx.se>, and many
 contributors, see the THANKS file.
 
 All rights reserved.
@@ -1031,7 +1031,7 @@ For integration of XML Expat - built in main/expat/
 - MIT license
 
 Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2016 Expat maintainers
+Copyright (c) 2001-2017 Expat maintainers
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -1628,15 +1628,15 @@ PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
 otherwise using this software ("Python") in source or binary form and
 its associated documentation.
 
-2. Subject to the terms and conditions of this License Agreement, PSF
-hereby grants Licensee a nonexclusive, royalty-free, world-wide
-license to reproduce, analyze, test, perform and/or display publicly,
-prepare derivative works, distribute, and otherwise use Python
-alone or in any derivative version, provided, however, that PSF's
-License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Python Software Foundation;
-All Rights Reserved" are retained in Python alone or in any derivative
-version prepared by Licensee.
+2. Subject to the terms and conditions of this License Agreement, PSF hereby
+grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
+analyze, test, perform and/or display publicly, prepare derivative works,
+distribute, and otherwise use Python alone or in any derivative version,
+provided, however, that PSF's License Agreement and PSF's notice of copyright,
+i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Python Software Foundation; All
+Rights Reserved" are retained in Python alone or in any derivative version
+prepared by Licensee.
 
 3. In the event Licensee prepares a derivative work that is based on
 or incorporates Python or any part thereof, and wants to make
@@ -1961,5 +1961,3 @@ If you redistribute modified sources, we would appreciate that you include in
 the file ChangeLog history information documenting your changes.  Please read
 the FAQ for more information on the distribution of modified source versions.
 ____
-
-$HeadURL$