[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.4-1-142-g4befd8f



The following commit has been merged in the debian-experimental-3.5 branch:
commit dfc80fac8e9cff0d5405f77026c040840cc24ba4
Author: Rene Engelhard <rene@debian.org>
Date:   Fri Dec 16 23:51:38 2011 +0100

    remove mentioning of libreoffice-build and sources from copyright; add *

diff --git a/copyright b/copyright
index ddac113..2cae4a1 100644
--- a/copyright
+++ b/copyright
@@ -3,6 +3,12 @@ Upstream-Name: LibreOffice
 Upstream-Maintainer: libreoffice@lists.freedesktop.org
 Upstream-Source: http://download.documentfoundation.org/libreoffice
 
+
+Files: *
+Copyright: Copyright 2000, 2010 Oracle and/or its affiliates.
+Copyright: Copyright (c) 2000, 2010 LibreOffice contributors and/or their affiliates.
+License: LGPL-3 | MPL.1,1
+
 Files: debian/*
 Copyright: Copyright (C) 2002-2009 Software in the Public Interest, Inc.
 License: GPL-2
@@ -15,22 +21,6 @@ File: debian/templates/debian-presentation-background.xcf
 Copyright: Copyright Alexis Younes "ayo"
 License: GPL-2+
 
-Files: libreoffice-build-*/*
-Copyright: Copyright (c) 2000, 2010 LibreOffice contributors and/or their affiliates.
-License: LGPL-3
- On Debian systems the full text of the GNU LGPL v3 can be found
- in the `/usr/share/common-licenses/LGPL-3' file.
-
-[ Note this stuff is NOT (C) Oracle. The patches had it
-to be easily upstreamed, and for inclusion in the OpenOffice.org code
-they need this boileplate. It also contains some stuff cut'n'pasted
-from OpenOffice.org or one of the external modules below. ]
-
-Files: sources/libreoffice*.tar.bz2
-Copyright: Copyright 2000, 2010 Oracle and/or its affiliates.
-Copyright: Copyright (c) 2000, 2010 LibreOffice contributors and/or their affiliates.
-License: LGPL-3
-
 Files: agg/source/*
 Copyright: Copyright (C) 2002-2005 Maxim Shemanarev
 License: other

-- 
LibreOffice packaging repository


Reply to: