[libreoffice] 122/152: merge from Debian
Rene Engelhard
rene at moszumanska.debian.org
Thu Jul 27 19:17:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.
commit 50a7cec17c8daf40b5c73c0f95cd0e2c11cabea1
Merge: b4861c0 e2637ff
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue Jan 10 12:21:41 2017 +0100
merge from Debian
README.Debian-source | 195 +-
bug-presubj | 3 +
changelog | 353 ++-
compat | 2 +-
control | 0
control.debug.in | 61 -
control.firebird.in | 13 +
control.gcj.in | 20 -
control.gtk2.in | 20 +
control.in | 96 +-
control.mysql.in | 2 +-
control.nlpsolver.in | 15 +
control.ogltrans.in | 1 +
control.systray.in | 12 +
control.ure.in | 4 +-
copyright | 1727 ++++-----------
debian-l10n/control.help.in | 1 +
debian-l10n/control.lang.in | 2 +-
libreoffice-avmedia-backend-gstreamer.maintscript | 1 -
libreoffice-avmedia-backend-vlc.maintscript | 1 -
libreoffice-base-core.maintscript | 1 -
libreoffice-base-drivers.maintscript | 1 -
libreoffice-base.maintscript | 1 -
libreoffice-calc.maintscript | 1 -
libreoffice-common.maintscript | 2 +-
libreoffice-core.bug-script.in | 2 +-
libreoffice-dbg.maintscript | 1 -
libreoffice-dev.maintscript | 1 -
libreoffice-draw.maintscript | 1 -
libreoffice-evolution.maintscript | 1 -
libreoffice-gnome.maintscript | 1 -
libreoffice-gtk3.maintscript | 1 -
libreoffice-impress.maintscript | 1 -
libreoffice-java-common.maintscript | 1 -
libreoffice-kde.maintscript | 1 -
libreoffice-math.maintscript | 1 -
libreoffice-officebean.maintscript | 1 -
libreoffice-ogltrans.maintscript | 1 -
libreoffice-pdfimport.maintscript | 1 -
libreoffice-report-builder-bin.maintscript | 1 -
libreoffice-report-builder.maintscript | 1 -
libreoffice-script-provider-bsh.maintscript | 1 -
libreoffice-script-provider-js.maintscript | 1 -
libreoffice-script-provider-python.maintscript | 1 -
libreoffice-sdbc-firebird.NEWS | 21 +
libreoffice-sdbc-firebird.maintscript | 1 -
libreoffice-sdbc-hsqldb.maintscript | 1 -
libreoffice-sdbc-postgresql.maintscript | 1 -
libreoffice-style-breeze.maintscript | 1 -
libreoffice-style-galaxy.maintscript | 1 -
libreoffice-style-hicontrast.maintscript | 1 -
libreoffice-style-oxygen.maintscript | 1 -
libreoffice-style-sifr.maintscript | 1 -
libreoffice-style-tango.maintscript | 1 -
libreoffice-subsequentcheckbase.maintscript | 1 -
libreoffice-writer.maintscript | 1 -
libreoffice.maintscript | 1 -
patches/aotcompile-256M-default.diff | 28 -
...uild.diff => build-against-shared-lpsolve.diff} | 44 +-
patches/change-from-glew-to-epoxy.diff | 2267 ++++++++++++++++++++
patches/debian-debug.diff | 65 +-
patches/debian-hardened-buildflags-CPPFLAGS.diff | 26 +-
patches/debian-opt.diff | 25 +-
patches/disable-flaky-tests.diff | 13 +
patches/fix-system-lpsolve-build.diff | 33 +-
patches/gcj-no-bitness-check.diff | 30 -
patches/gcj-safe-jni-h-include.diff | 35 -
patches/gtk3-opengl-slideshow.diff | 558 +++++
patches/m68k-alignment.diff | 112 +
patches/make-package-modules-not-suck.diff | 4 +-
patches/no-openssl.diff | 369 ++++
patches/no-packagekit-per-default.diff | 8 +-
patches/rsc-no-error-about-unknown-switch.diff | 6 +-
patches/series | 17 +-
patches/system-officeotron-and-odfvalidator.diff | 16 +
rules | 520 ++---
scripts/get_libvlc_dep.sh | 27 +-
scripts/gid2pkgdirs.sh | 1 +
shlibs.override.glew | 1 -
shlibs.override.libcmis | 2 +
shlibs.override.libstaroffice | 1 +
source/include-binaries | 5 +
tests/control | 2 +-
uno-libs3.symbols | 2 +
ure.bug-script.in | 2 +-
vars.sparc64 | 1 +
86 files changed, 4631 insertions(+), 2177 deletions(-)
diff --cc changelog
index e4bb482,51f9b05..bb8b1e2
--- a/changelog
+++ b/changelog
@@@ -1,75 -1,346 +1,424 @@@
++libreoffice (1:5.3.0~rc1-2ubuntu1~zesty1) zesty; urgency=medium
++
++ * merge from Debian
++
++ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Tue, 10 Jan 2017 12:19:56 +0100
++
+ libreoffice (1:5.3.0~rc1-2) experimental; urgency=medium
+
+ * debian/rules:
+ - readd somehow lost libgl1-mesa-dev build-dependency...
+
+ -- Rene Engelhard <rene at debian.org> Sat, 24 Dec 2016 01:01:40 +0100
+
+ libreoffice (1:5.3.0~rc1-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patches/change-from-glew-to-epoxy.diff: backport from master;
+ as name says
+ * debian/patches/gtk3-opengl-slideshow.diff: backport from master to fix
+ ogltrans generically with gtk3
+ * debian/patches/disable-flaky-tests.diff: also disable svx.AccessibleShape
+
+ * debian/control.ogltrans.in:
+ - add Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
+
+ * debian/rules:
+ - change glew conditionals/build-deps to epoxy
+ - ENABLE_GDRIVE=y again on armhf and arm64
+
+ -- Rene Engelhard <rene at debian.org> Fri, 23 Dec 2016 21:17:03 +0100
+
+ libreoffice (1:5.3.0~beta2-1) experimental; urgency=medium
+
+ * New upstream beta release
+
+ * debian/patches/m68k-alignment.diff: add patch from John Paul Adrian
+ Glaubitz to fix m68k alignment
+
+ * debian/libreoffice-sdbc-firebird.NEWS: add NEWS entry about the format
+ incompatibility
+ * debian/rules: revert ENABLE_GDRIVE=y on arm* as chromium got uploaded
+ without it to sid and it's gone from experimental again on those
+
+ -- Rene Engelhard <rene at debian.org> Sun, 11 Dec 2016 10:40:18 +0100
+
+ libreoffice (1:5.3.0~beta1-1) experimental; urgency=medium
+
+ * New upstream beta release
+
+ * try using just the used tarballs to avoid confusion and to shrink the
+ .orig (they are downloaded anyway and not in the .orig)
+ - remove unneeded tarballs from tarballs
+ - include needed tarballs in include-binaries
+ - update debian/copyright (remove many, add forgotten swingEx
+ fix src -> tarballs; actually add MPL-2.0/ASF blurb)
+ - update README.Debian-source
+
+ * debian/patches/fix-system-lpsolve-build.diff: rename to ..
+ * build-against-shared-lpsolve.diff: ... this to make the purpose more clear
+ * debian/patches/fix-system-lpsolve-build.diff: add new one adding
+ -llpsolve55_pic test/linkage (disabled)
+ * debian/patches/no-openssl.diff: don't uselessly check for openssl and
+ don't require openssl in postgresql-sdbc-impl, not (directly) used
+
+ * debian/scripts/get_libvlc_dep.sh: fix to work again (also) with
+ new multiarchified libvlc5
+
+ * debian/rules:
+ - don't install ChangeLog (now done automatically by dh compat >= 7) as
+ it doubles -common/-core size and increases font-opensymbol *by 10*
+ - ENABLE_GDRIVE=y also on armhf and arm64 as we've chromium there now, too
+ - enable mysql-connector again now that libmysqlcppconn _and_
+ mysql-workbench are built against mariadb.
+ Bump Build-Dependency on libmysqlcppconn to >= 1.1.7-4 to go sure
+ we're getting a >= 1.1.7 dependency
+ Fix adding the libmysqlcppconn-dev Build-Dep in the default case
+ * debian/control.in:
+ - add Breaks: browser-plugin-libreoffice to libreoffice-core
+ (closes: #843980)
+ * debian/control.firebird.in: fix substvar: s/server/engine/
+ * debian/libreoffice-common.maintscript: remove apparently unneeded quotes
+ which now breaks at dpkg-maintscript-helper call... (closes: #844683)
+
+ -- Rene Engelhard <rene at debian.org> Wed, 23 Nov 2016 12:43:18 +0100
+
+ libreoffice (1:5.3.0~alpha1-1) experimental; urgency=medium
+
+ * New upstream alpha release
+ - fixes typo in VCL.xcu; s/Tino/Tinos/ (closes: #834580)
+ - fixes (experimental) Gtk print dialog crash (closes: #839701)
+ - fixes copy paste cells between two tables of two documents with Gtk3
+ (closes: #834622)
+ - fixes tooltips when dragging/filling cells with Gtk3 (closes: #831977)
+
+ * debian/control.{lang,help}.in: use ${help-l10n-virtual-version} as
+ versioned Provides
+ * debian/rules, debian/control.transitionals.in: remove jessie->stretch
+ transitionals again
+ * debian/rules, control.gcj.in: cleanup:
+ - remove support for gcj (and thus building -gcj "native") completely;
+ removed upstream; and also openjdk-9 apparently will drop support for
+ source/target 1.5 (which gcj only supports) and gcc-7 apparently even
+ will drop gcj, too
+ (also the officeotron/odfvalidator stuff fails because due to the java-gcj
+ in the path for safety reasons it picks up gcj..)
+ - use java6_architectures for computing OOO_JAVA_ARCHS
+ * debian/copyright: add schema/*/* to Files-Excluded: :/
+ * debian/uno-libs3.symbols: update
+ * debian/rules:
+ - bump dh compat to 10
+ - re-enable firebird (closes: #841253)
+
+ -- Rene Engelhard <rene at debian.org> Thu, 20 Oct 2016 15:46:34 +0200
+
+libreoffice (1:5.2.4~rc2-0ubuntu1~yakkety2) yakkety; urgency=medium
+
+ * remove seek-1.wmf test doc, bad_alloc on i386 (in rules as it would be a
+ binary diff)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Fri, 16 Dec 2016 10:48:55 +0100
+
+libreoffice (1:5.2.4~rc2-0ubuntu1~yakkety1) yakkety; urgency=medium
+
+ * new upstream rc
+ * remove patches/gtk3-toolbar-styleclass.diff assuming it fixed by
+ 1439b3499ced0f1131af8e0de107e96d8aac4039 upstream
+ * remove patches/lp-1527053.diff assume obsoleted by
+ 83dc2227f35795aee4e2ccaccbb7d67d4c50ba3f upstream
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Wed, 14 Dec 2016 18:02:29 +0100
+
+libreoffice (1:5.2.3~rc2-0ubuntu1~yakkety1) yakkety; urgency=medium
+
+ * new upstream rc
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Wed, 26 Oct 2016 14:55:45 +0200
+
+libreoffice (1:5.2.2-0ubuntu3) yakkety; urgency=medium
+
+ * use preferable upstream patch (LP: #1527053)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Mon, 17 Oct 2016 15:46:18 +0200
+
+libreoffice (1:5.2.2-0ubuntu2) yakkety; urgency=medium
+
+ * make notebook tab text readable w/ libreoffice-gtk3 (LP: #1527053)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Mon, 10 Oct 2016 19:46:56 +0200
+
+libreoffice (1:5.2.2-0ubuntu1) yakkety; urgency=medium
+
+ * new upstream release
+ * fix gcj version (thanks Rico)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Thu, 29 Sep 2016 22:01:18 +0200
+
+libreoffice (1:5.2.1~rc2-0ubuntu1) yakkety; urgency=medium
+
+ * new upstream rc
+ * disable cups for autopkgtests too
+ * make libreoffice-gnome depend on -gtk3 by default
+ * update gtk3 toolbar theming patch and re-enable it (LP: #1580537)
+ * update gdrive auth details
+ * kill packagekit var as did upstream and trigger on gio instead (as does upstream)
+ * update C/R for liblosessioninstallerlo.so move
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Fri, 02 Sep 2016 17:25:33 +0200
+
+libreoffice (1:5.2.0-0ubuntu2) yakkety; urgency=medium
+
+ * rules: remove spurious comment (thanks Rico)
+ * scripts/joinctrl.py: explicitly use python3
+ * disable cups when running tests
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Mon, 22 Aug 2016 22:21:54 +0200
+
+libreoffice (1:5.2.0-0ubuntu1) yakkety; urgency=medium
+
+ * add transitional for -gtk -> gtk2
+ * disable mergedlibs on BSD, thanks Joe Boden (LP: #1598492)
+ * cherry-picked from Debian:
+ - debian/patches/make-package-modules-not-suck.diff: move animcore into
+ DRAW (closes: #833181)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Fri, 12 Aug 2016 07:58:33 +0200
+
+ libreoffice (1:5.2.3~rc1-3) unstable; urgency=medium
+
+ * debian/patches/fix-system-lpsolve-build.diff: fix -L in configure.ac so
+ that it actually checks (against) the shared lib
+
+ -- Rene Engelhard <rene at debian.org> Wed, 19 Oct 2016 22:20:51 +0200
+
+ libreoffice (1:5.2.3~rc1-2) unstable; urgency=medium
+
+ * debian/rules:
+ - disable mysql connector given mysql-* will be removed for stretch and
+ mysql-connector-c++ should probably stay mysql for mysql-workbench
+ - if enabling mysql connector, use default (mariadb) as flavour and internal
+ mysqlcppconn
+
+ -- Rene Engelhard <rene at debian.org> Mon, 17 Oct 2016 19:10:29 +0200
+
+ libreoffice (1:5.2.3~rc1-1) unstable; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patches/startcenter-grey-out-not-installed.diff: backport from
+ master, as name says (closes: #813430)
+
+ * debian/rules:
+ - add /usr/include/libreoffice/sal/typesizes.h symlink to multiarch
+ include dir to fix SDK usage e.g in the SDK examples
+ - disable firebird (as sid now got firebird-dev 3.0), and (internal)
+ firebird2.5 doesn't build. But we probably should not switch to 3.0
+ here (yet) before 5.3...
+ - install LOKDocView-0.1.typelib into multiarch dir as recommended by
+ the GI mini policy
+
+ -- Rene Engelhard <rene at debian.org> Wed, 12 Oct 2016 22:21:35 +0200
+
+ libreoffice (1:5.2.2~rc2-2) unstable; urgency=medium
+
+ * work around libcoinutils-dev pulling in -lbz2 without depending on it
+ by Build-Depending on it here (temporarily)
+
+ -- Rene Engelhard <rene at debian.org> Fri, 23 Sep 2016 07:24:37 +0200
+
+ libreoffice (1:5.2.2~rc2-1) unstable; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patches/gtk3-lot-of-style-updated-signals.diff: apply follow-up
+ patch to don't throw away font settings every time (closes: #836531)
+
+ -- Rene Engelhard <rene at debian.org> Wed, 21 Sep 2016 21:39:59 +0200
+
+ libreoffice (1:5.2.1-3) unstable; urgency=medium
+
+ * debian/patches/gtk3-use-style-updated-signal.diff: backport from master;
+ use style-updated instead of style-set signal. This closes: #837356.
+ * debian/patches/xfce-fallback-list.diff: remove again, didn't help
+
+ * debian/control.in: _really_ remove font depends from libreoffice, really
+ closes: #836416
+ * debian/rules: adapt SYSTEM_GCJ_VERSION detected for gcj-6 (>= 6.2.0-4)...
+
+ -- Rene Engelhard <rene at debian.org> Sat, 17 Sep 2016 01:13:20 +0200
+
+ libreoffice (1:5.2.1-2) unstable; urgency=medium
+
+ * debian/rules: install typesizes.h into
+ usr/include/$(DEB_HOST_MULTIARCH)/libreoffice/sal/typesizes.h
+ * debian/control.in:
+ - remove libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64]
+ Conflicts: from -core, thanks Jon Boden (closes: #836887)
+ - rework libreoffice metapackage "dependencies":
+ + Recommend everything (except GNOME/KDE integration and similar) which
+ the upstream .tar.gz contains:
+ libreoffice-script-provider-bsh,
+ libreoffice-script-provider-js,
+ libreoffice-script-provider-python,
+ libreoffice-ogltrans,
+ libreoffice-librelogo,
+ libreoffice-nlpsolver,
+ libreoffice-pdfimport,
+ libreoffice-report-builder,
+ libreoffice-wiki-publisher
+ libreoffice-sdbc-postgresql
+ + make libreoffice only Recommend the fonts. Mention it recommends
+ extra stuff like fonts to resemble a upstream install, thanks
+ Fabian Greffrath (closes: #836416)
+ - remove obsolete libreoffice-gtk conflicts which makes -core Break: it
+ with bin-NMUs; add (intended) -gtk2/-gtk3 ones...
+
+ * merge from Ubuntu:
+ - uno-libs: Create the libuno_* symlinks in the multiarch libdir
+
+ -- Rene Engelhard <rene at debian.org> Tue, 13 Sep 2016 04:28:17 +0200
+
+ libreoffice (1:5.2.1-1) unstable; urgency=medium
+
+ * LibreOffice 5.2.1 final (identical to rc2)
+
+ * debian/patches/xfce-fallback-list.diff: remove gtk3 from fallback list
+ for xfce (closes: #836531)
+
+ * upload to unstable
+
+ * debian/bug-presubj: mention https://wiki.debian.org/AutomaticDebugPackages
+ * debian/control.in: make the libreoffice meta-package depend also on
+ fonts-crosextra-caladea, fonts-crosextra-carlito and fonts-linuxlibertine
+ * debian/README.Debian-source: update (closes: #836186)
+
+ -- Rene Engelhard <rene at debian.org> Sun, 04 Sep 2016 12:25:34 +0200
+
+ libreoffice (1:5.2.1~rc2-1) experimental; urgency=medium
+
+ * new upstream release candidate
+
+ * debian/rules:
+ - oops, install libqstart_gtklo.so into /program, not /share
+
+ -- Rene Engelhard <rene at debian.org> Thu, 25 Aug 2016 07:52:16 +0200
+
+ libreoffice (1:5.2.1~rc1-1) experimental; urgency=medium
+
+ * new upstream release candidate
+ - drop use of CAIRO_OPERATOR_DIFFERENCE, should fix performance
+ regressions (closes: #832495)
+
+ * debian/rules, debian/control.transitionals.in: readd -gtk as transitional
+ package; depend on -gtk2 (closes: #833676) and -systray
+ * debian/rules: re-enable systray (closes: #825642) now that we need
+ NEW anyway and have a -gtk transitional package (which contained this
+ before it was disabled)
+ * debian/control.gtk2.in: stop providing libreoffice-gtk
+ * debian/rules:
+ - filter-out kfreebsd-i386 and kfreebsd-amd64 explicitly out of
+ OOO_CHECK_ARCHS to save unneeded build-deps (again)
+ - rework MySQL/MariaDB conditionals; allow default-libmysqlclient-dev
+ * debian/libreoffice-gtk.maintscript: readd dir_to_symlink maintscript
+ * debian/control.mysql.in: use default-mysql-server | virtual-mysql-server
+ as MySQL Suggests
+
+ -- Rene Engelhard <rene at debian.org> Tue, 16 Aug 2016 23:23:45 +0200
+
+ libreoffice (1:5.2.0-2) unstable; urgency=medium
+
+ * debian/patches/make-package-modules-not-suck.diff: move animcore into
+ DRAW (closes: #833181)
+
+ * debian/control.nlpsolver.in: fix override disparity , use old values
+ (math/extra)
+ * debian/rules, debian/shlibs.override.libcmis: bump libcmis dependency
+ to (>= 0.5.1+git20160603) to assure the advertised google 2-factor-auth
+ stuff is present
+ * debian/control.in:
+ - update libroffice-gtk mentioning in libreoffice's
+ description to say gtk(2|3) (closes: #833694) - thanks Vincent Levebre
+ - remove mention of Quickstarter from libreoffice and libreoffice-gtk2
+ descriptions; gone there since some time
+ - add Replaces:/Breaks: for libanimcorelo.so move
+ * debian/control.systray.in, debian/rules: install the systray stuff into a
+ new -systray package (if enabled)
+ * debian/control.lang.in: suggest libreoffice-hyphenation-fi at -l10n-fi
+ (provided by libreoffice-voikko)
+ * debian/rules:
+ - clean up test disabling, disable on sparc64. Add missing <!nocheck>
+ for junit4
+
+ -- Rene Engelhard <rene at debian.org> Sun, 14 Aug 2016 20:51:51 +0200
+
+ libreoffice (1:5.2.0-1) unstable; urgency=medium
+
+ * LibreOffice 5.2.0 final (identical to rc4)
+
+ * debian/patches/curl-7.50.0.diff: add from master; fix build with
+ curl 7.50.0
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene at debian.org> Sat, 30 Jul 2016 07:32:37 +0200
+
+ libreoffice (1:5.2.0~rc4-1) experimental; urgency=medium
+
+ * new upstream release candidate
+
+ * debian/patches/jre-update-gt-99.diff: backport from libreoffice-5-2;
+ allow java update version number > 99
+
+ -- Rene Engelhard <rene at debian.org> Fri, 29 Jul 2016 07:31:55 +0200
+
+ libreoffice (1:5.2.0~rc3-1) experimental; urgency=medium
+
+ * new upstream release candidate
+
+ * debian/rules:
+ - use (more) dh_* -a instead of deprecated -s
+
+ * debian/rules, debian/scripts/joinctrl.py: use $(PYTHON) (so python3),
+ "python" isn't pulled in (implicitely) anymore; update build-deps
+
+ -- Rene Engelhard <rene at debian.org> Tue, 19 Jul 2016 23:53:14 +0200
+
+ libreoffice (1:5.2.0~rc2-1) experimental; urgency=medium
+
+ * new upstream release candidate
+
+ * debian/rules:
+ - use dh_listpackages -a instead of deprecated -s
+
+ -- Rene Engelhard <rene at debian.org> Thu, 07 Jul 2016 08:18:31 +0200
+
+ libreoffice (1:5.2.0~rc1-1) experimental; urgency=medium
+
+ * new upstream release candidate
+ - scales gtk3 smooth scaling events... (closes: #826654)
+
+ * debian/patches/sparc64.diff: add sparc64 port, thanks James Clarke
+
+ * debian/vars.sparc64: add
+ * debian/rules: add sparc64 support again
+
+ * debian/control.in:
+ - move ttf-liberation-fonts recommends to -common (closes: #747132)
+ - move libpaper-utils recommends to -core
+
+ * debian/control.nlpsolver.in, debian/rules, debian/scripts/gid2pkgdirs.sh:
+ package the NLPSolver from here (closes: #827474)
+
+ -- Rene Engelhard <rene at debian.org> Wed, 22 Jun 2016 02:57:13 +0200
+
+ libreoffice (1:5.2.0~beta2-1) experimental; urgency=medium
+
+ * New upstream beta release
+ - only initalizes the OpenGL context if we need it (closes: #819153)
+
+ -- Rene Engelhard <rene at debian.org> Tue, 07 Jun 2016 20:32:07 +0200
+
libreoffice (1:5.2.0~beta1-1) experimental; urgency=medium
* New upstream beta release
diff --cc control
index 0000000,8015da6..e69de29
mode 000000,100644..100644
--- a/control
+++ b/control
diff --cc control.in
index bc5471f,2d179e6..02d5dcc
--- a/control.in
+++ b/control.in
@@@ -27,8 -23,8 +24,8 @@@ Build-Conflicts: flex (= 2.5.34-1) [amd
amd-libopencl1,
nvidia-libopencl1
Standards-Version: 3.9.4
- Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-xenial-5.1
-Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.3
-Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
++Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-zesty-5.3
+Vcs-Browser: https://code.launchpad.net/~libreoffice/ubuntu/+source/libreoffice/+git/libreoffice-debian-pkg
Bugs: @BUGS@
Homepage: http://www.libreoffice.org
@@@ -50,9 -45,20 +46,21 @@@ Depends: libreoffice-base%OOO_NO_BASE_A
${java-common-depends},
${misc:Depends},
${pyuno-depends}
- Recommends: fonts-liberation | ttf-mscorefonts-installer,
- libpaper-utils,
+ Recommends: fonts-sil-gentium-basic,
+ fonts-crosextra-caladea,
+ fonts-crosextra-carlito,
+ fonts-linuxlibertine,
+ libreoffice-script-provider-bsh,
+ libreoffice-script-provider-js,
+ libreoffice-script-provider-python,
+ libreoffice-ogltrans,
+ libreoffice-librelogo,
+ libreoffice-nlpsolver,
+ libreoffice-pdfimport,
+ libreoffice-report-builder%OOO_NO_REPORTDESIGN_ARCHS%,
+ libreoffice-wiki-publisher,
- libreoffice-sdbc-postgresql
++ libreoffice-sdbc-postgresql,
+ %LO-DESKTOP-INTEGRATION%
Suggests: cups-bsd,
hunspell-dictionary,
hyphen-hyphenation-patterns,
@@@ -164,10 -172,10 +173,11 @@@ Architecture: %OOO_ARCHS
Depends: fontconfig,
fonts-opensymbol,
libreoffice-common (>> ${base-version}),
- ure (>= 4.2~),
- ${lpsolve-dep},
+ ure (>= 5.3.0~beta1~),
++ ${lpsolve-dep},
${misc:Depends},
${shlibs:Depends}
+ Recommends: libpaper-utils
Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
hunspell-ar (<< 0.0.0+20080110-1.1),
hunspell-da (<< 1:3.1.0-3),
@@@ -195,8 -203,10 +205,9 @@@
libreoffice-dev (<< ${binary:Version}),
libreoffice-draw (<< ${binary:Version}),
libreoffice-evolution (<< ${binary:Version}),
- libreoffice-evolution (<< 1:3.4.1~),
libreoffice-gnome (<< ${binary:Version}),
- libreoffice-gtk (<< ${binary:Version}),
+ libreoffice-gtk2 (<< ${binary:Version}),
+ libreoffice-gtk3 (<< ${binary:Version}),
libreoffice-impress (<< ${binary:Version}),
libreoffice-kab (<< 1:3.4.1~),
libreoffice-kde (<< ${binary:Version}),
@@@ -254,11 -264,12 +265,12 @@@
myspell-sv-se (<< 1.3.8-6-2.2),
myspell-sw (<< 1:3.1.0-3),
myspell-th (<< 1:3.1.0-3),
- myspell-tl (<< 0.4-0-5)
- Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled, libreoffice-report-builder-bin [kfreebsd-i386 kfreebsd-amd64]
+ myspell-tl (<< 0.4-0-5),
+ browser-plugin-libreoffice
+ Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
Provides: libreoffice-bundled
Replaces: libreoffice-calc (<< 1:3.3.2-5),
- libreoffice-common (<< 1:4.4.0~rc3-1),
+ libreoffice-common (<< 1:4.4.1-0ubuntu2),
uno-libs3 (<< 1:3.6.1-2),
ure (<< 1:3.6.1-2)
Description: office productivity suite -- arch-dependent files
@@@ -274,12 -285,10 +286,12 @@@ Pre-Depends: dpkg (>= 1.15.7.2~
Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
Suggests: libreoffice-style-breeze,
libreoffice-style-hicontrast,
+ libreoffice-style-human,
libreoffice-style-oxygen,
+ libreoffice-style-breeze,
libreoffice-style-sifr,
libreoffice-style-tango
- Recommends: fonts-stix, ${pyuno-depends}, ${textcat-data-recommends}
+ Recommends: ${pyuno-depends}, ${textcat-data-recommends}, fonts-liberation | ttf-mscorefonts-installer
Conflicts: openoffice-unbundled,
broffice,
libreoffice-filter-mobiledev,
@@@ -547,50 -542,6 +559,17 @@@ Description: office productivity suite
MS Windows (tm) and when not using GNOME or KDE, needs to be manually
enabled in the LibreOffice option menu.
- Package: libreoffice-style-human
- Architecture: all
- Depends: libreoffice-style-galaxy, ${misc:Depends}
- Enhances: libreoffice-core
- Suggests: crystalcursors, kde-icons-crystal
- Provides: libreoffice-style, libreoffice-style-default
- Description: office productivity suite -- Human symbol style
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the "human" symbol style, default style for Ubuntu.
-
+Package: libreoffice-style-elementary
+Architecture: all
+Depends: libreoffice-style-galaxy, ${misc:Depends}
+Enhances: libreoffice-core
+Provides: libreoffice-style, libreoffice-style-default
+Description: office productivity suite -- Elementary symbol style
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the "elementary" symbol style.
+
- Package: libreoffice-gtk2
- Architecture: %OOO_ARCHS%
- Pre-Depends: ${misc:Pre-Depends}
- Depends: libreoffice-core (= ${binary:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
- Recommends: libreoffice-style-breeze | libreoffice-style-tango | libreoffice-style-elementary
- Section: gnome
- Enhances: libreoffice
- Provides: libreoffice-gtk, lo-menubar
- Replaces: libreoffice-gtk (<< 1:5.2.0~), libreoffice-core (<< 1:5.0.2), lo-menubar
- Breaks: libreoffice-gtk (<< 1:5.2.0~)
- Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64], lo-menubar
- Description: office productivity suite -- GTK+ 2 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+ 2 and a Gtk/GNOMEish File Picker and print dialog when running
- under GNOME. It also contains a QuickStarter for the "notification area".
-
Package: libreoffice-gnome
Architecture: %OOO_ARCHS%
Pre-Depends: ${misc:Pre-Depends}
diff --cc debian-l10n/control.help.in
index cf5335a,0000000..fc3adda
mode 100644,000000..100644
--- a/debian-l10n/control.help.in
+++ b/debian-l10n/control.help.in
@@@ -1,16 -1,0 +1,17 @@@
+Package: libreoffice-help-${isocode_lower}
+Architecture: all
+Section: doc
+Recommends: libreoffice-core (>> $${base-version}) | language-support-translations-${isocode_firstpart}
++Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-l10n-${isocode_lower},
+ libreoffice-style-default,
+ libreoffice-writer | language-support-translations-${isocode_firstpart},
+ $${misc:Depends}
+Provides: libreoffice-help-$${help-l10n-virtual-version}
+Description: office productivity suite -- ${language_name} help
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the help of LibreOffice in
+ ${language_name}.
+
diff --cc debian-l10n/control.lang.in
index d25cdd6,85dd6bf..be76ebb
--- a/debian-l10n/control.lang.in
+++ b/debian-l10n/control.lang.in
@@@ -1,16 -1,16 +1,16 @@@
-Package: libreoffice-l10n- at LCODE@
+Package: libreoffice-l10n-${isocode_lower}
Section: localization
Architecture: all
-Pre-Depends: ${misc:Pre-Depends}
-Depends: libreoffice-common, ${misc:Depends}, @LOCALES_DEPENDS@
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations- at CCODE@ @FONT_SUGGESTS@
-Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary- at LCODE@ | myspell-dictionary- at LCODE@,
- hyphen- at LCODE@,
- libreoffice-grammarcheck- at LCODE@,
- libreoffice-help- at LCODE@,
- mythes- at LCODE@
-Description: office productivity suite -- @LNAME@ language package
+Pre-Depends: $${misc:Pre-Depends}
+Depends: libreoffice-common, $${misc:Depends}, ${locales_depends}
+Recommends: libreoffice-core (>> $${base-version}) | language-support-translations-${isocode_firstpart} ${font_suggests}
- Provides: libreoffice-l10n-$${help-l10n-virtual-version}
++Provides: libreoffice-l10n (= $${help-l10n-virtual-version})
+Suggests: hunspell-dictionary-${isocode_lower} | myspell-dictionary-${isocode_lower},
+ hyphen-${isocode_lower},
+ libreoffice-grammarcheck-${isocode_lower},
+ libreoffice-help-${isocode_lower},
+ mythes-${isocode_lower}
+Description: office productivity suite -- ${language_name} language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
diff --cc patches/debian-debug.diff
index b7e9fea,5f0ba47..36daddb
--- a/patches/debian-debug.diff
+++ b/patches/debian-debug.diff
@@@ -1,41 -1,8 +1,7 @@@
- From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
- Date: Fri, 26 Feb 2016 13:05:20 +0100
- Subject: [PATCH] debian-debug.diff
-
- ---
- configure.ac | 10 ++++++++--
- solenv/gbuild/platform/com_GCC_defs.mk | 4 ++++
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
- diff --git a/configure.ac b/configure.ac
- --- a/configure.ac
- +++ b/configure.ac
- @@ -3970,13 +3970,19 @@ dnl Check for enable symbols option
- dnl ===================================================================
- AC_MSG_CHECKING([whether to include symbols while preserve optimization])
- if test -n "$enable_symbols" -a "$enable_symbols" != "no"; then
- - ENABLE_SYMBOLS="TRUE"
- + if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then
- + ENABLE_SYMBOLS="SMALL"
- + AC_MSG_RESULT([yes, small ones])
- + else
- + ENABLE_SYMBOLS="TRUE"
- + AC_MSG_RESULT([yes])
- + fi
- +
- if test -n "$ENABLE_DBGUTIL"; then
- AC_MSG_ERROR([--enable-dbgutil cannot be used with --enable-symbols])
- elif test -n "$ENABLE_DEBUG"; then
- AC_MSG_ERROR([--enable-debug cannot be used with --enable-symbols])
- fi
- - AC_MSG_RESULT([yes])
- else
- if test -n "$enable_symbols" -a "$enable_symbols" = "no"; then
- ENABLE_SYMBOLS="FALSE"
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
-index 9de88a2..9161a4e 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
-@@ -153,11 +153,15 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
+@@ -179,11 +179,15 @@ gb_PrecompiledHeader_EXCEPTIONFLAGS := $(gb_LinkTarget_EXCEPTIONFLAGS)
gb_COMPILERNOOPTFLAGS := -O0 -fstrict-aliasing -fstrict-overflow
# Clang does not know -ggdb2 or some other options
diff --cc patches/debian-hardened-buildflags-CPPFLAGS.diff
index 7954532,29e0570..aaecc87
--- a/patches/debian-hardened-buildflags-CPPFLAGS.diff
+++ b/patches/debian-hardened-buildflags-CPPFLAGS.diff
@@@ -60,13 -27,32 +60,31 @@@ diff --git a/configure.ac b/configure.a
+fi
+AC_SUBST(HARDEN_CPPFLAGS)
+
- # this is for opengl transitions in impress slideshow
- ENABLE_OPENGL=
+ ENABLE_OPENGL_TRANSITIONS=
+ ENABLE_OPENGL_CANVAS=
if test $_os = iOS -o $_os = Android; then
+ --- a/config_host.mk.in-old 2012-04-06 14:17:55.164239390 +0200
+ +++ b/config_host.mk.in 2012-04-06 14:18:55.440239065 +0200
+ @@ -70,6 +70,7 @@
+ export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
+ export CPUNAME=@CPUNAME@
+ export CDEFAULTOPT=@CDEFAULTOPT@
+ +export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
+ export CROSS_COMPILING=@CROSS_COMPILING@
+ export CURL=@CURL@
+ export CURL_CFLAGS=$(gb_SPACE)@CURL_CFLAGS@
+ @@ -240,7 +240,6 @@ export GUIBASE=@GUIBASE@
+ export USING_X11=@USING_X11@
+ export HAMCREST_JAR=@HAMCREST_JAR@
+ export HAVE_GCC_AVX=@HAVE_GCC_AVX@
+ -export HAVE_GCC_STACK_PROTECTOR_STRONG=@HAVE_GCC_STACK_PROTECTOR_STRONG@
+ export HAVE_GCC_BUILTIN_ATOMIC=@HAVE_GCC_BUILTIN_ATOMIC@
+ export HAVE_GCC_FINLINE_LIMIT=@HAVE_GCC_FINLINE_LIMIT@
+ export HAVE_GCC_FNO_DEFAULT_INLINE=@HAVE_GCC_FNO_DEFAULT_INLINE@
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
-index c71cb40..f826d65 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
-@@ -259,6 +259,8 @@ gb_GLOBALDEFS += \
+@@ -243,6 +243,8 @@ gb_GLOBALDEFS += \
ENABLE_LTO \
)
@@@ -76,10 -62,11 +94,10 @@@
# This is used to detect whether LibreOffice is being built (as opposed to building
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
-index 7acd068..b6d9735 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
- @@ -124,12 +124,6 @@ endif
- endif
+ @@ -113,12 +113,6 @@ endif
+ gb_VISIBILITY_FLAGS_CXX := -fvisibility-inlines-hidden
gb_CXXFLAGS_COMMON += $(gb_VISIBILITY_FLAGS_CXX)
-ifeq ($(HAVE_GCC_STACK_PROTECTOR_STRONG),TRUE)
diff --cc patches/debian-opt.diff
index 3fd23d4,e58de21..f5d8c8b
--- a/patches/debian-opt.diff
+++ b/patches/debian-opt.diff
@@@ -1,18 -1,22 +1,21 @@@
- From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
- Date: Sat, 9 Nov 2013 02:00:23 +0100
- Subject: [PATCH] debian-opt.diff
-
- Change-Id: I1a1e700bec24fc6de77fb9578cc9ddbcf0fa6ca2
-
- ---
- config_host.mk.in | 1 +
- configure.ac | 3 +++
- 2 files changed, 4 insertions(+)
-
+ diff --git a/configure.ac b/configure.ac
+ index f06ef8e..91ce612 100644
+ --- a/configure.ac
+ +++ b/configure.ac
+ @@ -12776,6 +12776,9 @@ fi
+
+ AC_SUBST(ENABLE_FORMULA_LOGGER)
+
+ +CDEFAULTOPT=`echo $CFLAGS 2>/dev/null | grep -E -o "\-O[[0-3]]"`
+ +AC_SUBST(CDEFAULTOPT)
+ +
+ dnl ===================================================================
+ dnl Setting up the environment.
+ dnl ===================================================================
diff --git a/config_host.mk.in b/config_host.mk.in
-index 1ec3268..abb45b1 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
-@@ -69,6 +69,7 @@ export CPP_LIBRARY=@CPP_LIBRARY@
+@@ -75,6 +75,7 @@ export COM_IS_CLANG=@COM_IS_CLANG@
export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
export CPUNAME=@CPUNAME@
diff --cc patches/disable-flaky-tests.diff
index 34859a9,ff4dfdf..d0bc1ad
--- a/patches/disable-flaky-tests.diff
+++ b/patches/disable-flaky-tests.diff
@@@ -83,21 -139,41 +83,34 @@@ index d7c1f22..ef57a10 10064
- assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
-#endif
-}
-+//DECLARE_OOXMLEXPORT_TEST(testFlipAndRotateCustomShape, "flip_and_rotate.odt")
-+//{
-+// xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-+// if (!pXmlDoc)
-+// return;
-+// // there should be no flipH and flipV attributes in this case
-+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipH");
-+// assertXPathNoAttribute(pXmlDoc, "//a:xfrm", "flipV");
-+// // check rotation angle
-+// assertXPath(pXmlDoc, "//a:xfrm", "rot", "13500000");
-+// // check the first few coordinates of the polygon
-+//#ifndef MACOSX /* Retina-related rounding rountrip error
-+// * hard to smooth out due to the use of string compare
-+// * instead of number */
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "x", "2351");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[1]/a:pt", "y", "3171");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "x", "1695");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[2]/a:pt", "y", "3171");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "x", "1695");
-+// assertXPath(pXmlDoc, "//a:custGeom/a:pathLst/a:path/a:lnTo[3]/a:pt", "y", "1701");
-+//#endif
-+//}
- #endif
+ DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx")
+ {
+diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
+index 25db0b6..2bae4fa 100644
+--- a/toolkit/Module_toolkit.mk
++++ b/toolkit/Module_toolkit.mk
+@@ -26,10 +26,6 @@ $(eval $(call gb_Module_add_targets,toolkit,\
+ ifneq ($(OOO_JUNIT_JAR),)
+ $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\
+ JunitTest_toolkit_complex \
+- JunitTest_toolkit_unoapi_1 \
+- JunitTest_toolkit_unoapi_2 \
+- JunitTest_toolkit_unoapi_3 \
+- JunitTest_toolkit_unoapi_4 \
+ ))
+ endif
+ diff --git a/svx/qa/unoapi/svx.sce b/svx/qa/unoapi/svx.sce
+ index 1c3925f..a16f001 100644
+ --- a/svx/qa/unoapi/svx.sce
+ +++ b/svx/qa/unoapi/svx.sce
+ @@ -25,7 +25,7 @@
+ #i111216 -o svx.AccessiblePresentationGraphicShape
+ #i111216 -o svx.AccessiblePresentationOLEShape
+ #i85539 -o svx.AccessiblePresentationShape
+ --o svx.AccessibleShape
+ +#-o svx.AccessibleShape
+ #i90294 -o svx.GraphicExporter
+ -o svx.SvxDrawPage
+ #i85501 -o svx.SvxGraphCtrlAccessibleContext
diff --cc patches/series
index 5e50d26,fa0452f..96b4822
--- a/patches/series
+++ b/patches/series
@@@ -24,8 -25,11 +24,13 @@@ lo-xlate-lang-update.dif
build-connectivitytools.diff
odk-no-dot.diff
hppa-is-32bit.diff
- gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
- lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
- integraltrans.diff
- mysqlc-boost-fallthrough.diff
-debian-branding.diff
-no-packagekit-per-default.diff
++#no-packagekit-per-default.diff
+ system-officeotron-and-odfvalidator.diff
+ no-openssl.diff
+ m68k-alignment.diff
+ change-from-glew-to-epoxy.diff
+ gtk3-opengl-slideshow.diff
++#lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
++#integraltrans.diff
++#mysqlc-boost-fallthrough.diff
diff --cc rules
index c38dd0c,10aeb97..b27fbd4
--- a/rules
+++ b/rules
@@@ -199,16 -195,7 +198,12 @@@ KDELIBS_MINVER= (>= 4:4.3.4
ifneq (noddebs,$(findstring noddebs,$(DEB_BUILD_OPTIONS)))
BUILD_DBGSYM_PACKAGES=y
endif
+ifeq "$(DEB_VENDOR)" "Ubuntu"
+ # for now stay with plain libreoffice-dbg
+ BUILD_DBG_PACKAGE=y
+ BUILD_DBGSYM_PACKAGES=n
+endif
- ifeq "$(BUILD_DBGSYM_PACKAGES)$(BUILD_DBG_PACKAGE)" "yy"
- $(error only either -dbgsym or -dbg allowed)
- endif
# this changes the packages' built/contents of packages (-subsequentcheckbase)
# This is not exactly allowed in policy but it doesn't have real practical difference,
# does it?
@@@ -398,9 -389,9 +396,8 @@@ endi
ENABLE_EVO2=y
ENABLE_GCONF=y
ENABLE_GIO=y
-ENABLE_DCONF=y
ENABLE_RANDR=y
PACKAGE_BASE=y
- ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
SYSTEM_STUFF += harfbuzz
ALLOC=system
@@@ -411,9 -402,10 +408,9 @@@ CPPUNIT_MINVER=1.13.2-2.
else
CPPUNIT_MINVER=0.12
endif
- IMAGES:=galaxy hicontrast oxygen tango sifr breeze elementary
-DEFAULT_IMAGE=galaxy
-IMAGES:=$(DEFAULT_IMAGE) hicontrast oxygen tango sifr breeze breeze_dark
++IMAGES:=galaxy hicontrast oxygen tango sifr breeze breeze_dark elementary
ENABLE_MYSQLNATIVE=y
- USE_MARIADB=n
+ MYSQL_FLAVOUR=default
# set this also to y for system-mysql..
SYSTEM_STUFF += mariadb
SYSTEM_STUFF += mysql-cppconn
@@@ -536,10 -535,8 +540,9 @@@ CONFIGURE_FLAGS=
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--disable-online-update \
--disable-fetch-external \
+ --disable-gstreamer-0-10 \
--without-fonts \
--without-myspell-dicts \
- --enable-hardlink-deliver \
--with-branding=$(CURDIR)/debian/branding
CONFIGURE_FLAGS_INDEP=
@@@ -793,12 -700,8 +764,11 @@@ DH_STRIP_DBG_OPTION_LO += --no-automati
DH_STRIP_DBG_OPTION_URE += --no-automatic-dbgsym
DH_STRIP_DBG_OPTION_UNO_LIBS3 += --no-automatic-dbgsym
endif
- endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
+ifneq ($(ENABLE_FIREBIRD),y)
+ CONFIGURE_FLAGS += --disable-firebird-sdbc
+endif
CC_PREFIX:=$(shell gcc -dumpmachine)-
@@@ -1103,16 -969,7 +1038,13 @@@ ifeq "$(ENABLE_JAVA)" "y
else
BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
endif
+ GCJ_VERSION = $(shell basename `readlink /usr/lib/jvm/java-gcj/bin/gcj` | sed -e s/gcj-//)
+ ifneq "$(GCJ_VERSION)" ""
+ GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/$(DEB_HOST_MULTIARCH)/gcj-$(GCJ_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed -e s/$$/-awt/)
+ DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e s/awt/dbg/)
+ GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep libjawt.so | head -n 1`)
+ endif
JAVA_RUNTIME_DEPENDS = default-jre
- # ifneq (,$(GCJ_JAWT_DEPENDS))
- # JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
- # endif
ifneq (,$(filter $(DEB_HOST_ARCH), $(OOO_OPENJDK_ARCHS)))
ifneq "$(DEB_HOST_ARCH)" "ia64"
JAVA_RUNTIME_DEPENDS += | openjdk-8-jre | openjdk-7-jre | openjdk-6-jre
@@@ -1727,15 -1587,103 +1661,8 @@@ debian/control: $(wildcard debian/contr
-e "s#@BUGS@#$(BUGS)#g" \
< debian/control.in > debian/control
- for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
- LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
- LCODE=`$(SOURCE_TREE)/bin/lo-xlate-lang -i $$LNUM | tr A-Z a-z`; \
- [ "$$LNUM" = ca-valencia ] && continue; \
- [ "$$LCODE" = kmr-latn ] && LCODE=kmr; \
- CCODE=`echo $$LCODE | sed 's/-.*//'`; \
- case "$$LCODE" in \
- bn) \
- FONT_SUGGESTS=", fonts-beng"; \
- ;; \
- gu) \
- FONT_SUGGESTS=", fonts-gujr"; \
- ;; \
- pa-in) \
- FONT_SUGGESTS=", fonts-guru"; \
- ;; \
- ml) \
- FONT_SUGGESTS=", fonts-mlym"; \
- ;; \
- or) \
- FONT_SUGGESTS=", fonts-orya"; \
- ;; \
- te) \
- FONT_SUGGESTS=", fonts-telu"; \
- ;; \
- ta) \
- FONT_SUGGESTS=", fonts-taml"; \
- ;; \
- hi-in|ne|mr) \
- FONT_SUGGESTS=", fonts-deva"; \
- ;; \
- he) \
- FONT_SUGGESTS=", culmus"; \
- ;; \
- km) \
- FONT_SUGGESTS=", fonts-khmeros"; \
- ;; \
- ar) \
- FONT_SUGGESTS=", fonts-arabeyes"; \
- ;; \
- fa) \
- FONT_SUGGESTS=", fonts-farsiweb"; \
- ;; \
- dz) \
- FONT_SUGGESTS=", fonts-dzongkha"; \
- ;; \
- th) \
- FONT_SUGGESTS=", fonts-thai-tlwg"; \
- ;; \
- *) \
- FONT_SUGGESTS= ;; \
- esac; \
- case "$$LCODE" in \
- rw) \
- LOCALES_DEPENDS="locales (>= 2.3.6) | locales-all (>= 2.3.6)" \
- ;; \
- ss|ts|km|ns|tn) \
- LOCALES_DEPENDS="locales (>= 2.3.5-12) | locales-all" \
- ;; \
- sr) \
- LOCALES_DEPENDS="locales (>= 2.3.6.ds1-5) | locales-all" \
- ;; \
- as|or|nr) \
- LOCALES_DEPENDS="locales (>= 2.3.6.ds1-1) | locales-all (>= 2.3.6.ds1-1)" \
- ;; \
- sw) \
- LOCALES_DEPENDS="locales (>= 2.13-5) | locales-all (>= 2.13-5)" \
- ;; \
- *) \
- LOCALES_DEPENDS="locales | locales-all" \
- ;; \
- esac; \
- sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \
- -e "s|@CCODE@|$$CCODE|g" \
- -e "s|@FONT_SUGGESTS@|$$FONT_SUGGESTS|g" \
- -e "s:@LOCALES_DEPENDS@:$$LOCALES_DEPENDS:g" \
- -e "s|@LDAP_LIB@|$(LDAP_LIB)|g" \
- >> debian/control < debian/control.lang.in; \
- done
-
-ifneq "$(ENABLE_HELP)" "n"
- for LNUM in $(HELPISOS) ; do \
- LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
- LCODE=`$(SOURCE_TREE)/bin/lo-xlate-lang -i $$LNUM | tr A-Z a-z`; \
- [ "$$LNUM" = ca-valencia ] && continue; \
- CCODE=`echo $$LCODE | sed 's/-.*//'`; \
- sed -e "s|@LNAME@|$$LNAME|g" -e "s|@LCODE@|$$LCODE|g" \
- -e "s|@CCODE@|$$CCODE|g" \
- >> debian/control < debian/control.help.in; \
- done
- # en_US is in -common
- perl -pi -e 's|(Depends: libreoffice-writer \| language-support-translations-en), libreoffice-l10n-en-us|\1|' \
- debian/control
- perl -pi -e 's|(Depends: libreoffice-writer, libreoffice-l10n-en-us)|\1, fonts-deva|' \
- debian/control
-endif
+ cat debian/control.transitionals.in >> debian/control
cat debian/control.ure.in >> debian/control
- ifeq "$(ENABLE_JAVA)" "y"
- ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
- ifeq "$(BUILD_JARS_NATIVE)" "y"
- cat debian/control.gcj.in >> debian/control
- endif
- endif
- endif
cat debian/control.ogltrans.in >> debian/control
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(ENABLE_MEDIAWIKI)" "y"
@@@ -2025,9 -1964,8 +1956,9 @@@ install-common: $(STAMP_DIR)/install-co
$(STAMP_DIR)/install-common:
dh_testdir
dh_testroot
+ $(buildd_discspace_hack)
- if [ -x /usr/bin/dh_prep ]; then dh_prep; else dh_clean -k; fi
+ dh_prep
rm -f debian/*.install debian/*.dirs
# remove those for safety in case the languages might change on
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list