The following commit has been merged in the debian-experimental-3.5 branch:
commit 100fae9c123291d2b90a2f2d7a4b3a33c48d703e
Merge: 04ac8028a1474ab8f569b8f43dc569caccbf2e27
a66b1fd22e38b4cce1f8c8ac2abcea0d6d94568c
Author: Rene Engelhard <r...@debian.org>
Date: Thu Feb 23 17:38:50 2012 +0100
Merge remote branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index 3187bc0,ff45f13..f962ce8
--- a/changelog
+++ b/changelog
@@@ -1,238 -1,74 +1,248 @@@
-libreoffice (1:3.4.5-4) UNRELEASED; urgency=low
++libreoffice (1:3.5.0-3) UNRELEASED; urgency=low
+
+ * debian/patches/armhf-bridges-doubles.diff: some more armhf fixes
+ (+ testcase) from master
+
- -- Rene Engelhard <r...@debian.org> Thu, 23 Feb 2012 17:25:35 +0100
++ * debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks
++ lintian
+
-libreoffice (1:3.4.5-3) unstable; urgency=low
++ -- Rene Engelhard <r...@debian.org> Thu, 23 Feb 2012 17:37:45 +0100
+
- * debian/patches/mediwiki-oor-replace.diff: replace oor:fuse by oor:replace
- for -wiki-publishers config (hopefully closes: #616011)
+libreoffice (1:3.5.0-2) experimental; urgency=low
+
+ [ Rene Engelhard ]
* debian/patches/armhf-bridges*.diff: add armhf bridges fixes from
Jani Monoses (LP: #900636)
+ * debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff:
+ remove, obsolete
+ * debian/patches/icu-arm.diff: fix internal icu build on arm.
+ * debian/patches/move-binfilter-mimetypes-in-extra-desktop-file.diff:
+ as name says; imported from Fedora
+ * debian/patches/passwordTest-test-old-password-algorith-too.diff: as name
+ says (see fdo#45171 and #659733/#659720)
+ * debian/patches/getMIMEDescription-mismatch.diff: update with proper
+ ./configure check, thanks Lubok Lunak...; also update internal header
* debian/rules:
- - install full changelog only for packages with the same name in OOo
- times; strip pre-libreoffice entries otherwise.
- - enable ca-XV, put into -{l10n,help}-ca
- - backport from 3.5: don't add unversioned base-files dependency in base
+ - remove obsolete (and buggy) conditional icu-on-arm-fails breaking
+ the build
+ - apply patch from Rico Tzschichholz to update some configure flags
+ to new names in 3.5.x; remove some obsolete ones
+ - don't try to mv libvclplug_gtk3.so if not built, thanks Rico
+ Tzschichholz again
+ - disable base (libebook1.2-dev missing and nsplugin (xulrunner-dev
+ missing) on s390x
+ - disable *all* extensions on s390*, extension mechanism broken
+ * debian/source/components: remove, unused and causes lintian error
+
+ [ Bjoern Michaelsen ]
+ * debian/libreoffice-common.postrm.in: remove mismerged superfluous fi
+ (closes: #660580)
+
+ -- Rene Engelhard <r...@debian.org> Wed, 22 Feb 2012 08:34:06 +0100
+
+libreoffice (1:3.5.0-1) experimental; urgency=low
+
+ * LibreOffice 3.5.0 final release (identical to rc3)
+
+ * debian/patches/no-rcX-in-final.diff: don't show rc3, it's not a rc
+ amymore...
+ * debian/patches/patches/make-gengal-work-again.diff: register gengal.bin
+ executable to get proper rpath and remove gengalrc
+ * debian/patches/odk-fix-rdb-paths.diff: backport fix to fix rdb path
+ in settings/std.mk in the SDK
+
+ * debian/rules:
+ - install found .gdb-py files into respective -dbg packages
- add additional libpoppler-private-dev build-dep for new popplers
* debian/control.in, debian/libreofice-common.p*:
apply patch from Colin Watson to use Pre-Depends rather than
'dpkg-maintscript-helper supports' guards (closes: #659867)
- * debian/source/components: remove, unused and causes lintian error
- * debian/control.fonts.in: make ttf-opensymbol Priority: extra, thanks
- lintian
+ * debian/watch: point to download.documentfoundation.org/libreoffice/src
+ instead of dev-builds
+
+ -- Rene Engelhard <r...@debian.org> Tue, 14 Feb 2012 17:56:49 +0000
+
+libreoffice (1:3.5.0~rc3-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ * debian/patches/SwTblBoxFormula-destructor.diff: work around link error
+ on armel by specifying explicit SwTblBoxFormula destructor, thanks
+ Michael Meeks
+ * debian/patches/ia64-oox-size.diff: build oox on ia64 with -Os
+ as otherwise it gets too big to link
+ * debian/patches/mediwiki-oor-replace.diff: replace oor:fuse by oor:replace
+ for -wiki-publishers config (hopefully closes: #616011)
+
+ * debian/rules:
+ - give gb_FULLDEPS= to actual make check call, not debian/rules
+ check
+ - simplify -dbg/--enable-symbols conditionals
+ - build with default boost again but add build-dep on g++-4.6 (>=
4.6.2-12)
+
+ -- Rene Engelhard <r...@debian.org> Sat, 04 Feb 2012 11:27:46 +0100
+
+libreoffice (1:3.5.0~rc2-2) experimental; urgency=low
+
+ * debian/rules:
+ - fix another merge error to really fix patch rule in check
+ - enable ca-XV, put into -{l10n,help}-ca
+
+ -- Rene Engelhard <r...@debian.org> Sun, 29 Jan 2012 17:00:47 +0100
+
+libreoffice (1:3.5.0~rc2-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ * debian/rules:
+ - fix patch rule in check
+ - fix merge errors: $(ARCH) -> $(DEB_HOST_ARCH)
+ - install full changelog only for packages with the same name in OOo
+ times; strip pre-libreoffice entries otherwise.
+ - (re-)enable -script-provider-js
+ * debian/libreoffice-common.postrm.in: fix merge:
+ @OOBRANDDIR@/@OOBASISDIR@ -> @OODIR@
+
+ -- Rene Engelhard <r...@debian.org> Fri, 27 Jan 2012 09:23:07 +0000
+
+libreoffice (1:3.5.0~rc1-1) experimental; urgency=low
- -- Rene Engelhard <r...@debian.org> Wed, 22 Feb 2012 16:36:27 +0000
+ * new upstream release candidate
-libreoffice (1:3.4.5-2) unstable; urgency=low
+ * debian/patches/gbuild-JavaClassSet-honour-JAVAFLAGS.diff: honour
+ JAVAFLAGS (-source 1.5 -target 1.5)
+ * debian/rules:
+ - fix Java stuff in SDK install (don't remove /usr/share/libreoffice/sdk)
+ - work around smoketest failure; disable base for powerpc(spe)/ppc64 as
+ for armel
+ - switch to .xz tarballs, upstream will only provide those...
+
+ * merge from ubuntu-precise-3.5:
+ - reenable junit tests
+
+ -- Rene Engelhard <r...@debian.org> Fri, 20 Jan 2012 10:19:36 +0000
+
+libreoffice (1:3.5.0~beta3-1) experimental; urgency=low
+
+ * new upstream beta release
+
+ * debian/patches/fix-ARM-detection-in-set-soenv.diff: fix for armhf...
+ * debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff:
+ fix armhf build in bridges...
+ * debian/patches/ppc-fix-soffice.sh.diff: make soffice.sh on ppc correct
* debian/patches/jdbc-driver-threading.diff: backport fix for
Attach/Detach-CurrentThread slowness from libreoffice-3-5
(closes: #644957)
+
+ * debian/libreoffice-core.preinst.in:
+ - rm -f /var/lib/libreoffice/basis3.4/program/services.rdb on upgrade
+ (and for safety on install, too) (closes: #650341)
+ * debian/libreoffice-{common,core}.postrm.in:
+ - on remove, remove all /var/lib content on remove (prereg/bundled
+ basisX.Y)
* debian/rules:
+ - stop creating a dependency on ure for uno-libs3 in .shlibs, use
+ uno-libs3 instead
- specify correct --with-servlet-api= after recent libcommons-logging-java
changes
+ * debian/uno-libs3.symbols:
+ - use uno-libs3, not ure as dependency
+ * debian/control.ure.in:
+ - remove obsolete cli-uno-bridge Suggests
- -- Rene Engelhard <r...@debian.org> Tue, 17 Jan 2012 01:36:05 +0000
+ * merge from ubuntu-precise-3.5:
+ - add debian multiarch support for Qt4
+ - no dependencies needed for full builds
+ + propagate gb_FULLDEPS
+ - get rid of obsolete BrOffice specialcasing (LP: #884786)
+ - enable l10n
+ * merge from libreoffice_3.5.0_beta2-2ubuntu2
+ - enable gio, disable gvfs
-libreoffice (1:3.4.5-1) unstable; urgency=medium
+ -- Rene Engelhard <r...@debian.org> Tue, 17 Jan 2012 10:03:24 +0000
- * new upstream release
- - fixes build with bleeding edge external boost and gcc (closes: #652784)
+libreoffice (1:3.5.0~beta2-2) experimental; urgency=low
- * debian/libreoffice-{common,core}.postrm.in:
- - on remove, delete created services.rdb (closes: #650341) and
- remove all /var/lib content on remove (prereg/bundled, basisX.Y)
+ * debian/patches/fix-ARM-detetcion-in-set-soenv.diff: as name says
+ * debian/patches/make-package-modules-not-suck.diff: add missing , so
+ that kde4be1.uno.so correctly ends up in -kde
+
+ *
debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff,
+ debian/rules: make patch apply again
+
+ * debian/rules:
+ - force boost to 1.46 due to ICE with 1.48
+ - prevent creating bogus gcc- build-dependency on gcj archs
+
+ -- Rene Engelhard <r...@debian.org> Fri, 30 Dec 2011 00:11:06 +0100
+
+libreoffice (1:3.5.0~beta2-1) experimental; urgency=low
+
+ [ Rene Engelhard ]
+ * new upstream beta release
+
+ * debian/*:
+ - use "core" sources, no libreoffice-build anymore. Loads of updates.
+
+ * debian/patches/*: move from patches/hotfixes to patch the code
+ directly without libreoffice-build
+
+ * debian/rules, debian/vars.*, debian/*.links.in:
+ - loads of updates for new envfile name and gone LIBSUFFIX
+ * debian/rules:
+ - enable new build against Gtk3
+ - bump python b-d to >= 2.6 as we don't work with earlier anymore.
+ Also build python3-uno
+ - add new conditionals and build-deps for new (libvisio,librsvg,gettext,
+ libcmis) libraries and libexttextcat switch - and those we needed to
move
+ from libreoffice-builds' distro-configs. Adapt for changed configure
+ options
+ - add new conditionals and build-deps for new libvisio,librsvg,gettext,
+ libcmis usage and libexttextcat switch - and those we needed to move
+ from libreoffice-builds' distro-configs
+ - run new "make check" instead of solenv/bin/subsequenttests and
+ manual smoketest
+ - remove fakeroot hackaround
+ * debian/rules, debian/make-package-modules-not-suck.diff: migrate loads of
+ mv's in debian/rules to proper scp2 patches
+ * debian/rules, debian/control.in:
+ - move from self-defined UPSTREAM_VERSION/ARCH etc. to use
+ /usr/share/dpkg/*.mk
* debian/control.in:
+ - update descriptions for new Gtk(3) print dialog
- move libreoffice, libreoffice-l10n-{in,za} to new metapackages
section
- * debian/vars.armhf: add
* debian/control.fonts.in: ttf-opensymbol should be in oldlibs, thanks
lintian
- * debian/rules:
- - prevent creating bogus gcc- build-dependency on gcj archs
- - fix qstart.desktop Exec= (closes: #655076)
- - update fakeroot hack for multiarch paths
- - stop creating a dependency on ure for uno-libs3 in .shlibs, use
- uno-libs3 instead
- * debian/uno-libs3.symbols:
- - use uno-libs3, not ure as dependency
+ * debian/patches:
+ - migrate reportdesign-mention-package.diff from libreoffice/build
+ - migrate jdbc-driver-classpaths.diff from libreoffice/build
+ - migrate mysqlcppconn-mysqlclient-SONAME.diff from libreoffice/build
+ - migrate system-python-{ure-bootstrap,uno-path}.diff and
+ pyuno-ooodir.diff from libreoffice/build
+ - migrate split-icons-search-usr-share.diff from libreoffice/build
+ * debian/vars.armhf: add
- * merge from ubuntu-precise-3.5:
- - add debian multiarch support for Qt4
+ [ Bjoern Michaelsen ]
+ * debian/rules:
+ - set CURDIR before first use and use safe method to set it
+ - update GIT_ vars, add GIT_BASEURL for local mirrors
+ - update get-orig-source
+ - build needs the ext-sources
+ * debian/README:
+ - update most outdated README sections
+ * debian/patches:
+ - migrate mention-java-common-package.diff from libreoffice/build
+ - migrate help-msg-add-package-info.diff from libreoffice/build
+ - update help-msg-add-package-info.diff, replace openoffice.org with
+ libreoffice
+ - migrate sensible-ooomua.diff from libreoffice/build and rename to
+ sensible-lomua; add icedove and thunderbird as fallbacks
+ - migrate sensible-browser.diff from libreoffice/build
- -- Rene Engelhard <r...@debian.org> Thu, 12 Jan 2012 18:56:37 +0000
+ -- Rene Engelhard <r...@debian.org> Tue, 27 Dec 2011 10:16:18 +0000
libreoffice (1:3.4.4-2) unstable; urgency=medium
diff --combined control
index ac1cb24,cb1545e..e18b63e
--- a/control
+++ b/control
@@@ -3,8 -3,8 +3,8 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers
<debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <r...@debian.org>
-Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev,
unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev,
libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev,
libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev,
libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl,
libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11),
libxml-parser-perl, gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel
!mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>=
0.8.0), libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3)
[!armel !sparc], libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev,
libdb-dev, dpkg-dev (>= 1.15.6), python (>= 2.6.6-3+squeeze4), python-dev,
debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), openjdk-6-jdk (>= 6b23~pre8-2)
[alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x
sparc], openjdk-7-jdk [ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64],
gcj-native-helper [hppa kfreebsd-amd64 kfreebsd-i386], libgcj-common (>=
1:4.4.1) [hppa kfreebsd-amd64 kfreebsd-i386], ant (>= 1.7.0), ant-optional (>=
1.7.0), mingw-w64 (>= 1.0), libcommons-codec-java, libcommons-httpclient-java,
libcommons-lang-java, libcommons-logging-java, libservlet2.5-java (>= 1.1.1-9),
libbase-java [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel
!hppa !kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>=
0.9.4) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>=
0.2.10) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>=
1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libformula-java (>=
1.1.7) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], librepository-java (>=
1.1.6) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6)
[!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6)
[!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java,
libservlet2.5-java (>= 1.1.1-9), javahelper (>= 0.37~), xulrunner-dev,
libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2),
libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>=
1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0),
libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0),
libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4),
libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791),
libebook1.2-dev [!armel !armhf], libpq-dev (>= 9.0~), libxrandr-dev,
liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4),
liblpsolve55-dev
(>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>=
1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev,
libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10),
libgnomevfs2-dev, libgconf2-dev, liborbit2-dev, libldap2-dev
-Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge,
translate-toolkit (>= 1.9)
+Build-Depends: dpkg-dev (>= 1.16.1), lsb-release, bzip2, bison, flex |
flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config,
libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64],
zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev,
libxtst-dev, libice-dev, libcups2-dev, libarchive-zip-perl, fastjar, xsltproc,
libxkbfile-dev, libxinerama-dev, x11proto-render-dev, libxml-parser-perl,
gperf, po-debconf, bc, wget | curl, libgl1-mesa-dev [!armel !mips !mipsel],
libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0),
libpoppler-private-dev, libpoppler-cpp-dev, libgraphite2-dev (>= 0.9.3) [!armel
!sparc], libexttextcat-dev (>= 3.1.1), libjpeg-dev, libxml2-dev, libxslt1-dev,
libexpat1-dev, unixodbc-dev (>= 2.2.11), libsane-dev, libxrender-dev,
libpng12-dev, libssl-dev, librsvg2-dev, libdb-dev, python (>=
2.6.6-3+squeeze4), python-dev (>= 2.6), python3-dev, debhelper (>= 7.2.3~),
libcppunit-dev (>= 1.12)
, junit4 (>= 4.8.2-2), openjdk-6-jdk (>= 6b23~pre8-2) [alpha amd64 armel armhf
i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc], openjdk-7-jdk
[ia64], gcj-jdk [hppa kfreebsd-i386 kfreebsd-amd64], gcj-native-helper [hppa
kfreebsd-amd64 kfreebsd-i386], libgcj-common (>= 1:4.4.1) [hppa kfreebsd-amd64
kfreebsd-i386], ant (>= 1.7.0), ant-optional (>= 1.7.0), mingw-w64 (>= 1.0),
libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java,
libcommons-logging-java, libservlet2.5-java (>= 1.1.1-9), libbase-java [!armel
!hppa !kfreebsd-amd64 !kfreebsd-i386], libsac-java [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libxml-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libflute-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libpentaho-reporting-flow-engine-java (>=
0.9.4) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], liblayout-java (>=
0.2.10) [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386], libloader-java (>=
1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libformula-java (>= 1.1.7) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], librepository-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libfonts-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libserializer-java (>= 1.1.6) [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], libcommons-logging-java, libservlet2.5-java
(>= 1.1.1-9), javahelper (>= 0.37~), libnss3-dev (>= 3.12.3), xulrunner-dev,
dmake (>= 1:4.11), libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4),
libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>=
0.5.0), libvigraimpex-dev, libsampleicc-dev, libicc-utils-dev, libwpd-dev (>=
0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0),
libvisio-dev, libcmis-dev, libicu-dev (>= 4.0), libcairo2-dev, kdelibs5-dev (>=
4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>=
1.1.0~r791), libgtk2.0-dev (>= 2.10), libgtk-3-dev (>= 3.2~), libebook
1.2-dev [!armel !armhf !powerpc !powerpcspe !ppc64 !s390x], libpq-dev (>=
9.0~), libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10),
bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>=
5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.70),
libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>=
1.0.8), libglib2.0-dev (>= 2.15.0), libgconf2-dev, liborbit2-dev, gettext,
libldap2-dev
+Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (=
1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386
amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev,
nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (=
1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa kfreebsd-i386 kfreebsd-amd64],
ant (= 1.8.0-2) [hppa kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa
kfreebsd-i386 kfreebsd-amd64], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11),
base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.9.1
XS-Python-Version: current
@@@ -16,7 -16,7 +16,7 @@@ Homepage: http://www.libreoffice.or
Package: libreoffice
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: metapackages
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base [!armel !armhf], libreoffice-report-builder-bin [!armel !hppa
!kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic,
libreoffice-filter-mobiledev, ${lucene-depends}, ${java-common-depends},
${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base [!armel !armhf !powerpc !powerpcspe !ppc64 !s390x],
libreoffice-report-builder-bin [!armel !hppa !kfreebsd-amd64 !kfreebsd-i386],
ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev,
${lucene-depends}, ${java-common-depends}, ${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer, libpaper-utils
Suggests: hunspell-dictionary, myspell-dictionary,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane,
hyphen-hyphenation-patterns, mythes-thesaurus, libxrender1, libgl1,
libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove |
thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends},
openclipart-libreoffice, pstoedit, imagemagick |
graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests},
${libldap-suggests}, ${ooo-binfilter-dep}, ${ooo-officebean-dep}
Description: office productivity suite
@@@ -42,7 -42,7 +42,7 @@@
* hyphen-*: Hyphenation patterns for LibreOffice
* libreoffice-gtk: Gtk UI Plugin, GNOME File Picker support,
QuickStarter for GNOMEs notification are
- * libreoffice-gnome: GNOME VFS, GConf backend
+ * libreoffice-gnome: GIO, GConf backend
* libreoffice-kde: KDE UI Plugin and KDE File Picker support
* unixodbc: ODBC database support
* cups-bsd: Allows LibreOffice to detect your CUPS printer queues
@@@ -91,7 -91,7 +91,7 @@@ Package: libreoffice-cor
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-common (>> ${base-version}), fonts-opensymbol |
ttf-opensymbol (>= 1:3.0), ${shlibs:Depends}, ure (>= 1.5.1+OOo3.1.1-15),
fontconfig, ${misc:Depends}
Conflicts: libreoffice-calc (<< ${binary:Version}), libreoffice-writer (<<
${binary:Version}), libreoffice-impress (<< ${binary:Version}),
libreoffice-draw (<< ${binary:Version}), libreoffice-base (<<
${binary:Version}), libreoffice-gtk (<< ${binary:Version}), libreoffice-gnome
(<< ${binary:Version}), libreoffice-kde (<< ${binary:Version}),
libreoffice-evolution (<< ${binary:Version}), libreoffice-filter-so52 (<<
${binary:Version}), libreoffice-officebean (<< ${binary:Version}),
libreoffice-dev (<< ${binary:Version}), libreoffice-style-crystal (<<
1:3.3.0-1), libreoffice-style-oxygen (<< 1:3.3.0-1), libreoffice-style-tango
(<< 1:3.3.0-1), libreoffice-style-hicontrast (<< 1:3.3.0-1),
libreoffice-style-galaxy (<< 1:3.3.0-1), libreoffice-style-andromeda (<<
1:3.3.0-1), libcairo2 (= 1.4.8-1), libicu38 (= 3.8~d01-1), cli-uno-bridge (<<
1:3.0.0~dev300m22), cacao-oj6-jre, mozilla-plugin-vlc (<< 1.0)
-Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<<
1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1),
myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2),
hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5),
myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<<
0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<<
20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2),
myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3),
myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt
(<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku
(<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1),
myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), m
yspell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<<
20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2),
hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de
(<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<<
1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<<
1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3),
myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<<
1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3),
hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<<
1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr
(<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1),
myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution
(<< 1:3.4.1~), li
breoffice-kab (<< 1:3.4.1~)
+Breaks: myspell-ru (<< 0.99g5-8.1), myspell-lv (<< 0.7.3-3.1), myspell-et (<<
1:20030606-12.1), myspell-fi (<< 0.7-17.2), myspell-cs-cz (<< 20040229-4.1),
myspell-el-gr (<< 0.3-1.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), hunspell-ar (<< 0.0.0+20080110-1.1), myspell-hu (<< 0.99.4-1.2),
hunspell-gl-es (<< 2.2a-6), myspell-gv (<< 0.50-8), myspell-en-au (<< 2.1-5),
myspell-fa (<< 0.20070816-2), hunspell-uz (<< 0.6-3.1), hunspell-ko (<<
0.3.3-1), hunspell-se (<< 1.0~beta6.20081222-1.1), hunspell-de-med (<<
20090825-1), hunspell-en-us (<< 20070829-3), myspell-sv-se (<< 1.3.8-6-2.2),
myspell-sk (<< 0.5.5a-2.1), myspell-fo (<< 0.2.36-3), myspell-nl (<< 1:1.10-3),
myspell-pt-br (<< 2009.03.30-1.1), myspell-pl (<< 20090830-1), myspell-pt-pt
(<< 20090309-1.1), myspell-ga (<< 2.0-19), myspell-gd (<< 0.50-7), myspell-ku
(<< 0.20.0-1.1), myspell-hr (<< 20060617-2), myspell-fr-gut (<< 1:1.0-26.1),
myspell-eo (<< 2.1.2000.02.25-41), myspell-de-de-oldspell (<< 1:2-25.1), m
yspell-da (<< 1.6.18-1.1), myspell-es (<< 1.10-7), myspell-de-at (<<
20071211-2), myspell-de-ch (<< 20071211-2), myspell-de-de (<< 20071211-2),
hunspell-de-at (<< 20071211-2), hunspell-de-ch (<< 20071211-2), hunspell-de-de
(<< 20071211-2), myspell-ca (<< 0.6-8), myspell-tl (<< 0.4-0-5), myspell-ne (<<
1.0-4.1), myspell-fr (<< 1.4-25), myspell-hy (<< 0.10.1-1.1), myspell-en-us (<<
1:3.1.0-3), myspell-en-gb (<< 1:3.1.0-3), myspell-en-za (<< 1:3.1.0-3),
myspell-af (<< 1:3.1.0-3), myspell-it (<< 1:3.1.0-3), myspell-sw (<<
1:3.1.0-3), myspell-th (<< 1:3.1.0-3), hunspell-en-ca (<< 1:3.1.0-3),
hunspell-ne (<< 1:3.1.0-3), hunspell-da (<< 1:3.1.0-3), hunspell-fr (<<
1:3.1.0-3), hunspell-vi (<< 1:3.1.0-3), hunspell-hu (<< 1:3.1.0-3), hunspell-sr
(<< 1:3.1.0-3), hunspell-sh (<< 1:3.1.0-3), myspell-lv (<< 0.7.3-3.1),
myspell-et (<< 1:20030606-12.1), myspell-nn (<< 2.0.10-3.1), myspell-nb (<<
2.0.10-3.1), libreoffice-filter-binfilter (<< 1:3.4.1~), libreoffice-evolution
(<< 1:3.4.1~), li
breoffice-kab (<< 1:3.4.1~), libreoffice-sdbc-postgresql (<< 0.8.1~)
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5)
Description: office productivity suite -- arch-dependent files
@@@ -109,20 -109,20 +109,20 @@@ Suggests: libreoffice-style-hicontrast
Recommends: xfonts-mathml, ${textcat-data-recommends}
Conflicts: libtextcat-data (<< 2.2-8), broffice, openoffice.org-common (<<
1:3.3.0~)
Provides: libreoffice-l10n-en-us
-Breaks: libreoffice-style-crystal (<< 1:${basis-version}~),
- libreoffice-style-oxygen (<< 1:${basis-version}~),
+Breaks: libreoffice-style-crystal (<< 1:${oover}~),
+ libreoffice-style-oxygen (<< 1:${oover}~),
libreoffice-style-industrial,
- libreoffice-style-tango (<< 1:${basis-version}~),
- libreoffice-style-hicontrast (<< 1:${basis-version}~),
- libreoffice-style-galaxy (<< 1:${basis-version}~),
- libreoffice-style-andromeda (<< 1:${basis-version}~),
- libreoffice-core (<< 1:${basis-version}~),
- libreoffice-style-crystal (>= 1:${next-basis-version}~),
- libreoffice-style-oxygen (>= 1:${next-basis-version}~),
- libreoffice-style-tango (>= 1:${next-basis-version}~),
- libreoffice-style-hicontrast (>= 1:${next-basis-version}~),
- libreoffice-style-galaxy (>= 1:${next-basis-version}~),
- libreoffice-core (>= 1:${next-basis-version}~)
+ libreoffice-style-tango (<< 1:${oover}~),
+ libreoffice-style-hicontrast (<< 1:${oover}~),
+ libreoffice-style-galaxy (<< 1:${oover}~),
+ libreoffice-style-andromeda (<< 1:${oover}~),
+ libreoffice-core (<< 1:${oover}~),
+ libreoffice-style-crystal (>= 1:${next-oover}~),
+ libreoffice-style-oxygen (>= 1:${next-oover}~),
+ libreoffice-style-tango (>= 1:${next-oover}~),
+ libreoffice-style-hicontrast (>= 1:${next-oover}~),
+ libreoffice-style-galaxy (>= 1:${next-oover}~),
+ libreoffice-core (>= 1:${next-oover}~)
Replaces: openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
@@@ -143,7 -143,7 +143,7 @@@ Description: office productivity suite
Package: libreoffice-writer
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}) [!armel !armhf], ${shlibs:Depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}) [!armel !armhf !powerpc !powerpcspe !ppc64 !s390x],
${shlibs:Depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, libreoffice-emailmerge, libreoffice-math
Replaces: libreoffice-core (<< 1:3.3.2-5)
Suggests: libreoffice-gcj, libreoffice-base
@@@ -155,7 -155,7 +155,7 @@@ Description: office productivity suite
Package: libreoffice-calc
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}) [!armel !armhf], ${shlibs:Depends}, ${lpsolve-dep},
${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}) [!armel !armhf !powerpc !powerpcspe !ppc64 !s390x],
${shlibs:Depends}, ${lpsolve-dep}, ${misc:Depends}
Description: office productivity suite -- spreadsheet
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -190,7 -190,7 +190,7 @@@ Description: office productivity suite
This package contains the equation editor component for LibreOffice.
Package: libreoffice-base-core
-Architecture: alpha amd64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64
s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 sparc
kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
Suggests: libreoffice-base
Description: office productivity suite -- shared library
@@@ -204,7 -204,7 +204,7 @@@
install libreoffice-base.
Package: libreoffice-base
-Architecture: alpha amd64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64
s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 sparc
kfreebsd-amd64 kfreebsd-i386
Section: database
Depends: libreoffice-core (= ${binary:Version}), libreoffice-base-core (=
${binary:Version}), ${shlibs:Depends}, ${java-runtime-depends},
${java:Depends}, ${java-common-depends}, ${misc:Depends}
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc |
mdbtools, libmysql-java | libpg-java | libjtds-java, libreoffice-gcj,
libreoffice-report-builder
@@@ -306,21 -306,8 +306,21 @@@ Description: office productivity suite
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the Gtk plugin for drawing LibreOffices widgets
- with Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME. It
- also contains a QuickStarter for the "notification area".
+ with Gtk+ and a Gtk/GNOMEish File Picker and print dialog when running
+ under GNOME. It also contains a QuickStarter for the "notification area".
+
+Package: libreoffice-gtk3
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+Recommends: libreoffice-style-tango
+Section: gnome
+Enhances: libreoffice
+Description: office productivity suite -- GTK+ 3.0 integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the Gtk plugin for drawing LibreOffices widgets
+ with Gtk+ 3.0 and Gtk/GNOMEish print dialog when running under GNOME.
Package: libreoffice-gnome
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
@@@ -333,7 -320,7 +333,7 @@@ Description: office productivity suite
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
- This package contains the GNOME VFS support and a GConf backend.
+ This package contains the GIO support and a GConf backend.
.
You can extend the functionality of this by installing these packages:
.
@@@ -342,7 -329,7 +342,7 @@@
Package: libreoffice-emailmerge
Architecture: all
-Depends: ${python:Depends}, python-uno, libreoffice-core, ${misc:Depends}
+Depends: ${python:Depends}, python-uno | python3-uno, libreoffice-core,
${misc:Depends}
Enhances: libreoffice-writer
Replaces: python-uno (<< 1:2.4.1-5)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@@ -360,22 -347,6 +360,22 @@@ Section: pytho
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}), ${python:Depends},
${shlibs:Depends}, ${misc:Depends}
+Conflicts: python3-uno
+Description: Python-UNO bridge
+ The Python-UNO bridge allows use of the standard LibreOffice API
+ with the Python scripting language. It additionally allows
+ others to develop UNO components in Python, thus Python UNO components
+ may be run within the LibreOffice process and can be called from C++
+ or the built in StarBasic scripting language.
+Homepage: http://udk.openoffice.org/python/python-bridge.html
+
+Package: python3-uno
+Provides: libreoffice-script-provider-python
+Section: python
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Enhances: libreoffice
+Depends: libreoffice-core (= ${binary:Version}), ${python3:Depends},
${shlibs:Depends}, ${misc:Depends}
+Conflicts: python-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@@ -426,7 -397,7 +426,7 @@@ Description: office productivity suite
Package: libreoffice-script-provider-bsh
Architecture: all
Section: java
-Depends: libreoffice-java-common, ${java-runtime-depends}, ${bsh-depends},
${misc:Depends}
+Depends: libreoffice-java-common, libreoffice-core (>= 1:3.5.0~alpha0~),
libreoffice-common (>= 1:3.5.0~alpha0~), ${java-runtime-depends},
${bsh-depends}, ${misc:Depends}
Replaces: libreoffice-java-common (<< 1:3.4~)
Description: BeanShell script support provider for LibreOffice scripting
framework
LibreOffice is a full-featured office productivity suite that provides
@@@ -443,7 -414,7 +443,7 @@@ Package: libreoffice-script-provider-j
Architecture: all
Section: web
Replaces: libreoffice-common (<< 1:3.4~)
-Depends: libreoffice-java-common, ${java-runtime-depends}, ${misc:Depends}
+Depends: libreoffice-java-common, libreoffice-core (>= 1:3.5.0~alpha0~),
libreoffice-common (>= 1:3.5.0~alpha0~), ${java-runtime-depends},
${misc:Depends}
Description: JavaScript script support provider for LibreOffice scripting
framework
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -3064,7 -3035,7 +3064,7 @@@ Package: ur
Section: libs
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: uno-libs3 (= ${ure:Version}), ${shlibs:Depends}, ${misc:Depends}
-Suggests: java5-runtime, cli-uno-bridge
+Suggests: java5-runtime
Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
Replaces: libreoffice-java-common (<< 1:3.0.0~dev300m12)
Breaks: openoffice.org-core (<< 1:3.3~)
@@@ -3111,7 -3082,7 +3111,7 @@@ Description: office productivity suite
Package: mozilla-libreoffice
Section: net
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 sparc kfreebsd-amd64 kfreebsd-i386
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
@@@ -3147,7 -3118,7 +3147,7 @@@ Package: libreoffice-wiki-publishe
Section: misc
Architecture: all
Pre-Depends: ${java-runtime-depends}
-Depends: ${mediawiki-jar-depends}, libreoffice-core, libreoffice-java-common,
${java:Depends}, ${misc:Depends}
+Depends: ${mediawiki-jar-depends}, libreoffice-core (>= 3.4~),
libreoffice-java-common, ${java:Depends}, ${misc:Depends}
Enhances: libreoffice-writer
Recommends: ${lucene-depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@@ -3192,7 -3163,7 +3192,7 @@@ Description: LibreOffice extension for
Package: libreoffice-presentation-minimizer
Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress,
${misc:Depends}
Enhances: libreoffice-impress
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@@ -3211,7 -3182,7 +3211,7 @@@ Homepage: http://extensions.services.op
Package: libreoffice-presenter-console
Section: misc
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress,
${misc:Depends}
Enhances: libreoffice-impress
@@@ -3236,7 -3207,7 +3236,7 @@@ Homepage: http://extensions.services.op
Package: libreoffice-pdfimport
Section: misc
Priority: extra
-Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc
powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Description: LibreOffice extension for importing PDF documents
@@@ -3261,6 -3232,7 +3261,7 @@@ Description: OpenSymbol TrueType fon
Package: ttf-opensymbol
Section: oldlibs
+ Priority: extra
Architecture: all
Depends: fonts-opensymbol
Description: transitional package for fonts-opensymbol
@@@ -3322,7 -3294,7 +3323,7 @@@ Recommends: ${kde-iconset-dep
Suggests: konqueror, kmail, libreoffice-kab
Section: kde
Enhances: libreoffice
-Replaces: openoffice.org-kde (<< 1:3.3.0~)
+Replaces: openoffice.org-kde (<< 1:3.3.0~), libreoffice-core (=
1:3.5.0~beta2-1)
Description: office productivity suite -- KDE integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -3336,11 -3308,11 +3337,11 @@@
Package: libreoffice-sdbc-postgresql
Section: misc
-Architecture: alpha amd64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64
s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.4.4~), ${misc:Depends}
+Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 sparc
kfreebsd-amd64 kfreebsd-i386
+Depends: ${shlibs:Depends}, libreoffice-core (>= 1:3.5.0~beta),
${misc:Depends}
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Suggests: postgresql (>= 8.4)
-Description: LibreOffice extension for PostgreSQL SDBC driver
+Description: PostgreSQL SDBC driver for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
@@@ -3350,7 -3322,7 +3351,7 @@@ Homepage: http://wiki.documentfoundatio
Package: libreoffice-mysql-connector
Section: misc
-Architecture: alpha amd64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64
s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 sparc
kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
Suggests: mysql-server (>= 5.1)
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
@@@ -3363,7 -3335,7 +3364,7 @@@ Description: MySQL Connector extension
LibreOffice without any wrapper layer such as ODBC or JDBC.
Package: libreoffice-evolution
-Architecture: alpha amd64 hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64
s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 sparc
kfreebsd-amd64 kfreebsd-i386
Section: gnome
Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>=
1:3.4.0~), libreoffice-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
Recommends: evolution
diff --combined patches/armhf-bridges-doubles.diff
index 0000000,0000000..f29c468
new file mode 100644
--- /dev/null
+++ b/patches/armhf-bridges-doubles.diff
@@@ -1,0 -1,0 +1,135 @@@
++From e13dc26e394ede799a60691638971cf1d9689f74 Mon Sep 17 00:00:00 2001
++From: Jani Monoses <j...@ubuntu.com>
++Date: Mon, 20 Feb 2012 23:15:02 +0000
++Subject: ARM bridge: fixes for passing double arguments on the stack
++
++---
++diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
++index 07bdea1..9750b6a 100644
++--- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
+++++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx
++@@ -70,6 +70,7 @@ namespace
++ char * pCppStack = pTopStack;
++
++ #ifdef __ARM_PCS_VFP
+++ int dc = 0;
++ char * pFloatArgs = (char *)(pCppStack - 64);
++ #endif
++ // return
++@@ -152,6 +153,11 @@ namespace
++ if ((pFloatArgs - pTopStack) % 8)
pFloatArgs+=sizeof(float); //align to 8
++ pCppArgs[nPos] = pUnoArgs[nPos] = pFloatArgs;
++ pFloatArgs += sizeof(double);
+++ if (++dc == arm::MAX_FPR_REGS) {
+++ if (pCppStack - pTopStack < 16)
+++ pCppStack = pTopStack + 16;
+++ pFloatArgs = pCppStack;
+++ }
++ } else
++ #endif
++ pCppArgs[nPos] = pUnoArgs[nPos] = pCppStack;
++diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
++index 8e69ebee..98b29ba 100644
++--- a/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
+++++ b/bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx
++@@ -362,7 +362,8 @@ void callVirtualMethod(
++ { \
++ ++pDS; \
++ } \
++- *pDS++ = *reinterpret_cast<double *>( pSV );\
+++ *(double *)pDS = *reinterpret_cast<double *>( pSV );\
+++ pDS += 2;\
++ }
++ #else
++ #define INSERT_FLOAT( pSV, nr, pFPR, pDS ) \
++--
++cgit v0.9.0.2-2-gbebe
++
++From 99bf0c318b89c7d6acee364161b34b13d348a3bb Mon Sep 17 00:00:00 2001
++From: Caolán McNamara <caol...@redhat.com>
++Date: Fri, 17 Feb 2012 09:03:36 +0000
++Subject: add a uno test api with more than 8 floating point args
++
++I'm a cruel person, i.e. this targets the TODO of
++dab11f7fe2a2fa4155e4c4feaa5fc54e57cfbd37 in
++bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cx
++---
++diff --git a/testtools/com/sun/star/comp/bridge/TestComponent.java
b/testtools/com/sun/star/comp/bridge/TestComponent.java
++index c63ff7f..757139a 100644
++--- a/testtools/com/sun/star/comp/bridge/TestComponent.java
+++++ b/testtools/com/sun/star/comp/bridge/TestComponent.java
++@@ -511,6 +511,10 @@ public class TestComponent {
++ return i2;
++ }
++
+++ public double testTenDoubles( double d1, double d2, double d3,
double d4, double d5, double d6, double d7, double d8, double d9, double d10 ) {
+++ return d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8 + d9 + d10;
+++ }
+++
++ // Attributes
++ public boolean getBool() throws com.sun.star.uno.RuntimeException {
++ return _bool;
++diff --git a/testtools/source/bridgetest/bridgetest.cxx
b/testtools/source/bridgetest/bridgetest.cxx
++index 968c5f1..5e611da 100644
++--- a/testtools/source/bridgetest/bridgetest.cxx
+++++ b/testtools/source/bridgetest/bridgetest.cxx
++@@ -541,6 +541,11 @@ static sal_Bool performTest(
++ sal_Int32 i2 = xLBT->testPPCAlignment(0, 0, 0, 0, 0xBEAF);
++ bRet &= check(i2 == 0xBEAF, "ppc-style alignment test");
++ }
+++ {
+++ double d1 = xLBT->testTenDoubles(0.1, 0.2, 0.3, 0.4, 0.5,
+++ 0.6, 0.7, 0.8, 0.9, 1.0);
+++ bRet &= check(d1 == 5.5, "armhf doubles test");
+++ }
++ // Test extended attributes that raise exceptions:
++ try {
++ xLBT->getRaiseAttr1();
++diff --git a/testtools/source/bridgetest/cli/cli_cs_testobj.cs
b/testtools/source/bridgetest/cli/cli_cs_testobj.cs
++index 246d3e1..f89241b 100644
++--- a/testtools/source/bridgetest/cli/cli_cs_testobj.cs
+++++ b/testtools/source/bridgetest/cli/cli_cs_testobj.cs
++@@ -264,6 +264,11 @@ public class BridgeTestObject : WeakBase,
XRecursiveCall, XBridgeTest2
++ return i2;
++ }
++
+++ double testTenDoubles( double d1, double d2, double d3, double d4,
double d5, double d6, double d7, double d8, double d9, double d10 )
+++ {
+++ return d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8 + d9 + d10;
+++ }
+++
++ // Attributes
++ public bool Bool
++ {
++diff --git a/testtools/source/bridgetest/cppobj.cxx
b/testtools/source/bridgetest/cppobj.cxx
++index 0df13f5..def69d9 100644
++--- a/testtools/source/bridgetest/cppobj.cxx
+++++ b/testtools/source/bridgetest/cppobj.cxx
++@@ -230,7 +230,8 @@ public:
++ { return rStruct; }
++ virtual sal_Int32 SAL_CALL testPPCAlignment( sal_Int64, sal_Int64,
sal_Int32, sal_Int64, sal_Int32 i2 )
throw(com::sun::star::uno::RuntimeException)
++ { return i2; }
++-
+++ virtual double SAL_CALL testTenDoubles( double d1, double d2, double d3,
double d4, double d5, double d6, double d7, double d8, double d9, double d10 )
throw(com::sun::star::uno::RuntimeException)
+++ { return d1 + d2 + d3 + d4 + d5 + d6 + d7 + d8 + d9 + d10; }
++ virtual sal_Bool SAL_CALL getBool()
throw(com::sun::star::uno::RuntimeException)
++ { return _aData.Bool; }
++ virtual sal_Int8 SAL_CALL getByte()
throw(com::sun::star::uno::RuntimeException)
++diff --git a/testtools/source/bridgetest/idl/bridgetest.idl
b/testtools/source/bridgetest/idl/bridgetest.idl
++index 82db320..1e6f6aa 100644
++--- a/testtools/source/bridgetest/idl/bridgetest.idl
+++++ b/testtools/source/bridgetest/idl/bridgetest.idl
++@@ -314,6 +314,11 @@ interface XBridgeTestBase :
com::sun::star::uno::XInterface
++ */
++ long testPPCAlignment( [in] hyper l1, [in] hyper l2, [in] long i1, [in]
hyper l3, [in] long i2 );
++
+++ /**
+++ * VFP ABI (armhf) doubles test
+++ */
+++ double testTenDoubles( [in] double d1, [in] double d2, [in] double d3,
[in] double d4, [in] double d5, [in] double d6, [in] double d7, [in] double d8,
[in] double d9, [in] double d10 );
+++
++ [attribute] boolean Bool;
++ [attribute] byte Byte;
++ [attribute] char Char;
++--
++cgit v0.9.0.2-2-gbebe
diff --combined patches/series
index 2ba3f8e,eb9def8..94b7b60
--- a/patches/series
+++ b/patches/series
@@@ -1,38 -1,30 +1,39 @@@
-splash-progressbarcolor.diff
-buildfix-patches.diff
no-minimaltoc.diff
-update-debian-opt.diff
-gcc4.6.0.diff
+debian-opt.diff
odk-jni-include.diff
-disable-ooinstall-in-package-ooo.diff
jurt-soffice-location.diff
-packcomponents-remove-split-components.diff
+split-binfilters-and-evo.diff
debian-debug.diff
-disable-rhino.diff
-bsh-hardcode-path.diff
-mips-openjdk-jre-paths.diff
-autogen.diff
+rhino-build-optional.diff
disable-dynamic-list-cpp.diff
-vbaobj-visibility-fix.diff
make-gengal-work-again.diff
-fix-distro-config.diff
-mipsel-jfw-plugin-arch.diff
-no-deprecated-options-in-qstart-wrappers.diff
-update-sdbc-postgresql.diff
-s390x.diff
-update-libreoffice.1.diff
-wordml2ooo_draw.xsl-add-missing-include.diff
+fix-system-lpsolve-build.diff
+install-fixes.diff
+smoketest-only-en-US.diff
+getMIMEDescription-mismatch.diff
+mention-java-common-package.diff
+help-msg-add-package-info.diff
+sensible-lomua.diff
+sensible-browser.diff
+reportdesign-mention-package.diff
+jdbc-driver-classpaths.diff
+mysqlcppconn-mysqlclient-SONAME.diff
+make-pyuno-work-with-system-wide-module-install.diff
+search-usr-share-for-images.diff
+make-package-modules-not-suck.diff
+fix-ARM-detection-in-set-soenv.diff
add-debian-multiarch-support.diff
-jdbc-driver-threading.diff
+propagate-gb_FULLDEPS.diff
+disable-sc-sw-unoapi-subsequentcheck-for-now.diff
+SwTblBoxFormula-destructor.diff
+ia64-oox-size.diff
mediwiki-oor-replace.diff
+no-rcX-in-final.diff
+odk-fix-rdb-paths.diff
armhf-bridges.diff
armhf-bridges-fix-armv4t-armel.diff
+icu-arm.diff
+move-binfilter-mimetypes-in-extra-desktop-file.diff
+passwordTest-test-old-password-algorith-too.diff
+pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
+ armhf-bridges-doubles.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1s0bhm-0006nj...@vasks.debian.org
