[libreoffice] 75/152: Merge tag 'libreoffice_5.2.0_beta1-1' into ubuntu-yakkety-5.2
Rene Engelhard
rene at moszumanska.debian.org
Thu Jul 27 19:17:01 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 9934142579837682afa9bcb9fac4288c2c7b4629
Merge: 984149a 1c6194f
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Tue May 31 11:57:06 2016 +0200
Merge tag 'libreoffice_5.2.0_beta1-1' into ubuntu-yakkety-5.2
tag libreoffice 1:5.2.0~beta1-1
bug-presubj | 19 +-
changelog | 321 ++++++++++++++
control.debug.in | 10 +-
control.evolution.in | 1 +
control.gtk3.in | 36 +-
control.in | 57 ++-
control.kde.in | 1 +
control.lokit.in | 2 +-
control.ogltrans.in | 1 +
control.postgresql.in | 5 +-
control.reportdesign.in | 3 +-
control.sdk.in | 32 +-
control.subsequentcheckbase.in | 2 +
debian-l10n/control.lang.in | 2 +
liblibreofficekitgtk.links | 1 +
libreoffice-base-core.lintian-overrides | 1 -
libreoffice-base.lintian-overrides | 1 -
libreoffice-common.maintscript | 1 +
libreoffice-common.postinst.in | 15 -
libreoffice-common.postrm.in | 8 -
libreoffice-common.preinst.in | 77 ----
libreoffice-common.templates.in | 19 -
libreoffice-core.bug-script.in | 8 +-
libreoffice-core.lintian-overrides | 1 -
libreoffice-core.preinst.in | 15 -
libreoffice-dev-doc.links | 2 +-
libreoffice-draw.lintian-overrides | 1 -
libreoffice-evolution.lintian-overrides | 1 -
libreoffice-gnome.lintian-overrides | 1 -
libreoffice-gtk.lintian-overrides | 1 -
libreoffice-gtk.maintscript | 1 -
libreoffice-gtk2.lintian-overrides | 1 +
libreoffice-gtk3.maintscript | 1 +
libreoffice-impress.lintian-overrides | 1 -
libreoffice-kde.lintian-overrides | 1 -
libreoffice-math.lintian-overrides | 1 -
libreoffice-mysql-connector.bug-script.in | 2 +-
libreoffice-officebean.lintian-overrides | 2 -
libreoffice-ogltrans.lintian-overrides | 1 -
libreoffice-report-builder-bin.lintian-overrides | 1 -
libreoffice-report-builder.bug-script.in | 2 -
libreoffice-sdbc-firebird.bug-script.in | 6 +-
libreoffice-writer.lintian-overrides | 1 -
lo-cpp-ref.in | 2 +-
lo-java-ref.in | 2 +-
patches/debian-hardened-buildflags-CPPFLAGS.diff | 9 +-
patches/disable-db-tests.diff | 92 +++-
patches/disable-flaky-tests.diff | 68 +++
patches/disable-npapi-plugin-support.diff | 38 --
patches/gcj-safe-jni-h-include.diff | 4 +-
patches/javadoc-optional.diff | 6 +-
patches/make-package-modules-not-suck.diff | 27 +-
patches/no-packagekit-per-default.diff | 266 ++++++++++++
patches/series | 1 -
patches/smoketest-disable-extension-tests.diff | 17 +-
patches/split-evoab.diff | 4 +-
rules | 510 ++++++++++++++---------
scripts/get_libebook_dep.sh | 23 +-
scripts/gid2pkgdirs.sh | 7 +-
shlibs.override.liblangtag | 1 +
shlibs.override.orcus | 4 +-
tests/control | 5 +-
tests/control.in | 8 +
tests/junit-subsequentcheck | 5 +-
tests/sdk-examples | 28 ++
uno-libs3.symbols | 1 +
ure.bug-script.in | 5 +
ure.lintian-overrides | 2 -
watch | 3 +-
69 files changed, 1302 insertions(+), 502 deletions(-)
diff --cc changelog
index e527ba5,9737e6b..00e86d4
--- a/changelog
+++ b/changelog
@@@ -1,99 -1,313 +1,410 @@@
+ libreoffice (1:5.2.0~beta1-1) experimental; urgency=medium
+
+ * New upstream beta release
+ - fixes SVG t(ext s)pan import (closes: #665094)
+ - fixes Impress slowing down with -gtk(3) and accessibility
+ (closes: #824035)
+
+ * debian/rules, debian/control.gtk3.in, debian/*.links: move
+ liblibreofficekitgtk.so into an own package, as we have
+ libreofficekit-{dev,data} anyway. Make liblibreofficekitgtk depend on
+ libreofficekit-data
+ * debian/rules, debian/control.in, debian/libreoffice-gtk.*: rename -gtk
+ to -gtk2
+ * debian/control.sdk.in, debian/rules: move arch-indep SDK stuff into new
+ -dev-common. Move g++-mingw-w64-i686 to BUILD_DEPS_INDEP and only try to
+ (re)build unowinreg.dll in build-indep. Remove arch-qualifiers.
+ * debian/uno-libs3.symbols: update
+ * debian/tests/control.in, debian/tests/sdk-examples: remove unowinreg.dll
+ special-casing, we now have unowinreg.dll in a Arch: all. Depend on that.
+
+ * debian/rules:
+ - add initial build profile support: nodoc and nocheck
+ - move GTK3_MINVER setting down in rules so the conditional gets honoured;
+ gtk3 3.20 is available anywhere in stretch/sid so revert bump to >= 3.20
+ - migrate from --ddeb-migration to --dbgsym-migration
+
+ * debian/libreoffice-calc.lintian-overrides: (temporerily) readd
+ libreoffice-calc: binary-or-shlib-defines-rpath override
+
+ -- Rene Engelhard <rene at debian.org> Thu, 26 May 2016 20:38:51 +0200
+
+libreoffice (1:5.1.3-0ubuntu4) yakkety; urgency=medium
+
+ * use internal copy of mdds and orcus on yakkety for 5.1 series now
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Tue, 24 May 2016 14:25:58 +0200
+
+libreoffice (1:5.1.3-0ubuntu3) yakkety; urgency=medium
+
+ * Fix libpng build dependency.
+
+ -- Matthias Klose <doko at ubuntu.com> Sat, 21 May 2016 13:49:18 +0200
+
+libreoffice (1:5.1.3-0ubuntu1) xenial; urgency=medium
+
+ * new upstream bugfix release
+ * fix crash with nullptr SdrObjList (LP: #1569500)
+ * fix crash with ScCsvGrid living beyond VCL shutdown (LP: #1566050)
+ * fix crash with non-empty BlendFrameCache in late VCL shutdown (LP: #1560328)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Thu, 12 May 2016 11:35:38 +0200
+
+libreoffice (1:5.1.2-0ubuntu1) xenial; urgency=medium
+
+ * new upstream bugfix release
+ * remove xmloff patch again for better upstream fix
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Tue, 05 Apr 2016 14:29:17 +0200
+
+libreoffice (1:5.1.1-0ubuntu3) xenial; urgency=medium
+
+ * Fix build failure in xmloff.
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 31 Mar 2016 18:33:49 +0200
+
+libreoffice (1:5.1.1-0ubuntu2) xenial; urgency=medium
+
+ * libreoffice-subsequentcheckbase: Depend on default-jdk.
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 31 Mar 2016 17:17:30 +0200
+
+libreoffice (1:5.1.1-0ubuntu1) xenial; urgency=medium
+
+ * upstream released an rc3 = final
+ * allow libreoffice-style-elementary as alternative for -breeze in libreoffice-gtk (LP: #1483914)
+ * fix File>Templates>Manage executes wrong action in unity (LP: #1559135)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Fri, 18 Mar 2016 15:19:35 +0100
+
+libreoffice (1:5.1.1~rc2-0ubuntu1) xenial; urgency=medium
+
+ * new upstream rc
+ * update patches, remove upstreamed ones
+ * reenable unity-default-breeze, which wasnt reenabled on 5.1 yet (LP: #1506544)
+ * update Ubuntu palette, add main colors to standard palette (LP: #753627)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Mon, 29 Feb 2016 13:54:54 +0100
+
+libreoffice (1:5.1.0-0ubuntu1) xenial; urgency=medium
+
+ * finalize version, rc3 = 5.1.0
+ * depend on libreoffice-sdbc-hsqldb from libreoffice-subsequentcheckbase for
+ autopkgtests
+ * add libreoffice-style-elementary from upstream (LP: #1483914)
+ * continue building libreoffice-gtk3, but dont default-deploy (yet)
+ * use system ucpp instead of bundling (LP: #1524638)
+ * add google drive bits (LP: #1389936)
+ * update indic fonts package names (LP: #958345)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Sun, 21 Feb 2016 15:23:45 +0100
+
+libreoffice (1:5.1.0~rc3-0ubuntu2) xenial; urgency=medium
+
+ * update autopkgtest runner patch, removing unhelpful build system deps for
+ out-of-tree integration testing
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Wed, 10 Feb 2016 18:30:45 +0100
+
+libreoffice (1:5.1.0~rc3-0ubuntu1) xenial; urgency=medium
+
+ * bump to rc3
+ * backport fix for ppc64el ftbfs
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Thu, 04 Feb 2016 14:49:53 +0100
+
+libreoffice (1:5.1.0~rc2-0ubuntu2) xenial; urgency=medium
+
+ * use system mwaw, libwp*, lpsolve
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Wed, 03 Feb 2016 14:30:11 +0100
+
+libreoffice (1:5.1.0~rc2-0ubuntu1) xenial; urgency=medium
+
+ * bump to rc2 and enable l10n
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Wed, 20 Jan 2016 00:27:33 +0100
+
+ libreoffice (1:5.1.3-1) unstable; urgency=medium
+
+ * LibreOffice 5.1.3 final (identical to rc2)
+
+ * debian/patches/kde4-cflags-no-usr-include.diff: don't set $kde_incdir
+ to /usr/include since -isystem /usr/include makes the stuff FTBFS
+ with gcc 6 (closes: #823145)
+ * debian/patches/mdds-1.2.0.diff: backport patch to build with mdds 1.2
+ from master
+
+ * debian/*.lintian-overrides: remove obsolete
+ binary-or-shlib-defines-rpath and no-debconf-config overrides
+
+ * debian/rules:
+ - bump libmdds-dev and liborcus-dev build-deps and update orcus handling
+ - fix another warning for !gcj builds: only try to set GCJ_JAWT_DIR if
+ GCJ_JAWT_DEPENDS is set
+
+ -- Rene Engelhard <rene at debian.org> Sat, 14 May 2016 00:18:49 +0200
+
+ libreoffice (1:5.1.3~rc2-3) unstable; urgency=medium
+
+ * debian/rules:
+ - sigh. revert control changes for now, needs more work, apparently..
+
+ -- Rene Engelhard <rene at debian.org> Sun, 08 May 2016 08:31:54 +0200
+
+ libreoffice (1:5.1.3~rc2-2) unstable; urgency=medium
+
+ [ Mattia Rizzolo ]
+ * debian/control.in: use nowdays canonical URIs in Vcs-*
+
+ [ Rene Engelhard ]
+ * debian/rules:
+ - remove explicit $(MAKE) -f debian/rules control
+
+ -- Rene Engelhard <rene at debian.org> Sun, 08 May 2016 00:16:51 +0200
+
+ libreoffice (1:5.1.3~rc2-1) unstable; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/rules:
+ - print error in control without gcj-jdk installed
+ - don't try to run set GCJ_JAWT_DEPENDS if GCJ_VERSION is unset
+ - disable the tests on kfreebsd-* (see #801865),
+ - move hardcoded (!)kfreebsd-i386 (!)kfreebsd-amd64 to (!)kfreebsd-any.
+ Use linux-any instead of just disabling it for kfreebsd for
+ libbbluetooth-dev B-D; reflects the sense better
+
+ -- Rene Engelhard <rene at debian.org> Thu, 05 May 2016 22:46:40 +0200
+
+ libreoffice (1:5.1.3~rc1-1) unstable; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patcches/GCC-6-PR69273-workaround.diff: remove; AFAICS gcc is
+ fixed
+
+ * debian/rules:
+ - (temporarily) bump libgtk-3-dev build-dep to >= 3.20~ to ensure
+ we build against 3.20
+
+ -- Rene Engelhard <rene at debian.org> Tue, 19 Apr 2016 20:02:18 +0200
+
+ libreoffice (1:5.1.2-4) unstable; urgency=medium
+
+ * debian/patches/fix-list-and-comboboxes-with-gtk3-3-20-2.diff:
+ backport from libreoffice-5-1 branch, as name says
+
+ -- Rene Engelhard <rene at debian.org> Sat, 16 Apr 2016 17:55:25 +0200
+
+ libreoffice (1:5.1.2-3) unstable; urgency=medium
+
+ * debian/patches/don-t-install-qstart.desktop-if-it-s-disabled.diff:
+ as name says (closes: #820657)
+ * debian/libreoffice-gtk3.maintscript: bump version to also fix
+ stretch updates
+
+ -- Rene Engelhard <rene at debian.org> Mon, 11 Apr 2016 18:54:00 +0200
+
+ libreoffice (1:5.1.2-2) unstable; urgency=medium
+
+ * debian/rules:
+ - add boost-filesystem build-dependency...
+
+ -- Rene Engelhard <rene at debian.org> Fri, 08 Apr 2016 07:18:09 +0200
+
+ libreoffice (1:5.1.2-1) unstable; urgency=medium
+
+ * New upstream release
+
+ * debian/patches/OPENCL_DLL_NAME.diff: backport from master, use .so.1,
+ not .so
+ * debian/patches/no-packagekit-per-default: disable losessioninstaller
+ per default and make it conditional on --enable-packagekit.
+ * debian/patches/setsdkenv-tripplet.diff: fix setsdkenv_unix.sh to work
+ with *-linux-gnu* (as on e.g. armhf)
+ * debian/patches/sdkname-lo.diff: fix OO_SDK_NAME;
+ s/openoffice.org/libreoffice/
+ * debian/patches/liborcus-0.11.diff: add from master; use liborcus 0.11
+
+ * debian/control*in: add loads of ${misc:Pre-Depends} to packages having
+ .maintscripts calling dir_to_symlink to get proper dpkg Pre-Dependency.
+ Needed e.g. to fix wheezy+wheezy-backports -> jessie+jessie-backports
+ upgrades.
+ * debian/control[,.subsequentcheckbase}.in: remove hardcoded Java depends,
+ use ${java:Depends}
+ * debian/control.in: make -sdbc-hsqldb also depend on ${java-runtime-depends}
+ * debian/libreoffice-{core,sdbc-firebird}.bug-script.in: fix; LO still uses
+ /4 in the profile
+ * debian/ure.bug-script.in: add, run javaldx
+ * debian/libreoffice-report-builder.bug-script.in: remove, no extension
+ anymore since long
+ * debian/libreoffice-mysql-connector.bug-script.in: fix PLATFORMID
+ substitution to actually work
+ * debian/rules:
+ - add conditional to choose mdds version and build with
+ mdds 1.0/liborcus 0.11
+ - move liblosessioninstallerlo.so into -gnome when enabled; better suited
+ there
+ - speed up check target: run $(MAKE) check in parallel and only if failing
+ the second run without parallelism
+ - remove artificial disabling of glTF for armel and mips(el). Probably
+ still don't make sense but enable it for consistency (and because we
+ enable other stuff there which don't make sense that much either)
+ - disable the systray quickstarter (closes: #819878)
+ * debian/tests/*: add "sdk-examples" test test-building some SDK examples
+ to test the SDK itself
+ * debian/control.in: remove recommend on xfonts-mathml (closes: #749979)
+ * debian/control.sdk.in: fix Descriptions
+ * debian/shlibs.override.orcus: 10 -> 11
+ * debian/libreoffice-gtk3.maintscript.in: (re-)add dir_to_symlink also for
+ libreoffice-gtk3 (closes: #820320)
+
+ -- Rene Engelhard <rene at debian.org> Thu, 07 Apr 2016 17:51:26 +0200
+
+ libreoffice (1:5.1.2~rc1-1) unstable; urgency=medium
+
+ * New upstream release candidate
+ - -sdbc-postgresql: use proper schema name for type names
+ (closes: #808125)
+ - uses rtl::math::isNan() instead of isnan() (closes: #818829)
+
+ * debian/rules:
+ - decouple BUILD_TEST_PACKAGE and BUILD_DDEBS/BUILD_DBG_PACKAGE,
+ as the tests con't depend on -dbg/-dbgsym anymore (and it fixes
+ -dbg building for jessie-backports). Fix some order: add a if and
+ remove --no-ddeb on jessie (not existing) to make -dbg package building
+ actually work again
+ - use internal libwps for jessie-backports
+ - don't hardcode python3-six in -dbgsyms Recommends
+ * debian/bug-presubj: point to TDF-bugzilla and LOs BT/strace instructions;
+ minor wording fixes
+ * debian/lo-{cpp,java}-ref.in, debian/rules, debian/libreoffice-dev-doc.links:
+ fixups for new doc path since last upload...
+ * debian/watch: add pgpversionmangle
+ * debian/libreoffice-gtk3.links: add /usr/lib/liblibreofficekitgtk.so
+ symlink (closes: #818433)
+
+ -- Rene Engelhard <rene at debian.org> Thu, 17 Mar 2016 08:04:03 +0100
+
+ libreoffice (1:5.1.1-1) unstable; urgency=medium
+
+ * LibreOffice 5.1.1 final (identical to rc3)
+
+ * debian/patches/disable-flaky-tests.diff: (temporarily?) disable
+ testFlipAndRotateCustomShape per upstreams advice (closes: #815292)
+
+ * debian/rules:
+ - unset DISPLAY before running make check; some test(s) might fail
+ otherwise
+ * debian/rules, debian/test/*:
+ - stop adding -dbgsym to the test Depends:,
+ ci.debian.net doesn't have the debug archive in sources.list -> fail
+ - clean up: don't add %BUILD_DEPS_ARCH_ALL% to -subsequentcheckbases
+ Depends: as it doesn't really need it; the tests do, add in in
+ tests/control. Only depend on junit, ure, java-common in
+ -subsequentcheckbase. Add libreoffice{,-sdbc-hsqldb} dependencies in
+ tests/control.in
+ - run with verbose=t as the "normal" build
+
+ * merge from Ubuntu:
+ - update autopkgtest runner patch, removing unhelpful build system deps for
+ out-of-tree integration testing
+ - depend on libreoffice-sdbc-hsqldb for autopkgtests
+ - (re)add build version for "About LibreOffice"
+
+ -- Rene Engelhard <rene at debian.org> Mon, 07 Mar 2016 20:31:50 +0100
+
+ libreoffice (1:5.1.1~rc3-1) unstable; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/rules:
+ - somewhen m68k vanished from OOO_ARCHS; readd ;)
+ - actually we can use Chromiums Google API keys, so set
+ --with-gdrive-client-{id,secret} properly (closes: #780253).
+ Don't copy them but use chromiums ones directly, which makes this
+ i386/amd64 only, but...
+ - move install location of the SDK docs to
+ /usr/share/doc/libreoffice-dev/sdk/docs as the old locations are
+ "burned". Also sdk/docs matches the upstream structure anyway.
+ (closes: #804317)
+ * debian/scripts/get_libebook_dep.sh: fix to work with new multiarchified
+ libebook
+ * debian/control.sdk.in: remove broken and obsolete -dtd-officedocument1.0
+ Suggests
+
+ -- Rene Engelhard <rene at debian.org> Tue, 01 Mar 2016 00:53:11 +0100
+
+ libreoffice (1:5.1.1~rc1-1) unstable; urgency=medium
+
+ * New upstream release candidate
+ - fixes scrolling direction with trackpad in gtk3 (closes: #809363)
+ - fixes distorted images in PDF export (closes: #813586)
+
+ * upload to unstable
+
+ * debian/patches/bash-completion-dir.diff: add from master;
+ install bash completion to "new" /usr/share/bash-completion/completions
+ * debian/patches/kfreebsd-openjdk8-JAVAINC.diff: add
+ -I$JAVA_HOME/include/linux to JAVAINC for kFreeBSD to find jni_md.h
+
+ * debian/rules:
+ - remove sparc64 again, we're actually not ported
+ * debian/libreoffice-common.maintscript:
+ rm_conffile /etc/bash_completion.d/libreoffice.sh
+ * debian/scripts/gid2pkgdirs.sh: adapt for bash_completion move and install
+ without .sh
+ * debian/libreoffice-common.{pre,post}{rm,inst}.in: remove long obsolete
+ (3.4, OOo->LO) maintainer script snippets
+
+ -- Rene Engelhard <rene at debian.org> Wed, 10 Feb 2016 23:34:05 +0100
+
+ libreoffice (1:5.1.0~rc3-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patches/gcc-6.diff: backport gcc 6 compile/test fixes from master
+ (closes: #811686)
+ * debian/patches/GCC-6-PR69273-workaround.diff: add gcc 6 ICE workaround
+ from Stephan Bergmann
+
+ * debian/rules:
+ - -officebean is a arch-dep package, move pom generation and mh_*
+ calls for it to install-arch...
+ - adapt for changed debhelper internals to make out -dbgsym hacks work
+ again and build-depend on debhelper >= 9.20160115
+ - update/clean up up JAVA_RUNTIME_DEPENDS: move gcj-jre after all the
+ openjdks and add openjdk-8-jre
+
+ -- Rene Engelhard <rene at debian.org> Mon, 08 Feb 2016 07:44:09 +0100
+
+ libreoffice (1:5.1.0~rc2-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patches/disable-db-tests.diff,
+ debian/patches/smoketest-disable-extension-tests.diff: make apply again...
+
+ * debian/rules:
+ - fix/update some ddeb conditionals and migrate -dbg to -dbgsym
+ - "supplement" the -dbgsym packages also with the gdb helpers and
+ the appropriate recommends (gdb, python3-six)
+ * debian/tests/control{,in}, debian/rules: generate autopkgtest control
+ with proper depends (-dbg or *-dbgsym) in rules' control target
+ * debian/tests/control: depend on ure-dbg and uno-libs3-dbg, too
+ * debian/tests/junit-subsequentcheck.diff: run
+ ./debian/rules config_host.mk enable_report_builder=no to disable the SRB
+ of which we don't have the (build-)deps in -subsequentcheckbases deps.
+ * debian/control.debug.in: recommend gdb
+ * debian/control.debug.in, debian/rules: move python(3)-six to recommends
+ and recommend python3-six on sid as "gdb" uses python3.
+ * debian/rules:
+ - build-depend on libpng-dev instead of libpng12-dev (closes: #662411)
+
+ -- Rene Engelhard <rene at debian.org> Wed, 13 Jan 2016 17:38:32 +0100
++>>>>>>> libreoffice_5.2.0_beta1-1
+
libreoffice (1:5.1.0~rc1-1) experimental; urgency=medium
* New upstream release candidate
diff --cc control.in
index b4b46b2,e6f0999..8ecb8cb
--- a/control.in
+++ b/control.in
@@@ -362,8 -352,10 +367,9 @@@ Description: office productivity suite
Package: libreoffice-calc
Architecture: %OOO_ARCHS%
+ Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
libreoffice-core (= ${binary:Version}),
- ${lpsolve-dep},
${misc:Depends},
${shlibs:Depends}
Suggests: ${opencl-sug}
@@@ -474,8 -471,9 +487,10 @@@ Description: office productivity suite
Package: libreoffice-style-tango
Architecture: all
+Depends: libreoffice-style-galaxy, ${misc:Depends}
Enhances: libreoffice-core
+ Pre-Depends: ${misc:Pre-Depends}
+ Depends: libreoffice-style-default, ${misc:Depends}
Suggests: tango-icon-theme
Provides: libreoffice-style
Replaces: libreoffice-common (<= 1:4.3.0~beta2-2)
@@@ -515,8 -515,8 +532,9 @@@ Description: office productivity suite
Package: libreoffice-style-galaxy
Architecture: all
+ Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends}
+Enhances: libreoffice-core
Provides: libreoffice-style, libreoffice-style-default
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Galaxy (Default) symbol style
@@@ -527,41 -527,20 +545,43 @@@
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-gtk
+ Package: libreoffice-gtk2
Architecture: %OOO_ARCHS%
+ Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Recommends: libreoffice-style-tango
+Recommends: libreoffice-style-breeze | libreoffice-style-tango | libreoffice-style-elementary
Section: gnome
Enhances: libreoffice
-Provides: libreoffice-gtk
-Replaces: libreoffice-gtk (<< 1:5.2.0~)
++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]
+Conflicts: libgtk2.0-0 (= 2.12.10-1) [amd64], lo-menubar
- Provides: lo-menubar
- Replaces: libreoffice-core (<< 1:5.0.2), lo-menubar
- Description: office productivity suite -- GTK+ integration
+ 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.
.
@@@ -572,8 -550,8 +591,9 @@@
Package: libreoffice-gnome
Architecture: %OOO_ARCHS%
+ Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core (= ${binary:Version}),
+ libreoffice-gtk,
${misc:Depends},
${shlibs:Depends}
Recommends: ${gnome-gtk-recommends},
diff --cc control.subsequentcheckbase.in
index 9851792,f16954d..c094685
--- a/control.subsequentcheckbase.in
+++ b/control.subsequentcheckbase.in
@@@ -2,7 -2,8 +2,9 @@@ Package: libreoffice-subsequentcheckbas
Section: libs
Priority: extra
Architecture: all
+ Pre-Depends: ${misc:Pre-Depends}
-Depends: ${java:Depends}, ${misc:Depends}
+Depends: libreoffice, libreoffice-sdbc-hsqldb, default-jdk, build-essential, %BUILD_DEPS_ARCH_ALL%, ${misc:Depends}
++=======
Description: LibreOffice java test libraries
LibreOffice subsequentchecks integration test suite
diff --cc debian-l10n/control.lang.in
index cace93f,c8c6f03..03ed95d
--- a/debian-l10n/control.lang.in
+++ b/debian-l10n/control.lang.in
@@@ -1,15 -1,16 +1,17 @@@
-Package: libreoffice-l10n- at LCODE@
+Package: libreoffice-l10n-${isocode_lower}
Section: localization
Architecture: all
++<<<<<<< HEAD:debian-l10n/control.lang.in
+ 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
+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}
+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/gcj-safe-jni-h-include.diff
index f8160d2,a875fb7..d7e2e29
--- a/patches/gcj-safe-jni-h-include.diff
+++ b/patches/gcj-safe-jni-h-include.diff
@@@ -1,19 -1,10 +1,19 @@@
+From: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Date: Sat, 9 Nov 2013 02:00:25 +0100
+Subject: [PATCH] gcj-safe-jni-h-include.diff
+
+Change-Id: Iccce595463659ce0979694b8e27865b8dd68fec1
+
+---
+ configure.ac | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
diff --git a/configure.ac b/configure.ac
-index 053fc51..84b323c 100644
--- a/configure.ac
+++ b/configure.ac
- @@ -7161,12 +7161,18 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
- k*bsd*-gnu*)
+ @@ -7212,12 +7240,18 @@ if test -n "$ENABLE_JAVA" -a -z "$JAVAINC"; then
JAVAINC="-I$JAVA_HOME/include"
+ JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
+ if test "$JDK" = "gcj"; then
+ JAVAINC="$JAVAINC -I`$JAVA_HOME/bin/gcj --print-file-name include/jni.h | $SED -e s,\/jni.h,,g`"
diff --cc patches/series
index 9ab20bf,d75739c..fe0fabf
--- a/patches/series
+++ b/patches/series
@@@ -26,8 -27,5 +26,7 @@@ odk-no-dot.dif
hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
- disable-npapi-plugin-support.diff
-debian-branding.diff
-no-packagekit-per-default.diff
+lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
+integraltrans.diff
+unity-default-breeze.diff
+lp1569500.diff
diff --cc rules
index 2bcab7a,10d0db8..17ffa1d
--- a/rules
+++ b/rules
@@@ -68,13 -68,11 +68,13 @@@ USE_SOURCE_TARBALLS=
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
+# bootstraping this from the source tree is breaking get-orig-source
+#lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentfoundation | cut -d, -f2 | sed -e 's,\[,,' -e 's,\],,')
+lo_sources_ver=5.1.3.2
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
- GIT_TAG=libreoffice-$(lo_sources_ver)
- GIT_BRANCH=libreoffice-5-1
+ GIT_TAG=libreoffice-$(lo_sources_ver)-hotfix1
+ GIT_BRANCH=libreoffice-5-2
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@@ -256,8 -242,9 +244,9 @@@ ifeq "$(USE_DBUS)" "y
ENABLE_BLUETOOTH=y
SYSTEM_STUFF += bluez
endif
+ ENABLE_PACKAGEKIT=n
endif
-ENABLE_AVAHI=y
+ENABLE_AVAHI=n
USE_GSTREAMER=y
USE_VLC=y
ENABLE_WEBDAV=y
@@@ -396,8 -392,8 +394,7 @@@ endi
ENABLE_EVO2=y
ENABLE_GCONF=y
ENABLE_GIO=y
-ENABLE_DCONF=y
ENABLE_RANDR=y
- #SYSTEM_STUFF += npapi-headers
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
@@@ -529,10 -532,8 +532,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 \
- --disable-dependency-tracking \
--enable-hardlink-deliver \
--with-branding=$(CURDIR)/debian/branding
CONFIGURE_FLAGS_INDEP=
@@@ -713,66 -703,36 +709,94 @@@ ifeq "$(shell dpkg-parsechangelog | gre
BUGS=mailto:debian-openoffice at lists.debian.org
endif
+ifeq "$(DEB_VENDOR)" "Ubuntu"
+ # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+ # Note: these are for Ubuntu use ONLY. For your own distribution,
+ # please get your own set of keys.
+ # Permission to add API keys, from Paweł Hajdan, To chad.miller at canonical.com
+ # msgid: CAADNaOFSFoch68NM1SGpCTRXqmspyKQgUPUtsF7SGRsRXiHZcg at mail.gmail.com
+ # reused from chromium-browser 48.0.2564.82-0ubuntu1.1222
+ GOOGLEAPI_APIKEY_UBUNTU := AIzaSyAQfxPJiounkhOjODEO5ZieffeBv6yft2Q
+ GOOGLEAPI_CLIENTID_UBUNTU := 424119844901.apps.googleusercontent.com
+ GOOGLEAPI_CLIENTSECRET_UBUNTU := AIienwDlGIIsHoKnNHmWGXyJ
+ CONFIGURE_FLAGS += --with-gdrive-client-id=$(GOOGLEAPI_CLIENTID_UBUNTU) --with-gdrive-client-secret=$(GOOGLEAPI_CLIENTSECRET_UBUNTU)
+ IMAGES+=human
+ CONFIGURE_FLAGS_INDEP+= --with-theme="$(IMAGES)"
+ ENABLE_FIREBIRD=n
+ # lp#1034560: MIR troubles make it easier to use internal jfreereport
+ SYSTEM_STUFF := $(filter-out jfreereport npapi-headers, $(SYSTEM_STUFF))
+ ifeq ($(shell echo "$(DEB_VERSION)" | grep -c ppa),1)
+ BUGS=mailto:libreoffice at lists.launchpad.net
+ endif
+ # do not run checks on armel armhf powerpc for now as they fail with "debug output level 11 is too high"
+ # dont run unittests and slowtests at all for now, curiously they break on the buildds (and only there)
+ ifneq (,$(filter armhf armel powerpc,$(DEB_HOST_ARCH)))
+ RUN_MAKE_CHECK:=n
+ endif
+ RUN_PYTESTS:=n
+ PARALLEL_BUILD=y
+ ENABLE_MERGELIBS=y
+ ON_BUILDD := $(shell if [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] || echo $(CURDIR) | grep -q \/build\/buildd; then echo y; else echo n; fi)
+ ifeq ($(ON_BUILDD),y)
+ buildd_discspace_hack:=find workdir/ -type f -name '*.o' -exec mv {} {}_org \; -exec touch -r {}_org {} \; -exec rm {}_org \;
+ endif
+ USE_VLC:=n
+ #temp. hacks
+ ENABLE_EVO2:=n
+ #SYSTEM_STUFF := $(filter-out orcus, $(SYSTEM_STUFF))
+
+ ENABLE_COLLADA := n
+ ENABLE_GLTF := n
+ ENABLE_COINMP := n
+
+ ifneq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
+ ENABLE_HELP=n
+ endif
+ # set SYSTEM_GCJ_VERSION to something nonempty
+ ifeq (,$(strip $(SYSTEM_GCJ_VERSION)))
+ $(warning SYSTEM_GCJ_VERSION empty, falling back to SYSTEM_GCC_VERSION)
+ SYSTEM_GCJ_VERSION = $(SYSTEM_GCC_VERSION)
+ ifeq (5.,$(shell echo "$(SYSTEM_GCJ_VERSION)"|cut -b1-2))
+ SYSTEM_GCJ_VERSION = 5
+ endif
+ endif
+ ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "yakkety"
+ SYSTEM_STUFF := $(filter-out mdds orcus,$(SYSTEM_STUFF))
+ endif
+endif
+ ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
+ UNO_LIBS_DBG=uno-libs3-dbgsym
+ URE_DBG=ure-dbgsym
+ CORE_DBG=libreoffice-core-dbgsym
+ WRITER_DBG=libreoffice-writer-dbgsym
+ URE_DBG_ROOT=.debhelper/ure/dbgsym-root
+ CORE_DBG_ROOT=.debhelper/libreoffice-core/dbgsym-root
+ WRITER_DBG_ROOT=.debhelper/libreoffice-writer/dbgsym-root
+ DH_STRIP_DBG_OPTION_LO=--dbgsym-migration=libreoffice-dbg
+ DH_STRIP_DBG_OPTION_URE=--dbgsym-migration=ure-dbg
+ DH_STRIP_DBG_OPTION_UNO_LIBS=--dbgsym-migration=uno-libs3-dbg
+ else
+ UNO_LIBS_DBG=uno-libs3-dbg
+ URE_DBG=ure-dbg
+ CORE_DBG=libreoffice-dbg
+ WRITER_DBG=$(CORE_DBG)
+ URE_DBG_ROOT=$(URE_DBG)
+ CORE_DBG_ROOT=$(CORE_DBG)
+ WRITER_DBG_ROOT=$(WRITER_DBG)
+ DH_STRIP_DBG_OPTION_LO=--dbg-package=$(CORE_DBG)
+ DH_STRIP_DBG_OPTION_URE=--dbg-package=$(URE_DBG)
+ DH_STRIP_DBG_OPTION_UNO_LIBS=---dbg-package=$(UNO_LIBS_DBG)
+ ifneq "$(JESSIE_BACKPORT)" "y"
+ DH_STRIP_DBG_OPTION_LO += --no-automatic-dbgsym
+ 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)-
@@@ -960,12 -925,12 +989,12 @@@ ifneq (,$(filter cppunit, $(SYSTEM_STUF
BUILD_DEPS += , libcppunit-dev (>= $(CPPUNIT_MINVER))
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
- BUILD_DEPS += , gdb
- BUILD_DEPS += , fontconfig
- BUILD_DEPS += , fonts-liberation
- #BUILD_DEPS += , fonts-crosextra-carlito
+ BUILD_DEPS += , gdb [!kfreebsd-any] <!nocheck>
+ BUILD_DEPS += , fontconfig <!nocheck>
+ BUILD_DEPS += , fonts-liberation <!nocheck>
- BUILD_DEPS += , fonts-crosextra-carlito <!nocheck>
++ #BUILD_DEPS += , fonts-crosextra-carlito <!nocheck>
ifeq "$(ENABLE_JUNIT4)" "y"
- BUILD_DEPS += , junit4 $(JUNIT_MIN_VER)
+ BUILD_DEPS += , junit4 $(JUNIT_MIN_VER) [!kfreebsd-any]
else
CONFIGURE_FLAGS += --without-junit
endif
@@@ -1072,10 -1038,12 +1101,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/)
- JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre
+ 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
@@@ -1751,14 -1823,7 +1793,15 @@@ endi
perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NO_REPORTDESIGN_ARCHS%,$(OOO_NO_REPORTDESIGN_ARCHS),g" debian/control
perl -pi -e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" debian/control
+ifeq "$(BUILD_TEST_PACKAGE)" "y"
+ # we want the build deps as dep on subsequentcheckbase, but strip the arch
+ # specifics as we are arch-all
+ # for now we filter out the arch-specific libc* and ia64, which is ugly,
+ # but better than manual bookkeeping. Also filter out the mips(el)-only
+ # binutils build-dep...
+ perl -pi -e "s#%BUILD_DEPS_ARCH_ALL%#$(strip $(shell echo '$(BUILD_DEPS), $(BUILD_DEPS_INDEP)'|sed -e 's/,/,\n /g'|grep -v libc0.1| grep -v libc6| grep -v ia64|grep -v binutils|grep -v gcj-jdk|grep -v gcj-native-helper|grep -v libgcj-common|grep -v openjdk-6-jdk|grep -v g++-|grep -v gcc-|sed -e 's/\[[^]]*\]//g'))#g" debian/control
+endif
+ perl -pi -e "s#%JUNIT_MIN_VER%#$(JUNIT_MIN_VER)#g" debian/control
ifeq "$(BUILD_KDE)" "y"
perl -pi -e 's/%LO-DESKTOP-INTEGRATION%/libreoffice-gnome | libreoffice-kde/' debian/control
else
@@@ -1801,7 -1866,9 +1844,9 @@@ ifeq "$(BUILD_KDE)" "y
endif
ifeq "$(USE_DBUS)" "y"
+ ifeq "$(ENABLE_BLUETOOTH)" "y"
- perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control/' debian/control
+ perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for Impress (slideshow remote control)/' debian/control
+ endif
perl -pi -e 's/Description: office productivity suite -- presentation/Suggests: bluez\nDescription: office productivity suite -- presentation/' debian/control
endif
@@@ -2118,21 -2263,76 +2169,77 @@@ ifeq "$(BUILD_GTK)" "y
endif
ifeq "$(PACKAGE_SDK)" "y"
+ # move arch-indep stuff into a libreoffice-dev-common
+ mkdir -p $(PKGDIR)-dev-common/usr/include
+ mv $(PKGDIR)-dev/usr/include/libreoffice \
+ $(PKGDIR)-dev-common/usr/include
+ # except include/sal/typesizes.h
+ mkdir -p $(PKGDIR)-dev/usr/include/libreoffice/sal
+ mv $(PKGDIR)-dev-common/usr/include/libreoffice/sal/typesizes.h \
+ $(PKGDIR)-dev/usr/include/libreoffice/sal
+ mkdir -p $(PKGDIR)-dev-common/usr/share/idl
+ mv $(PKGDIR)-dev/usr/share/idl/libreoffice \
+ $(PKGDIR)-dev-common/usr/share/idl
+ mkdir -p $(PKGDIR)-dev-common/$(OOSDKDIR)
+ mv $(PKGDIR)-dev/$(OOSDKDIR)/classes \
+ $(PKGDIR)-dev-common/$(OOSDKDIR)
+ mv $(PKGDIR)-dev/$(OOSDKDIR)/set* \
+ $(PKGDIR)-dev-common/$(OOSDKDIR)
+ mv $(PKGDIR)-dev/$(OOSDKDIR)/config* \
+ $(PKGDIR)-dev-common/$(OOSDKDIR)
+ mv $(PKGDIR)-dev/$(OOSDKDIR)/index.html* \
+ $(PKGDIR)-dev-common/$(OOSDKDIR)
+ mkdir -p $(PKGDIR)-dev-common/usr/share/libreoffice/sdk
+ mv $(PKGDIR)-dev/usr/share/libreoffice/sdk/classes \
+ $(PKGDIR)-dev-common/usr/share/libreoffice/sdk
+ ifeq "$(PACKAGE_SDK)" "y"
+ mkdir -p $(PKGDIR)-dev-common/$(OODIR)/share/glade
+ mv $(PKGDIR)-common/$(OODIR)/share/glade/libreoffice-catalog.xml \
+ $(PKGDIR)-dev-common/$(OODIR)/share/glade
+ else
+ rm -rf $(PKGDIR)-common/$(OODIR)/share/glade
+ endif
+
+ ifeq "$(PACKAGE_SDK_DOCS)" "y"
# move SDK documentation into own package
rm -rf $(PKGDIR)-dev-doc
- mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev-doc
- mv $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk/* \
- $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev-doc
- rmdir $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk
+ mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev
+ mv $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk \
+ $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev
mkdir -p $(PKGDIR)-dev-doc/$(OOSDKDIR)
- ln -sf /usr/share/doc/libreoffice-dev-doc/docs \
- $(PKGDIR)-dev/$(OOSDKDIR)/docs
+ ln -sf /usr/share/doc/libreoffice-dev/sdk/docs \
+ $(PKGDIR)-dev-doc/$(OOSDKDIR)/docs
mv $(PKGDIR)-dev/$(OOSDKDIR)/examples \
$(PKGDIR)-dev-doc/$(OOSDKDIR)
+ find $(PKGDIR)-dev-doc/usr/share/doc/ -size 0 -type f -delete
# and fix the symlink now dangling due to the move above
- cd $(PKGDIR)-dev/$(OOSDKDIR) && \
- ln -sf /usr/share/doc/libreoffice-dev-doc/index.html
+ cd $(PKGDIR)-dev-common/$(OOSDKDIR) && \
+ ln -sf /usr/share/doc/libreoffice-dev/sdk/index.html
+ endif
+
+ ifeq "$(PACKAGE_SDK)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
+ # compat/safety symlink for SDK Java stuff moved to /usr/share
+ rm -f $(PKGDIR)-dev-common/$(OOSDKDIR)/classes
+ mkdir -p $(PKGDIR)-dev-common/$(OOSDKDIR)/classes/com/sun/star/lib/loader
+ cd $(PKGDIR)-dev-common/$(OOSDKDIR)/classes/com/sun/star/lib/loader && \
+ for i in $(CURDIR)/$(PKGDIR)-dev-common/$(shell echo $(OOSDKDIR) | sed -e s/lib/share/)/classes/com/sun/star/lib/loader/*.class; do \
+ ln -s `echo $$i | sed -e 's,$(CURDIR)/$(PKGDIR)-dev-common,,'` `basename $$i`; \
+ done
+ ifeq "$(PACKAGE_UNOWINREG_DLL)" "y"
+ mkdir -p $(PKGDIR)-dev-common/$(OOSDKDIR)/classes/win
+ chmod 644 $(PKGDIR)-dev-common/$(shell echo $(OOSDKDIR) | sed -e s/lib/share/)/classes/win/unowinreg.dll
+ ln -s /$(shell echo $(OOSDKDIR) | sed -e s/lib/share/)/classes/win/unowinreg.dll \
+ $(PKGDIR)-dev-common/$(OOSDKDIR)/classes/win/unowinreg.dll
+ else
+ rm -rf $(PKGDIR)-dev-common/$(shell echo $(OOSDKDIR) | sed -e s/lib/share/)/classes/win
+ endif
+ endif
+ chmod 644 $(PKGDIR)-dev-common/$(OOSDKDIR)/configure.pl
+ chmod 755 $(PKGDIR)-dev-common/$(OOSDKDIR)/setsdkenv_unix
+
+ # fix permissions
+ find $(PKGDIR)-dev-common/usr/share/idl/$(OODIRNAME) -type f -exec chmod 644 {} \;
endif
ifeq "$(ENABLE_EVO2)" "y"
@@@ -2356,19 -2622,23 +2455,25 @@@ endi
ifeq "$(BUILD_GTK3)" "y"
rm -rf $(PKGDIR)-gtk3
mkdir -p -m755 $(PKGDIR)-gtk3/$(OODIR)/program
+ mkdir -p -m755 debian/liblibreofficekitgtk/$(OODIR)/program
mv $(PKGDIR)-gnome/$(OODIR)/program/libvclplug_gtk3lo.so $(PKGDIR)-gtk3/$(OODIR)/program/
- mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so $(PKGDIR)-gtk3/$(OODIR)/program/
+ mv $(PKGDIR)-core/$(OODIR)/program/liblibreofficekitgtk.so debian/liblibreofficekitgtk/$(OODIR)/program/
endif
- mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk/$(OODIR)/program/
- mv $(PKGDIR)-gtk/$(OODIR)/program/gnome-open-url $(PKGDIR)-gnome/$(OODIR)/program
+ mv $(PKGDIR)-gnome/$(OODIR)/program/* $(PKGDIR)-gtk2/$(OODIR)/program/
ifeq "$(BUILD_GTK)" "y"
- mkdir -p -m755 $(PKGDIR)-gtk/$(OODIR)/share
- mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk/$(OODIR)/share
+ mkdir -p -m755 $(PKGDIR)-gtk2/$(OODIR)/share
+ ifeq "$(ENABLE_SYSTRAY)" "y"
+ mv $(PKGDIR)-gnome/$(OODIR)/share/xdg $(PKGDIR)-gtk2/$(OODIR)/share
+ endif
ifeq "$(ENABLE_GIO)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
+ mv $(PKGDIR)-gtk2/$(OODIR)/program/libucpgio1lo.so \
+ $(PKGDIR)-gnome/$(OODIR)/program/
+ endif
+ ifeq "$(ENABLE_PACKAGEKIT)" "y"
+ mv $(PKGDIR)-gtk/$(OODIR)/program/liblosessioninstalllo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
+ mv $(PKGDIR)-gtk/$(OODIR)/program/liblosessioninstalllo.so \
+ $(PKGDIR)-gnome/$(OODIR)/program/
endif
endif
--
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