[SCM] LibreOffice packaging repository branch, ubuntu-raring-4.0, updated. libreoffice_4.0.2_rc2-1-242-g62ed03f
The following commit has been merged in the ubuntu-raring-4.0 branch:
commit 9ac48c0059a559ca0835d7de728c5afc5490bad3
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Apr 2 16:11:19 2013 +0200
join duplicate copyright fields
diff --git a/copyright b/copyright
index f12be34..78386e7 100644
--- a/copyright
+++ b/copyright
@@ -147,6 +147,11 @@ Files: src/*cairo*
Copyright: Copyright 1999 Tom Tromey
Copyright 2002, 2003 University of Southern California, Information Sciences Institute (ISI)
Copyright 2004 David Reveman
+ Copyright 2000, 2002, 2004, 2005 Keith Packard
+ Copyright 2004 Calum Robinson
+ Copyright 2004 Richard D. Worth
+ Copyright 2004, 2005 Red Hat, Inc.
+ Copyright 2004 David Reveman
License: other
Permission to use, copy, modify, distribute, and sell this software
and its documentation for any purpose is hereby granted without
@@ -166,11 +171,6 @@ License: other
RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-Copyright: Copyright 2000, 2002, 2004, 2005 Keith Packard
- Copyright 2004 Calum Robinson
- Copyright 2004 Richard D. Worth
- Copyright 2004, 2005 Red Hat, Inc.
- Copyright 2004 David Reveman
License: MPL-1.1 | LGPL-2.1
Files: src/*cppunit*
--
LibreOffice packaging repository
Reply to: