[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.5-1-257-ge20f91f
The following commit has been merged in the debian-experimental-4.0 branch:
commit 6e5f6211ccc82f5b31179838a861aaf3adbdb008
Merge: 8f6bab8d0ba85b33e55b2f9b9a4b274d46498d7f f539c92d829250cc7ead8b796d400303bff76082
Author: Rene Engelhard <rene@debian.org>
Date: Thu Feb 7 00:30:09 2013 +0100
Merge remote-tracking branch 'origin/debian-experimental-3.6' into debian-experimental-4.0
Conflicts:
copyright
diff --combined copyright
index 2b53f99,f265b3c..d463990
--- a/copyright
+++ b/copyright
@@@ -1336,15 -1336,6 +1336,6 @@@ License: othe
above copyright notice. You must also retain the Availability
information below, of the original version.
- <<<<<<< HEAD
- =======
- Files: src/*lucene*
- Copyright: Copyright 2004 The Apache Software Foundation
- Copyright: Copyright 2005 The Apache Software Foundation
- Copyright: Copyright 2007 The Apache Software Foundation
- License: Apache-2.0
-
- >>>>>>> ext-sources -> src
Files: Mesa/inc/*
Copyright: Copyright (C) 1999-2007 Brian Paul
Copyright: Copyright (c) 2007 The Khronos Group Inc.
@@@ -1536,10 -1527,40 +1527,10 @@@ License: P
that there is an indication as to what modifications have been
made (if any).
- Files: libxmlsec/download/*
- Copyright: Copyright (C) 2002-2003 Aleksey Sanin
- Copyright: Copyright (c) 2003 America Online, Inc.
- License: other
-Files: src/*source-9.0.0.7-bj.zip
-Copyright: Copyright (c) 1998, 1999 James Clark
-Copyright ? 1999 CERN - European Organization for Nuclear Research
-License: other
- Permission to use, copy, moNumbererdify, distribute and sell this software and its documentation for any purpose
- is hereby granted without fee, provided that the above copyright notice appear in all copies and
- that both that copyright notice and this permission notice appear in supporting documentation.
- CERN makes no representations about the suitability of this software for any purpose.
- It is provided "as is" without expressed or implied warranty.
-License: MPL-1.0
- MOZILLA PUBLIC LICENSE
- Version 1.0
- ______________
-
- 1. Definitions.
- 1.1. ``Contributor'' means each entity that creates or contributes to
- the creation of Modifications.
- all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FIT-
- NESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- DANIEL VEILLARD BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CON-
- NECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name of Daniel Veillard shall not
- be used in advertising or otherwise to promote the sale, use or other deal-
- ings in this Software without prior written authorization from him.
-
+ Files: libxmlsec/download/*
+ Copyright: Copyright (C) 2002-2003 Aleksey Sanin
+ Copyright: Copyright (c) 2003 America Online, Inc.
+ License: other
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
@@@ -1562,9 -1583,9 +1553,9 @@@
ings in this Software without prior written authorization from him.
License: MPL-1.1
- Files: libxslt/download/*
- Copyright: Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved.
- License: other
+ Files: libxslt/download/*
+ Copyright: Copyright (C) 2001-2002 Daniel Veillard. All Rights Reserved.
+ License: other
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
--
LibreOffice packaging repository
Reply to: