[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.4_dfsg-4-11-g5cffecf
The following commit has been merged in the master branch:
commit c133691038fd84c829174db0c0f1908aad73492d
Author: Rene Engelhard <rene@debian.org>
Date: Tue Mar 19 10:47:19 2013 +0100
Revert "ext-sources -> src"
This reverts commit 709016e4daa0ad81d4e95394c23de9890866677b.
Conflicts:
changelog
diff --git a/changelog b/changelog
index cc9d76c..15b3dec 100644
--- a/changelog
+++ b/changelog
@@ -9,7 +9,6 @@ libreoffice (1:3.5.4+dfsg2-1) unstable; urgency=low
http://java.sun.com/j2se/1.5/docs/api instead of /1.4.1/ as the former
doesn't exist anymore
- * debian/copyright: fix: ext-sources -> src
* debian/control.in:
- remove bogus | python3-uno dependency alternatives. Will properly be back
with LO 4.0 which supportts python3
diff --git a/copyright b/copyright
index 16ace0f..e1b3c3f 100644
--- a/copyright
+++ b/copyright
@@ -21,23 +21,23 @@ File: debian/templates/debian-presentation-background.xcf
Copyright: Copyright Alexis Younes "ayo"
License: GPL-2+
-Files: src/*commons-codec*
+Files: ext-sources/*commons-codec*
Copyright: Copyright 2001-2004 The Apache Software Foundation.
License: Apache-2.0
-Files: src/*commons-logging*
+Files: ext-sources/*commons-logging*
Copyright: Copyright 2003-2007 The Apache Software Foundation
License: Apache-2.0
-Files: src/*commons-lang*
+Files: ext-sources/*commons-lang*
Copyright: Copyright 2001-2007 The Apache Software Foundation
License: Apache-2.0
-Files: src/*commons-httpclient*
+Files: ext-sources/*commons-httpclient*
Copyright: Copyright 1999-2007 The Apache Software Foundation
License: Apache-2.0
-Files: src/*bsh*
+Files: ext-sources/*bsh*
Copyright: Copyright (C) 2000 Pat Niemeyer
Copyright: Copyright (C) 2000 INRIA, France Telecom
Copyright: Copyright (C) 2002 France Telecom
@@ -515,13 +515,13 @@ License: SPL
Original Code Source Code for Your Modifications.]
License: LGPL
-Files: src/*-db-*
+Files: ext-sources/*-db-*
Copyright: Copyright (c) 1990-2003 Sleepycat Software
Copyright: Copyright (c) 1990, 1993, 1994, 1995 The Regents of the University of California
Copyright: Copyright (c) 1995, 1996 The President and Fellows of Harvard University
License: BSD-C3
-Files: src/*`dejavu-fonts-ttf*
+Files: ext-sources/*`dejavu-fonts-ttf*
Copyright: Copyright (c) 2003 by Bitstream, Inc.
Cppyright: Copyright (c) 2006 by Tavmjong Bah
License: other
@@ -566,7 +566,7 @@ License: other
Inc., respectively. For further information, contact: fonts at gnome dot
org.
-Files: src/*liberation-fonts-ttf*
+Files: ext-sources/*liberation-fonts-ttf*
Copyright: Copyright © 2007 Red Hat, Inc
License: other
LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
@@ -589,7 +589,7 @@ License: other
5. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply.
Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc.
-Files: src/*boost*
+Files: ext-sources/*boost*
Copyright: Copyright 2000-2003 Beman Dawes
License: other
Boost Software License - Version 1.0 - August 17th, 2003
@@ -616,7 +616,7 @@ License: other
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-Files: src/*cairo*
+Files: ext-sources/*cairo*
Copyright: Copyright 1999 Tom Tromey
Copyright: Copyright 2002, 2003 University of Southern California, Information Sciences Institute (ISI)
Copyright: Copyright 2004 David Reveman
@@ -1118,11 +1118,11 @@ License: MPL-1.1
Original Code Source Code for Your Modifications.]
License: LGPL-2.1
-Files: src/*cppunit*
+Files: ext-sources/*cppunit*
Copyright: (c)Copyright 2000, Baptiste Lepilleur
License: LGPL-2.1
-Files: src/*curl*
+Files: ext-sources/*curl*
Copyright: Copyright (c) 1996 - 2004, Daniel Stenberg
License: other
Permission to use, copy, modify, and distribute this software for any purpose
@@ -1188,25 +1188,25 @@ Licsense: other
* copyright statement is not removed.
*/
-Files: src/*epm*
+Files: ext-sources/*epm*
Copyright: Copyright 1999-2003 by Easy Software Products
License: GPL-2+
-Files: src/*expat+
+Files: ext-sources/*expat+
Copyright: Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
License: MIT
-Files: src/*glibc*stub*
+Files: ext-sources/*glibc*stub*
Copyright: Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
License: LGPL-2+
On Debian systems the full text of the GNU LGPL v2 can be found
in the `/usr/share/common-licenses/LGPL-2' file.
-Files: src/*hsqldb*
+Files: ext-sources/*hsqldb*
Copyright: Copyright (c) 2001-2008, The HSQL Development Group
License: BSD-C3
-Files: src/*hunspell*
+Files: ext-sources/*hunspell*
Copyright: Copyright (C) 1995, 1997, 2000, 2001, 2002 Free Software Foundation, Inc.
Copyright: Copyright (C) Kevin Hendricks, 2001-2002
Copyright: Copyright (C) 2002-2008 László Németh
@@ -1217,21 +1217,21 @@ License: GPL-2
On Debian systems the full text of the GNU GPL v2 can be found
in the `/usr/share/common-licenses/GPL-2' file.
-Files: src/*hyphen*
+Files: ext-sources/*hyphen*
Copyright: (C) 1998 Raph Levien
Copyright: (C) 2001 ALTLinux, Moscow
Copyright: (C) 2006, 2007, 2008 László Németh
License: GPL-2 | LGPL-2.1 | MPL-1.1
-Files: src/*SampleICC*
+Files: ext-sources/*SampleICC*
Copyright: Copyright (c) 2003-2006 The International Color Consortiu
License: BSD-C4
-Files: src/*icu*
+Files: ext-sources/*icu*
Copyright: Copyright (c) 1995-2008 International Business Machines Corporation and others
License: BSD-C4
-Files: src/*jpeg*
+Files: ext-sources/*jpeg*
Copyright: (C) 1991-1998, Thomas G. Lane
License: other
Permission is hereby granted to use, copy, modify, and distribute this
@@ -1261,7 +1261,7 @@ Files: jfreereport/download/flute*
Copyright � 1994-2002 World Wide Web Consortium
License: W3C-Software
-Files: src/*libexttextcat*
+Files: ext-sources/*libexttextcat*
Copyright: Copyright (c) 2003, WiseGuys Internet B.V.
Copyright: Copyright 2000, 2010 Oracle and/or its affiliates.
License: BSD-C3
@@ -1270,7 +1270,7 @@ Files: MathMLDTD/math.dtd
Copyright: Copyright 1997-1999 World Wide Web Consortium
License: W3C-Software
-Files: src/*xmlsec*
+Files: ext-sources/*xmlsec*
Copyright: Copyright (C) 2002-2003 Aleksey Sanin
Copyright: Copyright (c) 2003 America Online, Inc.
License: other
@@ -1296,7 +1296,7 @@ License: other
ings in this Software without prior written authorization from him.
License: MPL-1.1
-Files: src/*libxslt*
+Files: ext-sources/*libxslt*
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
@@ -1320,7 +1320,7 @@ License: other
be used in advertising or otherwise to promote the sale, use or other deal-
ings in this Software without prior written authorization from
-Files: src/*lp_solve*
+Files: ext-sources/*lp_solve*
Copyright: Copyright (c) 1998-2001 by the University of Florida
Copyright: Copyright © 1991, 2007 Free Software Foundation, Inc
License: LGPL-2.1
@@ -1336,7 +1336,7 @@ License: other
above copyright notice. You must also retain the Availability
information below, of the original version.
-Files: src/*lucene*
+Files: ext-sources/*lucene*
Copyright: Copyright 2004 The Apache Software Foundation
Copyright: Copyright 2005 The Apache Software Foundation
Copyright: Copyright 2007 The Apache Software Foundation
@@ -1365,7 +1365,7 @@ License: other
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIA
-Files: src/*neon*
+Files: ext-sources/*neon*
Copyright: Copyright (C) 1999-2006 Joe Orton <joe@manyfish.co.uk>
Copyright: Copyright (C) 1999-2000 Tommi Komulainen <Tommi.Komulainen@iki.fi>
Copyright: Copyright (C) 1999-2000 Peter Boos <pedib@colorfullife.com>
@@ -1387,7 +1387,7 @@ Files: np_sdk/mozsrc/*
Copyright: Copyright (C) 1998 Netscape Communications Corporation
License: MPL-1.1
-Files: src/*openssl*
+Files: ext-sources/*openssl*
Copyright: Copyright (c) 1998-2007 The OpenSSL Project
License: other
/* ====================================================================
@@ -1504,14 +1504,14 @@ License: other
* [including the GNU Public Licence.]
*/
-Files: src/*Python*
+Files: ext-sources/*Python*
Copyright: Copyright (c) 2001, 2002, 2003, 2004 Python Software Foundation
Copyright: Copyright (c) 2000 BeOpen.com
Copyright: Copyright (c) 1995-2001 Corporation for National Research Initiatives
Copyright: Copyright (c) 1991-1995 Stichting Mathematisch Centrum
License: PSF-2
-Files: src/*redland*
+Files: ext-sources/*redland*
Copyright: Copyright (C) 2000-2007 David Beckett
Copyright: Copyright (C) 2000-2005 University of Bristol
License: LGPL-2 | Apache-2.0
@@ -1520,7 +1520,7 @@ Files: regexp/source/*
Copyright (C) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc
License: LGPL-3
-Files: src/*rhino*
+Files: ext-sources/*rhino*
Copyright: Copyright (C) 1997-2000 Netscape Communications Corporation
Copyright: Copyright (C) 2000 See Beyond Communications Corporation
License: MPL-1.1 | GPL-2 | LGPL-2
@@ -1533,7 +1533,7 @@ License: PD
that there is an indication as to what modifications have been
made (if any).
-Files: src/*source-9.0.0.7-bj.zip
+Files: ext-sources/*source-9.0.0.7-bj.zip
Copyright: Copyright (c) 1998, 1999 James Clark
Copyright ? 1999 CERN - European Organization for Nuclear Research
License: other
@@ -1613,7 +1613,7 @@ License: MPL-1.0
be used in advertising or otherwise to promote the sale, use or other deal-
ings in this Software without prior written authorization from
-Files: src/*stax-api*
+Files: ext-sources/*stax-api*
License: CDDL-1.0 | GPPL-2
License: CDDL-1.0
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
@@ -1677,7 +1677,7 @@ License: CDDL-1.0
California and the state courts of the State of California, with
venue lying in Santa Clara County, California.
-Files: src/*STLport*
+Files: ext-sources/*STLport*
Copyright: Copyright (c) 1994 Hewlett-Packard Company
Copyright: Copyright (c) 1996-1999 Silicon Graphics Computer Systems, Inc.
Copyright: Copyright (c) 1997 Moscow Center for SPARC Technology
@@ -1689,7 +1689,7 @@ License: other
* provided the above notices are retained, and a notice that the code was
* modified is included with the above copyright notice
-Files: src/*tomcat*
+Files: ext-sources/*tomcat*
Copyright: Copyright 1999-2002,2004 The Apache Software Foundation
License: Apache-2.0
@@ -1730,7 +1730,7 @@ License: other
Files: unixODBC/inc/*
License: LGPL
-Files: src/*vigra*
+Files: ext-sources/*vigra*
Copyright 1998-2001 by Ullrich Koethe
License: MIT/X
@@ -1743,14 +1743,14 @@ Files: x11_extensions/inc/*render*
Copyright: Copyright © 2000 SuSE, Inc.
License: MIT/X
-Files: src/*xpdf*
+Files: ext-sources/*xpdf*
Copyright: 1996-2007 Glyph & Cog, LLC.
License: GPL-2
-Files: src/*zlib*
+Files: ext-sources/*zlib*
Copyright: Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
License: ZLIB
-Files: src/*mdds*
+Files: ext-sources/*mdds*
Copyright: Copyright (c) 2010 Kohei Yoshida
License: MIT/X
--
LibreOffice packaging repository
Reply to: