mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ALv2 licensing compliance, and first test / re-based module pair.

Browse Source 
Change-Id: If75d2daaac2c629028a76f55941345c1c565a69a
This commit is contained in:
Michael Meeks
2012-06-04 18:20:32 +01:00
parent e581bef6df
commit a88f54f53a
7 changed files with 211 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
connectivity/source/drivers/evoab2/EApi.cxx
View File

@@ -1,32 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
/*
* This file is part of the LibreOffice project.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
* This file incorporates work covered by the following license notice:
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include <rtl/ustring.hxx>
#include <osl/module.h>
#include <stdio.h>

38
connectivity/source/drivers/evoab2/EApi.h
View File

@@ -1,31 +1,21 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
/*
* This file is part of the LibreOffice project.
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
* This file incorporates work covered by the following license notice:
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_
#define _CONNECTIVITY_EVOAB_EVOLUTION_API_HXX_
#include <glib-object.h>

3
readlicense_oo/README
View File

@@ -1 +1,2 @@
Read the LibreOffice license when starting up.
Contains the stock libreoffice licensing blurb, as distributed in the install
directory, and also potentially at run-time.

3
readlicense_oo/makefile.mk
View File

@@ -11,6 +11,7 @@ TARGET=source
# ------------------------------------------------------------------
ALLTAR: $(MISC)/$/license.txt $(MISC)/$/LICENSE \
$(MISC)/$/NOTICE \
$(MISC)$/LICENSE.odt $(MISC)$/CREDITS.odt \
$(MISC)$/THIRDPARTYLICENSEREADME.html
@@ -40,3 +41,5 @@ $(MISC)$/CREDITS.odt: odt/CREDITS.odt
$(COPY) odt/CREDITS.odt $@
$(MISC)$/THIRDPARTYLICENSEREADME.html: html/THIRDPARTYLICENSEREADME.html
$(COPY) html/THIRDPARTYLICENSEREADME.html $@
$(MISC)$/NOTICE: txt/NOTICE
$(COPY) txt/NOTICE $@

1
readlicense_oo/prj/d.lst
View File

@@ -10,6 +10,7 @@ dos: echo =====================================================================
..\%__SRC%\misc\LICENSE.odt %_DEST%\bin\LICENSE.odt
..\%__SRC%\misc\CREDITS.odt %_DEST%\bin\CREDITS.odt
..\%__SRC%\misc\NOTICE %_DEST%\bin\NOTICE
# URE:
mkdir: %_DEST%\bin\ure

164
readlicense_oo/txt/NOTICE Normal file
View File

@@ -0,0 +1,164 @@
Portions of LibreOffice may include work under the Apache License v2.0
requiring this NOTICE file to be provided.
For a more complete license statement please see the associated
documentation
____
Apache OpenOffice
Copyright 2011, 2012 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
____
Portions of this software copyright (c) 2000-2011, Oracle and/or its affiliates <http://www.oracle.com/>.
____
As part of the base system this product also includes code from the following
Apache projects:
- Apache Lucene
- Apache Portable Runtime
- Apache Portable Runtime Utility Library
- Apache Commons - used by MediaWiki Publisher extension
- Apache Jakarta HttpClient - used by MediaWiki Publisher extension
- Apache Tomcat - used by MediaWiki Piblisher extension
The notices from these projects are following:
Apache Lucene
Copyright 2006 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
The snowball stemmers in
contrib/snowball/src/java/net/sf/snowball
were developed by Martin Porter and Richard Boulton.
The full snowball package is available from
http://snowball.tartarus.org/
Apache Portable Runtime
Copyright (c) 2011 The Apache Software Foundation.
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Portions of this software were developed at the National Center
for Supercomputing Applications (NCSA) at the University of
Illinois at Urbana-Champaign.
This software contains code derived from the RSA Data Security
Inc. MD5 Message-Digest Algorithm.
This software contains code derived from UNIX V7, Copyright(C)
Caldera International Inc.
Apache Portable Runtime Utility Library
Copyright (c) 2011 The Apache Software Foundation.
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Portions of this software were developed at the National Center
for Supercomputing Applications (NCSA) at the University of
Illinois at Urbana-Champaign.
This software contains code derived from the RSA Data Security
Inc. MD5 Message-Digest Algorithm, including various
modifications by Spyglass Inc., Carnegie Mellon University, and
Bell Communications Research, Inc (Bellcore).
Apache Commons Codec
Copyright 2002-2012 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains
test data from http://aspell.sourceforge.net/test/batch0.tab.
Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org). Verbatim copying
and distribution of this entire article is permitted in any medium,
provided this notice is preserved.
Apache Jakarta HttpClient
Copyright 1999-2007 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Apache Commons Lang
Copyright 2001-2012 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
Apache Commons Logging
Copyright 2003-2007 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Apache Tomcat
Copyright 1999-2012 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Java Management Extensions (JMX) support is provided by
the MX4J package, which is open source software. The
original software and related information is available
at http://mx4j.sourceforge.net/.
The Windows Installer is built with the Nullsoft
Scriptable Install System (NSIS), which is
open source software. The original software and
related information is available at
http://nsis.sourceforge.net/.
Java compilation software for JSP pages is provided by Eclipse,
which is open source software. The original software and
related information is available at
http://www.eclipse.org/.
____
As part of the base system this product also includes code from the following
projects which are licensed under the Apache license:
- serf
- redland
- StAX
The notices from these projects are following:
serf
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
redland
This product includes Redland software (http://librdf.org/)
developed at the Institute for Learning and Research Technology,
University of Bristol, UK (http://www.bristol.ac.uk/).
StAX
[no notices]
____
This product includes software developed by the OpenSSL Project
for use in the OpenSSL Toolkit. (http://www.openssl.org/)

14
scp2/source/ooo/common_brand.scp
View File

@@ -101,7 +101,8 @@ Module gid_Module_Root_Brand
gid_Brand_File_Txt_Package,
gid_License_Txt,
git_License_Odt,
gid_Credits_Odt);
gid_Credits_Odt,
gid_Apache_Notice);
Unixlinks = (gid_Brand_Unixlink_Program,
gid_Brand_Unixlink_Unopkg,
gid_Brand_Unixlink_Urelibs);
@@ -1477,3 +1478,14 @@ File gid_Credits_Odt
Name = "CREDITS.odt";
Styles = (PACKED);
End
File gid_Apache_Notice
BIN_FILE_BODY;
#if defined MACOSX
Dir = gid_Dir_Bundle_Contents;
#else
Dir = gid_Dir_Brand_Root;
#endif
Name = "NOTICE";
Styles = (PACKED);
End