[libreoffice] 11/152: Merge tag 'libreoffice_5.1.0_alpha1-4' into ubuntu-xenial-5.1
Rene Engelhard
rene at moszumanska.debian.org
Thu Jul 27 19:16:50 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 33dc094bd3f7fd7a2dfd45157a5cd717d16784aa
Merge: 7610698 f526f05
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date: Fri Nov 13 01:13:45 2015 +0100
Merge tag 'libreoffice_5.1.0_alpha1-4' into ubuntu-xenial-5.1
tag libreoffice 1:5.1.0~alpha1-4
changelog | 203 +++++++++++++-
control.fonts.in | 1 +
control.gtk3.in | 26 ++
control.in | 36 ++-
control.kab.in | 15 -
control.kde.in | 3 +-
control.lokit.in | 2 +-
control.mediawiki.in | 1 -
control.sdk.in | 3 +-
control.ure.in | 4 +-
liblibreofficeFIXME.shlibs | 1 -
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-base.menu | 4 -
libreoffice-calc.maintscript | 1 +
libreoffice-calc.menu | 5 -
libreoffice-core.bug-script.in | 4 +
libreoffice-dbg.maintscript | 1 +
libreoffice-dev-doc.links | 2 +-
libreoffice-dev.maintscript | 1 +
libreoffice-draw.maintscript | 1 +
libreoffice-draw.menu | 5 -
libreoffice-evolution.maintscript | 1 +
libreoffice-gnome.maintscript | 1 +
libreoffice-gtk.maintscript | 1 +
libreoffice-help-ca.maintscript | 1 +
libreoffice-help-cs.maintscript | 1 +
libreoffice-help-da.maintscript | 1 +
libreoffice-help-de.maintscript | 1 +
libreoffice-help-dz.maintscript | 1 +
libreoffice-help-el.maintscript | 1 +
libreoffice-help-en-gb.maintscript | 1 +
libreoffice-help-en-us.maintscript | 1 +
libreoffice-help-es.maintscript | 1 +
libreoffice-help-et.maintscript | 1 +
libreoffice-help-eu.maintscript | 1 +
libreoffice-help-fi.maintscript | 1 +
libreoffice-help-fr.maintscript | 1 +
libreoffice-help-gl.maintscript | 1 +
libreoffice-help-hi.maintscript | 1 +
libreoffice-help-hu.maintscript | 1 +
libreoffice-help-it.maintscript | 1 +
libreoffice-help-ja.maintscript | 1 +
libreoffice-help-km.maintscript | 1 +
libreoffice-help-ko.maintscript | 1 +
libreoffice-help-nl.maintscript | 1 +
libreoffice-help-om.maintscript | 1 +
libreoffice-help-pl.maintscript | 1 +
libreoffice-help-pt-br.maintscript | 1 +
libreoffice-help-pt.maintscript | 1 +
libreoffice-help-ru.maintscript | 1 +
libreoffice-help-sk.maintscript | 1 +
libreoffice-help-sl.maintscript | 1 +
libreoffice-help-sv.maintscript | 1 +
libreoffice-help-tr.maintscript | 1 +
libreoffice-help-vi.maintscript | 1 +
libreoffice-help-zh-cn.maintscript | 1 +
libreoffice-help-zh-tw.maintscript | 1 +
libreoffice-impress.maintscript | 1 +
libreoffice-impress.menu | 5 -
libreoffice-java-common.maintscript | 1 +
libreoffice-kab.lintian-overrides | 1 -
libreoffice-kde.maintscript | 1 +
libreoffice-l10n-af.maintscript | 1 +
libreoffice-l10n-ar.maintscript | 1 +
libreoffice-l10n-as.maintscript | 1 +
libreoffice-l10n-ast.maintscript | 1 +
libreoffice-l10n-be.maintscript | 1 +
libreoffice-l10n-bg.maintscript | 1 +
libreoffice-l10n-bn.maintscript | 1 +
libreoffice-l10n-br.maintscript | 1 +
libreoffice-l10n-bs.maintscript | 1 +
libreoffice-l10n-ca.maintscript | 1 +
libreoffice-l10n-cs.maintscript | 1 +
libreoffice-l10n-cy.maintscript | 1 +
libreoffice-l10n-da.maintscript | 1 +
libreoffice-l10n-de.maintscript | 1 +
libreoffice-l10n-dz.maintscript | 1 +
libreoffice-l10n-el.maintscript | 1 +
libreoffice-l10n-en-gb.maintscript | 1 +
libreoffice-l10n-en-za.maintscript | 1 +
libreoffice-l10n-eo.maintscript | 1 +
libreoffice-l10n-es.maintscript | 1 +
libreoffice-l10n-et.maintscript | 1 +
libreoffice-l10n-eu.maintscript | 1 +
libreoffice-l10n-fa.maintscript | 1 +
libreoffice-l10n-fi.maintscript | 1 +
libreoffice-l10n-fr.maintscript | 1 +
libreoffice-l10n-ga.maintscript | 1 +
libreoffice-l10n-gd.maintscript | 1 +
libreoffice-l10n-gl.maintscript | 1 +
libreoffice-l10n-gu.maintscript | 1 +
libreoffice-l10n-he.maintscript | 1 +
libreoffice-l10n-hi.maintscript | 1 +
libreoffice-l10n-hr.maintscript | 1 +
libreoffice-l10n-hu.maintscript | 1 +
libreoffice-l10n-id.maintscript | 1 +
libreoffice-l10n-in.maintscript | 1 +
libreoffice-l10n-is.maintscript | 1 +
libreoffice-l10n-it.maintscript | 1 +
libreoffice-l10n-ja.maintscript | 1 +
libreoffice-l10n-ka.maintscript | 1 +
libreoffice-l10n-kk.maintscript | 1 +
libreoffice-l10n-km.maintscript | 1 +
libreoffice-l10n-kmr.maintscript | 1 +
libreoffice-l10n-ko.maintscript | 1 +
libreoffice-l10n-lt.maintscript | 1 +
libreoffice-l10n-lv.maintscript | 1 +
libreoffice-l10n-mk.maintscript | 1 +
libreoffice-l10n-ml.maintscript | 1 +
libreoffice-l10n-mn.maintscript | 1 +
libreoffice-l10n-mr.maintscript | 1 +
libreoffice-l10n-nb.maintscript | 1 +
libreoffice-l10n-ne.maintscript | 1 +
libreoffice-l10n-nl.maintscript | 1 +
libreoffice-l10n-nn.maintscript | 1 +
libreoffice-l10n-nr.maintscript | 1 +
libreoffice-l10n-nso.maintscript | 1 +
libreoffice-l10n-oc.maintscript | 1 +
libreoffice-l10n-om.maintscript | 1 +
libreoffice-l10n-or.maintscript | 1 +
libreoffice-l10n-pa-in.maintscript | 1 +
libreoffice-l10n-pl.maintscript | 1 +
libreoffice-l10n-pt-br.maintscript | 1 +
libreoffice-l10n-pt.maintscript | 1 +
libreoffice-l10n-ro.maintscript | 1 +
libreoffice-l10n-ru.maintscript | 1 +
libreoffice-l10n-rw.maintscript | 1 +
libreoffice-l10n-si.maintscript | 1 +
libreoffice-l10n-sk.maintscript | 1 +
libreoffice-l10n-sl.maintscript | 1 +
libreoffice-l10n-sr.maintscript | 1 +
libreoffice-l10n-ss.maintscript | 1 +
libreoffice-l10n-st.maintscript | 1 +
libreoffice-l10n-sv.maintscript | 1 +
libreoffice-l10n-ta.maintscript | 1 +
libreoffice-l10n-te.maintscript | 1 +
libreoffice-l10n-tg.maintscript | 1 +
libreoffice-l10n-th.maintscript | 1 +
libreoffice-l10n-tn.maintscript | 1 +
libreoffice-l10n-tr.maintscript | 1 +
libreoffice-l10n-ts.maintscript | 1 +
libreoffice-l10n-ug.maintscript | 1 +
libreoffice-l10n-uk.maintscript | 1 +
libreoffice-l10n-uz.maintscript | 1 +
libreoffice-l10n-ve.maintscript | 1 +
libreoffice-l10n-vi.maintscript | 1 +
libreoffice-l10n-xh.maintscript | 1 +
libreoffice-l10n-za.maintscript | 1 +
libreoffice-l10n-zh-cn.maintscript | 1 +
libreoffice-l10n-zh-tw.maintscript | 1 +
libreoffice-l10n-zu.maintscript | 1 +
libreoffice-math.maintscript | 1 +
libreoffice-math.menu | 5 -
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.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-writer.menu | 5 -
libreoffice.maintscript | 1 +
patches/disable-flaky-tests.diff | 135 +++++----
patches/disable-mediaembedding-test.diff | 37 ---
patches/disable-tiledrendering-test.diff | 17 --
patches/fix-internal-hsqldb-build.diff | 4 +-
patches/fix-xmlparse-with-icu55.diff | 33 +++
patches/gcj-no-bitness-check.diff | 8 +-
patches/hppa-is-32bit.diff | 10 +-
patches/icu-56.diff | 131 +++++++++
patches/install-fixes.diff | 28 +-
patches/javadoc-optional.diff | 2 +-
patches/liborcus-0.9.1.diff | 291 -------------------
patches/lo-xlate-lang-update-kurdish.diff | 25 --
patches/lo-xlate-lang-update.diff | 22 ++
patches/make-package-modules-not-suck.diff | 44 +--
patches/mysqlcppconn-libmysqlclient-SONAME.diff | 4 +-
patches/sensible-browser.diff | 18 --
patches/series | 11 +-
patches/split-evoab.diff | 28 +-
rules | 327 ++++++++++++----------
shlibs.override.orcus | 1 +
tests/control | 3 +
tests/junit-subsequentcheck | 20 +-
tests/pyuno-import | 3 +
uno-libs3.symbols | 1 +
vars.mips64 | 1 +
vars.mips64el | 1 +
204 files changed, 930 insertions(+), 764 deletions(-)
diff --cc changelog
index b6e29fe,80c36b7..318cb05
--- a/changelog
+++ b/changelog
@@@ -1,82 -1,189 +1,264 @@@
+ libreoffice (1:5.1.0~alpha1-4) experimental; urgency=medium
+
+ * debian/rules:
+ - work around the experimental buildds' resolver bug installing
+ experimental packages per default where they shouldn't and add
+ firebird-dev (>= 3.0) Build-Conflicts:
+
+ -- Rene Engelhard <rene at debian.org> Sun, 08 Nov 2015 10:04:31 +0100
+
+ libreoffice (1:5.1.0~alpha1-3) experimental; urgency=medium
+
+ * debian/control{.sdk}.in, debian/rules, debian/libreoffice-dev-doc.links:
+ - stop moving the SDK docs into libreoffice-devs /usr/share/doc (and move
+ the stuff installed into /usr/share/doc/libreoffice/sdk in libreoffice-dev
+ to /usr/share/doc/libreoffice-dev, too) and conflict against
+ libreoffice-dev / libreoffice-dev-doc (<= 1:5.0.3~rc1-2) where needed
+ (closes: #803272, #803306)
+ * debian/control.ure.in:
+ - also break libreoffice-common in ure in addition to Replaces:
+ (closes: #801552, #803565) and make it << 1:4.5.0 which was meant...
+
+ -- Rene Engelhard <rene at debian.org> Sat, 31 Oct 2015 14:15:25 +0100
+
+ libreoffice (1:5.1.0~alpha1-2) experimental; urgency=medium
+
+ * debian/patches/fix-xmlparse-with-icu55.diff: backport fix from
+ master fixing l10ntools' XML parsing with ICU 55
+ * debian/patches/icu-56.diff: prepare for ICU 56; fix FTBFS with new
+ charmaps; backported from master
+
+ * debian/rules:
+ - recommend -gtk3 again in gnome as (even in Alpha1)
+ Save As.. works (at least for me...) - closes: #681180
+ - remove l10ntools build hack again, now obsolete
+
+ -- Rene Engelhard <rene at debian.org> Sat, 24 Oct 2015 18:52:43 +0200
+
+ libreoffice (1:5.1.0~alpha1-1) experimental; urgency=medium
+
+ * New upstream alpha release
+ - uses HttpURLConnection etc. of the JDK instead of commons httpclient
+ in the Wiki Publisher (closes: #800992)
+
+ * debian/patches/series, debian/patches/disable-tiledrendering-test.diff:
+ remove again, we need the functionality for liblibreofficekitgtk.so
+
+ * debian/rules, debian/vars.mips64*:
+ - add mips64{el,} architecture stuff which is now added upstream
+ * debian/uno-libs3.symbols: update
+ * debian/control.lokit.in:
+ - suggest libgtk-3-dev instead of libgtk2.0-dev
+ - suggest gir-1.2-lokdocview-0.1
+ * debian/control*in, debian/rules:
+ - remove upstream gone kdeab and gnome-vfs, gconf options
+ * debian/control*.in, debian/rules:
+ - package the LOKDocView introspection stuff into gir1.2-lokdocview-0.1
+ - move liblibreofficekitgtk.so into -gtk3 as it's for Gtk3 now
+ * debian/rules:
+ - gtk3 is on per default now (closes: #799399). Keep -gnome depending on
+ -gtk as gtk3 crashes e.g. on "Save as..."
+ - disable the tests for now
+ - also disable the wiki publisher on gcj builds; uses Java 6+ stuff; make
+ -wiki-publisher depend on >= Java 6
+ * debian/rules: prepare for .ddebs: disable manual -dbg build if building
+ ddebs; use dh_strip --ddeb-migration to create .ddebs
+ * debian/libreoffice-core.bug-script.in: dpkg -l -gtk -gtk3 and -kde to list
+ installed VCLplugs
+
+ * merge from Ubuntu:
+ - add am and gug locales
+
+ -- Rene Engelhard <rene at debian.org> Mon, 19 Oct 2015 22:57:36 +0200
+
+libreoffice (1:5.0.2-0ubuntu4) xenial; urgency=medium
+
+ * disable collada, gltf and coinmp on xenial
+ * switch to breeze theme by default (lp: #1506544)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Tue, 27 Oct 2015 01:05:39 +0100
+
+libreoffice (1:5.0.2-0ubuntu3) wily; urgency=medium
+
+ * fall back to SYSTEM_GCC_VERSION, when SYSTEM_GCJ_VERSION is empty
+ * substitute xfonts-mathml with fonts-stix (lp: #1487148)
+ * cherry-pick from Debian:
+ - readd conflicts against openoffice-unbundled to libreoffice-common.
+ openoffice*-debian-menus contains /usr/bin/soffice
+ * fix gug language description (thanks Rene)
+ * add build version for "About LibreOffice"
+ * create profile defaulting to human style on unity (lp: #1508177)
+ * reenable Ubuntu palette
+ * handle integral translations
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Fri, 23 Oct 2015 00:23:47 +0200
+
+libreoffice (1:5.0.2-0ubuntu2) xenial; urgency=medium
+
+ * No-change rebuild for python3 defaults change.
+
+ -- Matthias Klose <doko at ubuntu.com> Fri, 23 Oct 2015 15:04:41 +0000
+
+libreoffice (1:5.0.2-0ubuntu1) wily; urgency=medium
+
+ * new upstream release
+ * removed upstreamed patches
+ * cherry-picks from Debian:
+ - update shlibs.override
+ - bump gtk+ requirements
+ - move liblibreofficekitgtk.so to -gtk
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Thu, 01 Oct 2015 00:49:31 +0200
+
+libreoffice (1:5.0.1-0ubuntu2) wily; urgency=medium
+
+ * Build for arm64 and ppc64el.
+ * Build using system libraries for libcppunit, libetonyek, liborcus,
+ libpagemaker, libwps and libcmis. The internal copies are not updated
+ for at least ppc64el.
+
+ -- Matthias Klose <doko at ubuntu.com> Fri, 11 Sep 2015 17:22:56 +0200
+
+libreoffice (1:5.0.1-0ubuntu1) wily; urgency=medium
+
+ * new final upstream release
+ * changes vs. vivid:
+ - use cpp-5 (thanks Rico)
+ - use internal libwps, opencollada, collada2gltf, libcmis, cppunit
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Mon, 31 Aug 2015 20:32:35 +0200
+
+libreoffice (1:5.0.0-0ubuntu1~wily1) wily; urgency=medium
+
+ * LibreOffice 5.0.0 final release (identical to rc5)
+ * merge from Debian:
+ - debian/patches/disable-tiledrendering-test.diff: temporarily disable test
+ - rulees: bump build-depends on libgltf, *collada*, cppunit, liborcus, libcmis to
+ build-depend on their gcc 5 rebuilds. Bump boost build-dep to >= 1.58
+ (closes: #794717)
+ - rules:fix SYSTEM_GCC_CHECK for gcc 5; remove obsolete >= 4.7 check for Qt to get
+ correct build-dep
+ - temporarily disable -evolution until libebook1.2-dev is installable again
+ - debian/control.in: suggest breeze-icon-theme in -style-breeze (like the
+ other ones do for oxygen/tango)
+ * reduce diff to Debian: use Enhances in styles consistently
+ * depend from leaf themes like -style-sifr on -style-galaxy for now
+
+ -- Bjoern Michaelsen <bjoern.michaelsen at canonical.com> Fri, 07 Aug 2015 13:36:02 +0200
+
- libreoffice (1:5.0.1~rc1-3) UNRELEASED; urgency=medium
+ libreoffice (1:5.0.3~rc1-2) unstable; urgency=medium
+
+ * debian/*.maintscript: add loads of dir_to_symlink calls to packages
+ moving dir->symlink due to dh_installdocs --link-doc (closes: #801753)
+ * debian/control.in:
+ - make -gnome only recommend -gtk. it doesn't need -gtks libs
+
+ -- Rene Engelhard <rene at debian.org> Mon, 19 Oct 2015 00:01:06 +0200
+
+ libreoffice (1:5.0.3~rc1-1) unstable; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/rules:
+ - use dh_installdocs --link-doc=libreoffice-{core,common}
+ - update dh_shlibdeps calls for URE in /usr/lib/libreoffice/program and
+ remove obsolete OOUREDIR
+ - build-depend on default-jdk (>= 2:1.7-52.1) for OpenJDK 7 on kfreebsd-*
+ again
+ * debian/rules, debian/control.in:
+ - readd conflicts against openoffice-unbundled to libreoffice-common.
+ openoffice*-debian-menus contains /usr/bin/soffice
+ * debian/control.in:
+ - update -style-* dependencies based on the recommendation in
+ https://lists.debian.org/debian-openoffice/2015/09/msg00343.html ff.
+ + add various dependencies on fallback to the various -style-*
+ + suggest -breeze instead of -crystal in common, crystal is disabled
+ + depend on -style-default in libreoffice-core
+ * debian/rules, debian/patches/fix-internal-hsqldb-build.diff: use servlet3.1
+ and actually build-depend on it (again) if using internal hsqldb
+ * debian/control.subsequentcheckbase.in:
+ - remove hardcoded dependency openjdk-7-jdk; we get default-jdk in anyway
+
+ -- Rene Engelhard <rene at debian.org> Sun, 11 Oct 2015 12:36:37 +0200
- * debian/patches/gtk3-rtl.diff: backport GTk3 RTL fixes (arrows, checkboxes)
- from libreoffice-5-0
+ libreoffice (1:5.0.2-1) unstable; urgency=medium
+
+ * New upstream release
+ - fixes crash on gestureLongPress (closes: #798591)
+
+ * debian/*.menu: remove, as per TC resolution
+ * debian/control.in:
+ - remove imagemagick from B-D-I:
+ - mention liblibreofficekitgtk.so in -gtks description
+ - various lintian fixes
+ + add ${misc:Depends}, remove duplicated Priority:
+ + make fonts-opensymbol Multi-Arch: foreign
+ + don't add unneeded XS-Python3-Version:
+ * debian/rules:
+ - stop calling dh_installmenus and stop using convert to convert the icons
+ to xpm
+ - move liblibreofficekitgtk.so into -gtk
+ - lintian fixes:
+ + don't add XS-Testsuite; it defaults to autopkgtest anyway
+ if idebian/tests/control exists
+ + move dh_fixperms after gdb helper install to fix permissions of the
+ gdb stuff
+ - re-enable coinmp; build-dependencies now installable again; bump
+ build-dependencies to the gcc 5 versions
+ * debian/control.{,gtk3.in}, debian/rules: move disabled -gtk3 into extra
+ file so tha it doesn't appear in control when disabled, makes dak think
+ it's NEW.
+
+ -- Rene Engelhard <rene at debian.org> Wed, 23 Sep 2015 13:03:10 +0200
+
+ libreoffice (1:5.0.1-2) unstable; urgency=medium
+
+ * debian/patches/series, debian/patches/disable-mediaembedding-test.diff:
+ remove, GTK3 is now disabled
+
+ * debian/rules:
+ - disable gtk3 for now again, too shaky
+ (closes: #799251, #799049, #795131)
+ * debian/control.in, debian/rules:
+ - make -gnome depend on -gtk when gtk3 is disabled
+ (reopens: #681180)
+ * debian/control.in:
+ - add Chris Halls <halls at debian.org> back to Uploaders:
+
+ -- Rene Engelhard <rene at debian.org> Thu, 17 Sep 2015 13:52:16 +0200
+
+ libreoffice (1:5.0.1-1) unstable; urgency=medium
+
+ * LibreOffice 5.0.1 final (identical to rc2)
+
+ * debian/patches/mysqlcppconn-libmysqlclient-SONAME.diff: update; fix internal
+ mysqlcppconn build
+ * debian/patches/kde4-rtl.diff: KDE4: fix RTL scrollbar handling, from
+ libreoffice-5-0
+ * debian/patches/795131.diff: backport fix for crashes with clipboard managers
+ in gtk3 backend from master (closes: #795131)
+
+ * debian/rules:
+ - two more s/src/tarballs/ I forgot
+ - add explicit --without-system-libxml for a eventual internal-libxml2 case
+ - add hack to build the just build-time-used l10ntools (and especially
+ helpex)
+ with internal icu,boost,expat so that we get working localized help...
+ - use internal libgltf also for jessie-backports as otherwiese avmedia
+ doesn't build with the needed internal glm
+
+ * merge from Ubuntu:
+ - move --with-help and $(CONFIGURE_FLAGS_LANG) into $(CONFIGURE_FLAGS_INDEP)
+ and use it in build-indep
+
+ -- Rene Engelhard <rene at debian.org> Sat, 29 Aug 2015 16:05:55 +0200
+
+ libreoffice (1:5.0.1~rc2-1) unstable; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/patches/gtk3-rtl.diff: backport GTK3 RTL fixes (arrows, checkboxes,
+ spin buttons) from libreoffice-5-0 and master
* debian/rules:
- bump libmysqlcppconn-dev and libclucene-dev build-deps to their
diff --cc control.in
index 8dafe09,bd69e4c..b918071
--- a/control.in
+++ b/control.in
@@@ -1,11 -1,10 +1,11 @@@
Source: libreoffice
Section: editors
Priority: optional
-Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian LibreOffice Maintainers <debian-openoffice at lists.debian.org>
- Uploaders: Rene Engelhard <rene at debian.org>
+ Uploaders: Rene Engelhard <rene at debian.org>, Chris Halls <halls at debian.org>
Build-Depends: %BUILD_DEPS%,
- Build-Depends-Indep: fdupes, imagemagick, %BUILD_DEPS_INDEP%
+ Build-Depends-Indep: fdupes, %BUILD_DEPS_INDEP%
Build-Conflicts: ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%],
ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%],
ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%],
@@@ -28,9 -26,8 +27,8 @@@
amd-libopencl1,
nvidia-libopencl1
Standards-Version: 3.9.4
- XS-Python3-Version: @PYTHON_VERSION_CONTROL@
- Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.1
--Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
++Vcs-Git: https://git.launchpad.net/~libreoffice/ubuntu/+source/libreoffice -b ubuntu-xenial-5.1
++Vcs-Browser: https://code.launchpad.net/~libreoffice/ubuntu/+source/libreoffice/+git/libreoffice-debian-pkg
Bugs: @BUGS@
Homepage: http://www.libreoffice.org
@@@ -72,7 -67,9 +70,8 @@@ Suggests: cups-bsd
unixodbc,
${gstreamer-plugins-suggests},
${java-runtime-depends},
- ${ooo-officebean-dep},
- %LO-DESKTOP-INTEGRATION%
+ ${ooo-officebean-dep}
+ Conflicts: libreoffice-dev (<= 1:5.0.3~rc1-2), libreoffice-dev-doc (<= 1:5.0.3~rc1-2)
Description: office productivity suite (metapackage)
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -270,14 -267,12 +269,14 @@@ Package: libreoffice-commo
Architecture: all
Pre-Depends: dpkg (>= 1.15.7.2~)
Depends: libreoffice-style-default | libreoffice-style, ure, ${misc:Depends}
- Suggests: libreoffice-style-crystal,
+ Suggests: libreoffice-style-breeze,
libreoffice-style-hicontrast,
+ libreoffice-style-human,
libreoffice-style-oxygen,
+ libreoffice-style-breeze,
libreoffice-style-sifr,
libreoffice-style-tango
-Recommends: xfonts-mathml, ${pyuno-depends}, ${textcat-data-recommends}
+Recommends: fonts-stix, ${pyuno-depends}, ${textcat-data-recommends}
Conflicts: openoffice-unbundled,
broffice,
libreoffice-filter-mobiledev,
@@@ -483,8 -472,8 +482,8 @@@ Description: office productivity suite
Package: libreoffice-style-hicontrast
Architecture: all
- Depends: ${misc:Depends}
Enhances: libreoffice-core
-Depends: libreoffice-style-default, ${misc:Depends}
++Depends: libreoffice-style-galaxy, ${misc:Depends}
Suggests: gtk2-engines
Provides: libreoffice-style
Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
@@@ -571,11 -529,10 +570,11 @@@ Description: office productivity suite
Package: libreoffice-gnome
Architecture: %OOO_ARCHS%
- Depends: gconf2,
- libreoffice-core (= ${binary:Version}),
+ Depends: libreoffice-core (= ${binary:Version}),
+ libreoffice-gtk,
${misc:Depends},
${shlibs:Depends}
+ Recommends: ${gnome-gtk-recommends},
Suggests: libreoffice-evolution
Section: gnome
Enhances: libreoffice
@@@ -586,8 -542,7 +585,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, the session installer
- integration and a GConf backend.
- This package contains the GIO support.
++ This package contains the GIO support, and the session installer integration.
.
You can extend the functionality of this by installing these packages:
.
diff --cc control.sdk.in
index 7b79d47,7fbcde1..22072ce
--- a/control.sdk.in
+++ b/control.sdk.in
@@@ -21,9 -21,10 +22,9 @@@ Package: libreoffice-dev-do
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Recommends: libreoffice-dev (= ${binary:Version}),
- www-browser
+Recommends: libreoffice-dev (= ${binary:Version}), www-browser
Suggests: libreoffice-dtd-officedocument1.0
- Conflicts: openoffice.org-dev-doc
+ Conflicts: openoffice.org-dev-doc, libreoffice-dev (<= 1:5.0.3~rc1-2)
Description: office productivity suite -- SDK documentation
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --cc patches/series
index e0bfa11,51c4b29..feb1717
--- a/patches/series
+++ b/patches/series
@@@ -8,7 -8,7 +8,6 @@@ fix-system-lpsolve-build.dif
install-fixes.diff
#mention-java-common-package.diff
#help-msg-add-package-info.diff
- #sensible-browser.diff
-sensible-lomua.diff
reportdesign-mention-package.diff
jdbc-driver-classpaths.diff
mysqlcppconn-libmysqlclient-SONAME.diff
@@@ -26,10 -27,5 +26,7 @@@ odk-no-dot.dif
hppa-is-32bit.diff
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
- liborcus-0.9.1.diff
- disable-tiledrendering-test.diff
+ fix-xmlparse-with-icu55.diff
+ icu-56.diff
+lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
- #mailmerge-base.diff
- unity-default-human.diff
+integraltrans.diff
- quicklistfix.diff
diff --cc rules
index e7a01fb,804c30c..a7eb51b
--- a/rules
+++ b/rules
@@@ -378,10 -397,13 +399,12 @@@ BUILD_GTK=
#ifeq "$(DEB_DISTRIBUTION)" "experimental"
BUILD_GTK3=y
#endif
+ ifeq "$(BUILD_GTK3)" "y"
+ ENABLE_INTROSPECTION=y
+ endif
ENABLE_EVO2=y
- ENABLE_GVFS=n
ENABLE_GCONF=y
ENABLE_GIO=y
-ENABLE_DCONF=y
ENABLE_RANDR=y
SYSTEM_STUFF += npapi-headers
PACKAGE_BASE=y
@@@ -510,10 -532,8 +534,9 @@@ BUILD_ARM64=
# Default flags to pass to configure
CONFIGURE_FLAGS= \
--with-vendor='$(OOO_VENDOR)' \
+ --with-build-version='$(shell dpkg-parsechangelog |grep ^Version:|cut -f2 -d\ )' \
--prefix=/usr --mandir=/usr/share/man \
--docdir=/usr/share/doc/libreoffice \
- --enable-lockdown \
--libdir=/usr/lib \
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--disable-online-update \
@@@ -524,9 -543,12 +547,14 @@@
--disable-dependency-tracking \
--enable-hardlink-deliver \
--with-branding=$(CURDIR)/debian/branding
+ CONFIGURE_FLAGS_INDEP=
+
+ ifeq "$(ENABLE_HELP)" "y"
+ CONFIGURE_FLAGS_INDEP+= --with-help
+ endif
+CONFIGURE_FLAGS_INDEP=
+
ifeq "$(shell echo $(DEB_VERSION_UPSTREAM) | grep -E '(alpha|beta)'; echo $$?)" "1"
CONFIGURE_FLAGS += --enable-release-build
RELEASE_BUILD := y
@@@ -854,10 -830,8 +886,9 @@@ endi
ifneq ($(ENABLE_COINMP),y)
CONFIGURE_FLAGS += --disable-coinmp
else
- ifneq (,$(filter coinmp, $(SYSTEM_STUFF)))
- BUILD_DEPS += , coinor-libcoinmp-dev, coinor-libcoinutils-dev
+ BUILD_DEPS += , coinor-libcoinmp-dev $(COINMP_MINVER), coinor-libcoinutils-dev $(COINUTILS_MINVER)
endif
+endif
ifneq (,$(filter openssl, $(SYSTEM_STUFF)))
BUILD_DEPS += , libssl-dev (>= 0.9.8)
@@@ -1518,18 -1490,14 +1549,8 @@@ els
CONFIGURE_FLAGS += --disable-gio
endif
- ifeq "$(ENABLE_GVFS)" "y"
- BUILD_DEPS += , libgnomevfs2-dev
- CONFIGURE_FLAGS += --enable-gnome-vfs
- endif
-
- ifeq "$(ENABLE_GCONF)" "y"
- BUILD_DEPS += , libgconf2-dev
- else
- CONFIGURE_FLAGS += --disable-gconf
- endif
BUILD_DEPS += , gettext
-ifeq "$(ENABLE_DCONF)" "y"
- BUILD_DEPS += , libdconf-dev
-else
- CONFIGURE_FLAGS += --disable-dconf
-endif
-
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
BUILD_DEPS_INDEP += , fontforge
endif
@@@ -1829,8 -1900,12 +1855,13 @@@ endi
.PHONY: config_host.mk
config_host.mk:
rm -f config.status autogen.lastrun
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) PYTHON=/usr/bin/python3 ./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
+ MARIADBCONFIG=$(MARIADBCONFIG) \
+ FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
+ OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
+ COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
+ ./autogen.sh $(CONFIGURE_FLAGS)
+ echo "export gb_TRANS_LANGS_INTEGRAL=$(filter-out en-US,$(BUILD_ISOS))" >> config_host.mk
build:
$(CURDIR)/debian/rules build-arch
@@@ -1885,8 -1960,8 +1917,9 @@@ $(STAMP_DIR)/build-indep
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
MARIADBCONFIG=$(MARIADBCONFIG) \
FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
+ # build indep w/ flags generic: $(CONFIGURE_FLAGS) indep: $(CONFIGURE_FLAGS_INDEP)
OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
+ COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_INDEP)
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-nocheck
@@@ -2082,7 -2228,9 +2111,10 @@@ ifeq "$(PACKAGE_SDK)" "y
$(PKGDIR)-dev/$(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
endif
ifeq "$(ENABLE_EVO2)" "y"
@@@ -2316,17 -2539,7 +2349,9 @@@ ifeq "$(BUILD_GTK)" "y
ifeq "$(ENABLE_GIO)" "y"
mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgio1lo.so \
$(PKGDIR)-gnome/$(OODIR)/program/
+ mv $(PKGDIR)-gtk/$(OODIR)/program/liblosessioninstalllo.so \
+ $(PKGDIR)-gnome/$(OODIR)/program/
endif
- ifeq "$(ENABLE_GVFS)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/libucpgvfs1lo.so \
- $(PKGDIR)-gnome/$(OODIR)/program/
- endif
- ifeq "$(ENABLE_GCONF)" "y"
- mv $(PKGDIR)-gtk/$(OODIR)/program/libgconfbe1lo.so \
- $(PKGDIR)-gnome/$(OODIR)/program
- endif
endif
ifeq "$(ENABLE_EVO2)" "y"
@@@ -3109,10 -3310,13 +3126,13 @@@ endi
touch $@
binary-indep: $(GSI_EXPORT_STAMP) $(STAMP_DIR)/binary-indep
-$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/install-indep debian/control $(STAMP_DIR)/maintscripts $(STAMP_DIR)/langpacks
+$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/install-indep debian/control $(STAMP_DIR)/maintscripts
ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
- echo "For uploads with binary-all packages, please use arches where Java is enabled!!!!!"
+ echo "For uploads with binary-all packages, please use arches where Java is enabled"
+ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_GCJ_JDK_ARCHS)))
+ echo "and where Java used is OpenJDK"
+ endif
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
endif
dh_testdir
--
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