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

[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_4.0.3_rc1-3-6-gfcb3f0d



The following commit has been merged in the debian-experimental-4.0 branch:
commit fcb3f0d42595951267b4a285514751b07807f496
Author: Rene Engelhard <rene@debian.org>
Date:   Wed May 1 13:58:06 2013 +0200

    debian/copyright: mention gbuild (and its makefiles) are MPL-2.0

diff --git a/changelog b/changelog
index 514c522..36f8fa7 100644
--- a/changelog
+++ b/changelog
@@ -9,6 +9,7 @@ libreoffice (1:4.0.3~rc2-1) experimental; urgency=low
       missing Provides: ${python3:Provides}
   * debian/uno-libs3.symbols: update and cleanup - use (symver) instead
     of *@...
+  * debian/copyright: mention gbuild (and its makefiles) are MPL-2.0
 
  -- Rene Engelhard <rene@debian.org>  Wed, 24 Apr 2013 00:20:09 +0200
 
diff --git a/copyright b/copyright
index 78386e7..f4642e6 100644
--- a/copyright
+++ b/copyright
@@ -6,7 +6,12 @@ Source: http://download.documentfoundation.org/libreoffice
 Files: *
 Copyright: Copyright 2000, 2010 Oracle and/or its affiliates.
            Copyright (c) 2000, 2010 LibreOffice contributors and/or their affiliates.
-License: LGPL-3 | MPL-1.1
+License: MPL-1.1 | GPL-3+ | LGPL-3+
+
+Files: *.mk
+Files: */*.mk
+Files: solenv/gbuild/*.mk
+License: MPL-2.0
 
 Files: debian/*
 Copyright: Copyright (C) 2002-2009 Software in the Public Interest, Inc.

-- 
LibreOffice packaging repository


Reply to: