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

[SCM] LibreOffice packaging repository branch, debian-experimental-3.6, updated. libreoffice_3.6.5-1-8-g385dfa8



The following commit has been merged in the debian-experimental-3.6 branch:
commit 385dfa83491de55e46a2a9309f00bfe520a29f14
Merge: b3f9ee2b65944ae1adc7d3c9bd131bc492add709 b348ed3159dda8e2198df3d95065f4d59436c041
Author: Rene Engelhard <rene@debian.org>
Date:   Tue Feb 5 20:12:49 2013 +0100

    Merge remote-tracking branch 'origin/debian-experimental-3.5' into debian-experimental-3.6
    
    Conflicts:
    	changelog
    	copyright

diff --combined changelog
index efe28c4,e88c059..36f3960
--- a/changelog
+++ b/changelog
@@@ -1,96 -1,59 +1,100 @@@
 -libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
 +libreoffice (1:3.6.5-2) UNRELEASED; urgency=low
  
 -  * new upstream release
 -    - caches fontconfig font substitutions (closes: #681308) 
 +  * debian/*.mime:
 +    - don't use obsolete -no-oosplash anymore, thanks Matthijs Kooijman
 +      for the patch (closes: #698845)
 +  * debian/copyright: update 
  
 -  * debian/patches/poppler_0_2*.diff: fix build of sdext with poppler
 -    0.21.x and fix the test with 0.20.x, thanks Pino Toscano
 + -- Rene Engelhard <rene@debian.org>  Sun, 03 Feb 2013 15:23:55 +0100
  
 -  * debian/rules: 
 -    - use generic python3.pc in default case instead of pythonX.Y.pc.
 -      Use pythonX.Y.pc otherwise and actually make version-switching work. 
 -    - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
 -      extremely slowing down the install target...
 -    - document truth and remove alpha from supported architectures
 -    - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
 -    - don't add version from librsvg*.shlibs (as for libebook) as we
 -      dlopen() it anyway.
 -    - don't rely on dictionaries submodule. unused.
 -  * debian/control.in:
 -    - remove obsolete sharutils, po-debconf and wget | curl build-deps
 -    - recommend fonts-liberation instead of ttf-liberation
 -      (closes: #691949)
 -  * debian/control.mozilla.in, debian/rules: rename
 -    mozilla-libreoffice -> browser-plugin-libreoffice
 -  * debian/libreoffice-{core,gtk3}.bug-script.in: 
 -    - find out whether we have Experimental features enabled
 +libreoffice (1:3.6.5-1) experimental; urgency=low
  
 - -- Rene Engelhard <rene@debian.org>  Sat, 24 Nov 2012 18:31:33 +0100
 +  * LibreOffice 3.6.5 release (idential to rc2)
  
 -libreoffice (1:3.5.4+dfsg-5) UNRELEASED; urgency=low
 +  * debian/rules:
 +    - stop using lsb_release -cs, parse dpkg-parsechangelog instead.
 +      avoids the base-files issue.
 +  * debian/libreoffice-common.triggers.in, debian/rules:
 +    - fix trigger to actually be in effect
 +    - enable tr,vi help, fully translated according to
 +      https://gerrit.libreoffice.org/1895
 +
 + -- Rene Engelhard <rene@debian.org>  Mon, 28 Jan 2013 21:29:19 +0100
  
 -  * debian/patches/fix-view-option.diff: backport fix to fix --view 
 -    from libreoffice-3-6 (closes: #697723)
 +libreoffice (1:3.6.5~rc2-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +     - fixes --view (closes: #697723)
  
    * debian/rules:
      - make -help-en-us break "the others" to work around 682838
        (closes: #682838) 
++<<<<<<< HEAD
 +    - temporarily remove wheezy backport conditionals as base-files would make
 +      us think we should build for wheezy right now
 +    - fix gdb helper installation; use upstreams install-gdb-printers
 +  * debian/rules, debian/*.triggers.in, debian/libreoffice-common.postinst.in:
 +    - re-introduce @OODIR@/share/extensions trigger as we still need to tell
 +      LO to sync if a subdir inside share/extension *changes*, but "touch" is
 +      enough now
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 16 Jan 2013 14:25:29 +0100
++=======
+   * debian/copyright: fix: ext-sources -> src
++>>>>>>> origin/debian-experimental-3.5
 +
 +libreoffice (1:3.6.4-1) experimental; urgency=low
  
 - -- Rene Engelhard <rene@debian.org>  Mon, 14 Jan 2013 21:37:10 +0100
 +  * LibreOffice 3.6.4 release (identical to rc3) 
  
 -libreoffice (1:3.5.4+dfsg-4) unstable; urgency=medium
 + -- Rene Engelhard <rene@debian.org>  Tue, 04 Dec 2012 23:23:10 +0100
  
 +libreoffice (1:3.6.4~rc3-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +
 +  * debian/patches/poppler_0_21_x.diff: moove from poppler_0_21_0.diff; fix
 +    build with 0.21.1 again
 +  * debian/patches/bigendian-utext-mixup.diff: backport from libreoffice-3-6
 +    branch to fix ooxml regression test failure
 +
 +  * debian/rules:
 +    - don't rely on dictionaries submodule. unused.
    * debian/control.in:
      - remove obsolete Pre-Depends on ure  (>= 1.5.1+OOo3.1.1-15)
        (by the way closes: #693626)
 +  * debian/control.mozilla.in, debian/rules: rename
 +    mozilla-libreoffice -> browser-plugin-libreoffice
 +
 + -- Rene Engelhard <rene@debian.org>  Wed, 28 Nov 2012 18:40:27 +0100
 +
 +libreoffice (1:3.6.4~rc1-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +
 +  * debian/patches/poppler_0_21_0.diff: fix build of sdext with poppler
 +    0.21.0
 +
 +  * merge from Ubuntu:
 +    - fix quoting of PYTHON_{CFLAGS,LIBS} (Matthias Klose) 
 +  * debian/rules:
 +    - mention CVE-2012-4233 in 1:3.6.1~rc2-1's changelog
 +    - re-enable mozilla plugin
 +    - actually make python version-switching work
 +  * debian/control.in:
 +    - recommend fonts-liberation instead of ttf-liberation
 +      (closes: #691949)
    * debian/libreoffice-core.bug-control:
      - report-with: fonts-opensymbol instead of transitional ttf-opensymbol
 +  * debian/libreoffice-{core,gtk3}.bug-script.in: 
 +    - find out whether we have Experimental features enabled
  
 - -- Rene Engelhard <rene@debian.org>  Mon, 19 Nov 2012 00:36:51 +0100
 + -- Rene Engelhard <rene@debian.org>  Fri, 16 Nov 2012 22:20:37 +0100
  
 -libreoffice (1:3.5.4+dfsg-3) unstable; urgency=high
 +libreoffice (1:3.6.3~rc2-1) experimental; urgency=low
 +
 +  * new upstream release candidate
  
 -  * debian/patches/ca-XV-update.diff: update ca-XV translations, thanks
 -    Jordi Mallach
 -  * debian/patches/CVE-2012-4233.diff: fix CVE-2012-4233.diff/HTB23106 
    * debian/patches/soffice-bashisms.diff: fix bashism in soffice for
      valgrinding (closes: #690717)
    * debian/patches/he-lucida-sans-unicode.diff: Update default Hebrew font
@@@ -99,140 -62,30 +103,140 @@@
      search paths (closes: #677601)
  
    * debian/rules:
 +    - fix upstream README(_en-US) install for binary-indep packages
 +    - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
 +    - don't add version from librsvg*.shlibs (as for libebook) as we
 +      dlopen() it anyway.
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 26 Oct 2012 15:47:02 +0200
 +
 +libreoffice (1:3.6.3~rc1-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +
 +  [ Rene Engelhard ]
 +  * debian/patches/sensible-lomua.diff: add patch from Dave Steele to
 +    make senddoc.sh default to standard mailto handler (closes: #687228)
 +
 +  * debian/rules:
 +    - try again with gcc 4.6 for mips* since apparently testtools/smoketest
 +      now work..
 +    - document truth and remove alpha from supported architectures
      - exclude .desktop from dh_link call to get absolute symlinks
        (closes: #690336)
  
 - -- Rene Engelhard <rene@debian.org>  Mon, 22 Oct 2012 19:20:07 +0200
 +  [ Bjoern Michaelsen ]
 +  * make metapackage explicit in short description 
 +
 + -- Rene Engelhard <rene@debian.org>  Sun, 14 Oct 2012 17:07:23 +0200
 +
 +libreoffice (1:3.6.2~rc1-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +    - waits for InternalIPC::ProcessingDone in oosplash (closes: #681185)
 +
 +  * debian/patches/disable-flaky-unoapi-tests.diff: disable flaky
 +    toolkit and sc.ScAccessible* unoapi tests
 +  * debian/patches/gcj-safe-jni-h-include.diff: add missing -I...
 +  * debian/control.in:
 +    - make -core break libreoffice-common (<< 1:3.6.1~rc1) as "unopkg sync"
 +      ran in the triggers is gone (closes: #686666)
 +  * debian/rules:
 +    - fix native-jars dependeny to depend on install-common ... 
 +    - ... but as this doesn't build then disable it for now...
 +    - hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
 +      extremely slowing down the install target...
 +    - use xz compression for all binary packages (closes: #687041) 
 +
 + -- Rene Engelhard <rene@debian.org>  Fri, 14 Sep 2012 11:01:04 +0200
 +
 +libreoffice (1:3.6.1-1) experimental; urgency=low
 +
 +  * LibreOffice 3.6.1 final release (identical to rc2)
 +
 +  * debian/rules:
 +    - work around possible failure install-common target with missing
 +      ca-XV .dirs/.install...
 +
 + -- Rene Engelhard <rene@debian.org>  Mon, 27 Aug 2012 18:47:58 +0200
 +
 +libreoffice (1:3.6.1~rc2-1) experimental; urgency=low
 +
 +  * new upstream release candidate
 +    - fixes CVE-2012-4233 / HTB23106
  
 -libreoffice (1:3.5.4+dfsg-2) unstable; urgency=low
 +  * debian/patches/debian-debug.diff: patch new gb_SYMBOLS in unxgcc.mk to
 +    make ENABLE_SYMBOLS=SMALL (-g1) working again..
 +  * debian/patches/debian/patches/kfrebsd-add-missing-P_SEP.diff: fix Java build
 +    on kfreebsd (non-broken CLASSPATH)
 +
 +  * src/2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2: remove
 +    zlib-1.2.7/doc/rfc195{0,1,2}.txt (closes: #685133)
 +
 +  * debian/rules:
 +    - save some space/build time: build only with en-US in build-arch first
 +      and build sdext/mysqlc (localized help/descriptions) manually with all
 +      languages after make check; remove buildd special-casing for
 +      languages
 +  * debian/control.fonts.in: remove ttf-opensymbol transitional package 
 +  * debian/control.in:
 +    - remove obsolete sharutils, po-debconf and wget | curl build-deps
 +
 + -- Rene Engelhard <rene@debian.org>  Thu, 23 Aug 2012 22:34:27 +0200
 +
 +libreoffice (1:3.6.1~rc1-2) experimental; urgency=low
 +
 +  * debian/rules:
 +    - revert "build-depend against libpng-dev instead of libpng12-dev"
 +      as it breaks on the buildds which install the libpng from experimental
 +      (fails GTK3 pkg-config test) (reopens: #662411)
 +    - fix build and install targets to prevent build-arch be called under
 +      fakeroot, thanks rleigh for the hints
  
 -  * use xz compression for all binary packages (closes: #687041) 
 + -- Rene Engelhard <rene@debian.org>  Sat, 18 Aug 2012 11:09:34 +0200
  
 - -- Rene Engelhard <rene@debian.org>  Sun, 09 Sep 2012 14:45:20 +0200
 +libreoffice (1:3.6.1~rc1-1) experimental; urgency=low
  
 -libreoffice (1:3.5.4+dfsg-1) unstable; urgency=low
 +  * new upstream release candidate
 +    - fixes splashscreen location in multi-monitor setups
 +      (closes: #657444, #431473)
 +    - caches fontconfig font substitutions (closes: #631308)
 +    - fixes dot handling in KDE File Picker (closes: #645946)
  
 -  * src/c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz: remove
 -    zlib-1.2.5/doc/rfc195{0,1,2}.txt (closes: #685133)
 +  * debian/patches/build-dont-run-checks.diff: as name says
  
    * debian/rules:
 -    - fix python3-dev builddep to >= 3.2; 3.1 had a different naming of
 -      the .pc (without "mu")
 +    - new conditionals for: doxygen, libcdr, liblcms2
 +    - remove liblucene2-java stuff; now clucene is used
 +    - build-depend on libxml2-utils, xmllint now needed
 +    - build-depend on liboost-date-time-date, we now link to boost...
 +    - build-depend against libpng-dev instead of libpng12-dev
 +      (closes: #662411)
 +    - remove squeeze-backports stuff, add wheezy-backports
 +    - install upstreams README(_en-US) (closes: #676340)
 +    - clean up some warnings:
 +      + readd /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
 +        to LD_LIBRARY_PATH for dh_shlibdeps
 +      + don't run jh_depends -i/-a, use -p for each package, otherwise it
 +        gets confused by help.jar/s*.jar which is just zips, no "real" jar
 +    - switch to default-jdk, b-d on default-jdk (>= 1:1.7-48) on ia64 and
 +      check for "OpenJDK" in tests yes/no clause for JDK=default
 +    - add ENABLE_HELP conditional now that we have --without-help; also
 +      add the new --disable-extensions and --disable-database-connectivity to
 +      their respective places
 +    - split build into build-{arch,indep}
 +    - use generic python3.pc instead of pythonX.Y(mu).pc
 +  * debian/uno-libs3.symbols: update 
    * debian/libreoffice-common.links.in:
      - s/libreofficeoasis/libreoffice-oasis/, thanks Jakub Wilk
        (closes: #683784) 
 +  * debian/shell-lib-extensions.sh, debian/rules,
 +    debian/libreoffice-common.lintian.overrides.in: unopkg sync not
 +    necessary anymore; remove. javasettingsunopkginstall.xml also gone
 +  * debian/*.p*.in, debian/*.triggers.in: remove obsolete triggers and
 +    sync_extensions calls (closes: #677146)
  
 - -- Rene Engelhard <rene@debian.org>  Fri, 17 Aug 2012 14:45:26 +0200
 + -- Rene Engelhard <rene@debian.org>  Wed, 15 Aug 2012 13:52:20 +0200
  
  libreoffice (1:3.5.4-7) unstable; urgency=high
  
diff --combined copyright
index 4880986,16ace0f..419b26b
--- a/copyright
+++ b/copyright
@@@ -21,23 -21,23 +21,23 @@@ File: debian/templates/debian-presentat
  Copyright: Copyright Alexis Younes "ayo"
  License: GPL-2+
  
- Files: ext-sources/*commons-codec*
+ Files: src/*commons-codec*
  Copyright: Copyright 2001-2004 The Apache Software Foundation.
  License: Apache-2.0
  
- Files: ext-sources/*commons-logging*
+ Files: src/*commons-logging*
  Copyright: Copyright 2003-2007 The Apache Software Foundation
  License: Apache-2.0
  
- Files: ext-sources/*commons-lang*
+ Files: src/*commons-lang*
  Copyright: Copyright 2001-2007 The Apache Software Foundation
  License: Apache-2.0
  
- Files: ext-sources/*commons-httpclient*
+ Files: src/*commons-httpclient*
  Copyright: Copyright 1999-2007 The Apache Software Foundation
  License: Apache-2.0
  
- Files: ext-sources/*bsh*
+ Files: src/*bsh*
  Copyright: Copyright (C) 2000 Pat Niemeyer
  Copyright: Copyright (C) 2000 INRIA, France Telecom
  Copyright: Copyright (C) 2002 France Telecom
@@@ -515,13 -515,13 +515,13 @@@ License: SP
   	Original Code Source Code for Your Modifications.] 
  License: LGPL
  
- Files: ext-sources/*-db-*
+ Files: src/*-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: ext-sources/*`dejavu-fonts-ttf*
+ Files: src/*`dejavu-fonts-ttf*
  Copyright: Copyright (c) 2003 by Bitstream, Inc.
  Cppyright: Copyright (c) 2006 by Tavmjong Bah
  License: other
@@@ -566,7 -566,7 +566,7 @@@
   Inc., respectively. For further information, contact: fonts at gnome dot
   org. 
  
- Files: ext-sources/*liberation-fonts-ttf*
+ Files: src/*liberation-fonts-ttf*
  Copyright: Copyright © 2007 Red Hat, Inc
  License: other
   LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
@@@ -589,7 -589,7 +589,7 @@@
    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: ext-sources/*boost*
+ Files: src/*boost*
  Copyright: Copyright 2000-2003 Beman Dawes
  License: other
   Boost Software License - Version 1.0 - August 17th, 2003
@@@ -616,7 -616,7 +616,7 @@@
   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
   DEALINGS IN THE SOFTWARE.
  
- Files: ext-sources/*cairo*
+ Files: src/*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 +1118,11 @@@ License: MPL-1.
        Original Code Source Code for Your Modifications.]
  License: LGPL-2.1
  
- Files: ext-sources/*cppunit*
+ Files: src/*cppunit*
  Copyright: (c)Copyright 2000, Baptiste Lepilleur
  License: LGPL-2.1
  
- Files: ext-sources/*curl*
+ Files: src/*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 +1188,25 @@@ Licsense: othe
   * copyright statement is not removed.
   */
  
- Files: ext-sources/*epm*
+ Files: src/*epm*
  Copyright: Copyright 1999-2003 by Easy Software Products
  License: GPL-2+
  
- Files: ext-sources/*expat+
+ Files: src/*expat+
  Copyright: Copyright (c) 1998, 1999 Thai Open Source Software Center Ltd
  License: MIT
  
- Files: ext-sources/*glibc*stub*
+ Files: src/*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: ext-sources/*hsqldb*
+ Files: src/*hsqldb*
  Copyright: Copyright (c) 2001-2008, The HSQL Development Group
  License: BSD-C3
  
- Files: ext-sources/*hunspell*
+ Files: src/*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 +1217,21 @@@ License: GPL-
   On Debian systems the full text of the GNU GPL v2 can be found
   in the `/usr/share/common-licenses/GPL-2' file.
  
- Files: ext-sources/*hyphen*
+ Files: src/*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: ext-sources/*SampleICC*
+ Files: src/*SampleICC*
  Copyright: Copyright (c) 2003-2006 The International Color Consortiu
  License: BSD-C4
  
- Files: ext-sources/*icu*
+ Files: src/*icu*
  Copyright: Copyright (c) 1995-2008 International Business Machines Corporation and others
  License: BSD-C4
  
- Files: ext-sources/*jpeg*
+ Files: src/*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 +1261,7 @@@ Files: jfreereport/download/flute
  Copyright � 1994-2002 World Wide Web Consortium
  License: W3C-Software
  
- Files: ext-sources/*libexttextcat*
+ Files: src/*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 +1270,7 @@@ Files: MathMLDTD/math.dt
  Copyright: Copyright 1997-1999  World Wide Web Consortium
  License: W3C-Software
  
- Files: ext-sources/*xmlsec*
+ Files: src/*xmlsec*
  Copyright: Copyright (C) 2002-2003 Aleksey Sanin
  Copyright: Copyright (c) 2003 America Online, Inc.
  License: other
@@@ -1296,7 -1296,7 +1296,7 @@@
   ings in this Software without prior written authorization from him.
   License: MPL-1.1
  
- Files: ext-sources/*libxslt*
+ Files: src/*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 +1320,7 @@@
   be used in advertising or otherwise to promote the sale, use or other deal-
   ings in this Software without prior written authorization from 
  
- Files: ext-sources/*lp_solve*
+ Files: src/*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,6 -1336,12 +1336,6 @@@ License: othe
          above copyright notice.  You must also retain the Availability
          information below, of the original version.
  
 -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
 -
  Files: Mesa/inc/*
  Copyright: Copyright (C) 1999-2007  Brian Paul
  Copyright: Copyright (c) 2007 The Khronos Group Inc.
@@@ -1359,7 -1365,7 +1359,7 @@@ License: othe
   ** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIA
  
- Files: ext-sources/*neon*
+ Files: src/*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>
@@@ -1381,7 -1387,7 +1381,7 @@@ Files: np_sdk/mozsrc/
  Copyright: Copyright (C) 1998 Netscape Communications Corporation
  License: MPL-1.1
  
- Files: ext-sources/*openssl*
+ Files: src/*openssl*
  Copyright: Copyright (c) 1998-2007 The OpenSSL Project
  License: other
  /* ====================================================================
@@@ -1498,14 -1504,14 +1498,14 @@@
   * [including the GNU Public Licence.]
   */
  
- Files: ext-sources/*Python*
+ Files: src/*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: ext-sources/*redland*
+ Files: src/*redland*
  Copyright: Copyright (C) 2000-2007 David Beckett
  Copyright: Copyright (C) 2000-2005 University of Bristol
  License: LGPL-2 | Apache-2.0
@@@ -1514,7 -1520,7 +1514,7 @@@ Files: regexp/source/
  Copyright (C) 1993, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc
  License: LGPL-3
  
- Files: ext-sources/*rhino*
+ Files: src/*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
@@@ -1527,7 -1533,7 +1527,7 @@@ License: P
     that there is an indication as to what modifications have been
     made (if any).
  
- Files: ext-sources/*source-9.0.0.7-bj.zip
+ 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
@@@ -1607,7 -1613,7 +1607,7 @@@ License: MPL-1.
   be used in advertising or otherwise to promote the sale, use or other deal-
   ings in this Software without prior written authorization from 
   
- Files: ext-sources/*stax-api*
+ Files: src/*stax-api*
  License: CDDL-1.0 | GPPL-2
  License: CDDL-1.0
    COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
@@@ -1671,7 -1677,7 +1671,7 @@@
         California and the state courts of the State of California, with
         venue lying in Santa Clara County, California.
  
- Files: ext-sources/*STLport*
+ Files: src/*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
@@@ -1683,7 -1689,7 +1683,7 @@@ License: othe
   * provided the above notices are retained, and a notice that the code was
   * modified is included with the above copyright notice
  
- Files: ext-sources/*tomcat*
+ Files: src/*tomcat*
  Copyright: Copyright 1999-2002,2004 The Apache Software Foundation
  License: Apache-2.0
  
@@@ -1724,7 -1730,7 +1724,7 @@@ License: othe
  Files: unixODBC/inc/*
  License: LGPL
  
- Files: ext-sources/*vigra*
+ Files: src/*vigra*
  Copyright 1998-2001 by Ullrich Koethe
  License: MIT/X
  
@@@ -1737,132 -1743,14 +1737,132 @@@ Files: x11_extensions/inc/*render
  Copyright: Copyright © 2000 SuSE, Inc.
  License: MIT/X
  
- Files: ext-sources/*xpdf*
+ Files: src/*xpdf*
  Copyright: 1996-2007 Glyph & Cog, LLC.
  License: GPL-2
  
- Files: ext-sources/*zlib*
+ Files: src/*zlib*
  Copyright: Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler
  License: ZLIB
  
- Files: ext-sources/*mdds*
+ Files: src/*mdds*
  Copyright: Copyright (c) 2010 Kohei Yoshida
  License: MIT/X
 +
- Files: ext-sources/*clucene*
++Files: src/*clucene*
 +Copyright: (c) 2003-2010 the CLucene Team
 +License: LGPL | Apache-2.0
 +
- Files: ext-sources/*fontconfig*
++Files: src/*fontconfig*
 +Copyright: (c) 2002 Keith Packard
 +License: MIT/X
 +
- FIles: ext-sources/*graphite2*
++FIles: src/*graphite2*
 +Copyright: Copyright 2010, SIL International
 +License: LGPL
 +
- Files: ext-sources/*lcms2*
++Files: src/*lcms2*
 +Copyright: Copyright (c) 1998-2011 Marti Maria Saguer
 +License: MIT/X
 +
 +Files: ext-soirces/*liberation*
 +Copyrihht: Digitized data copyright (c) 2010 Google Corporation
 +           with Reserved Font Arimo, Tinos and Cousine.
 +Copyright: Copyright (c) 2012 Red Hat, Inc.
 +License: other
 + This Font Software is licensed under the SIL Open Font License,
 + Version 1.1.
 + 
 + This license is copied below, and is also available with a FAQ at:
 + http://scripts.sil.org/OFL
 + 
 + SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
 + 
 + PREAMBLE The goals of the Open Font License (OFL) are to stimulate
 + worldwide development of collaborative font projects, to support the font
 + creation efforts of academic and linguistic communities, and to provide
 + a free and open framework in which fonts may be shared and improved in
 + partnership with others.
 + 
 + The OFL allows the licensed fonts to be used, studied, modified and
 + redistributed freely as long as they are not sold by themselves.
 + The fonts, including any derivative works, can be bundled, embedded,
 + redistributed and/or sold with any software provided that any reserved
 + names are not used by derivative works.  The fonts and derivatives,
 + however, cannot be released under any other type of license.  The
 + requirement for fonts to remain under this license does not apply to
 + any document created using the fonts or their derivatives.
 + 
 +  
 + 
 + DEFINITIONS
 + "Font Software" refers to the set of files released by the Copyright
 + Holder(s) under this license and clearly marked as such.
 + This may include source files, build scripts and documentation.
 + 
 + "Reserved Font Name" refers to any names specified as such after the
 + copyright statement(s).
 + 
 + "Original Version" refers to the collection of Font Software components
 + as distributed by the Copyright Holder(s).
 + 
 + "Modified Version" refers to any derivative made by adding to, deleting,
 + or substituting ? in part or in whole ?
 + any of the components of the Original Version, by changing formats or
 + by porting the Font Software to a new environment.
 + 
 + "Author" refers to any designer, engineer, programmer, technical writer
 + or other person who contributed to the Font Software.
 + 
 + 
 + PERMISSION & CONDITIONS
 + 
 + Permission is hereby granted, free of charge, to any person obtaining a
 + copy of the Font Software, to use, study, copy, merge, embed, modify,
 + redistribute, and sell modified and unmodified copies of the Font
 + Software, subject to the following conditions:
 + 
 + 1) Neither the Font Software nor any of its individual components,in
 +    Original or Modified Versions, may be sold by itself.
 + 
 + 2) Original or Modified Versions of the Font Software may be bundled,
 +    redistributed and/or sold with any software, provided that each copy
 +    contains the above copyright notice and this license. These can be
 +    included either as stand-alone text files, human-readable headers or
 +    in the appropriate machine-readable metadata fields within text or
 +    binary files as long as those fields can be easily viewed by the user.
 + 
 + 3) No Modified Version of the Font Software may use the Reserved Font
 +    Name(s) unless explicit written permission is granted by the
 +    corresponding Copyright Holder. This restriction only applies to the
 +    primary font name as presented to the users.
 + 
 + 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
 +    Software shall not be used to promote, endorse or advertise any
 +    Modified Version, except to acknowledge the contribution(s) of the
 +    Copyright Holder(s) and the Author(s) or with their explicit written
 +    permission.
 + 5) The Font Software, modified or unmodified, in part or in whole, must
 +    be distributed entirely under this license, and must not be distributed
 +    under any other license. The requirement for fonts to remain under
 +    this license does not apply to any document created using the Font
 +    Software.
 + 
 + 
 +  
 + TERMINATION
 + This license becomes null and void if any of the above conditions are not met.
 + 
 +  
 + 
 + DISCLAIMER
 + THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
 + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
 + OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT.  IN NO EVENT SHALL THE
 + COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
 + INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
 + DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 + FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER
 + DEALINGS IN THE FONT SOFTWARE.
 +

-- 
LibreOffice packaging repository


Reply to: