[libreoffice] 01/03: Merge remote-tracking branch 'origin/debian-experimental-5.4'
Rene Engelhard
rene at moszumanska.debian.org
Sun Jul 16 11:05:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 1c792846886570e33ec5984eac6397aaff227df4
Merge: fec76f0 a1046e9
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Sun Jul 16 10:49:05 2017 +0000
Merge remote-tracking branch 'origin/debian-experimental-5.4'
changelog | 146 +-
control | 226 +-
control.help.in | 1 +
control.in | 32 +-
control.lokit.in | 7 +-
control.transitionals.in | 13 +
copyright | 400 +---
libreoffice-common.lintian-overrides | 2 +
libreoffice-core.lintian-overrides | 1 +
patches/build-against-shared-lpsolve.diff | 2 +-
patches/change-from-glew-to-epoxy.diff | 2333 --------------------
patches/cppunit-optional.diff | 200 ++
patches/disable-db-tests.diff | 54 +-
patches/disable-flaky-tests.diff | 27 +
...sequent_filters_test-with-internal-cppunit.diff | 34 +
patches/disable-unused-test-programs.diff | 53 +
patches/gb_SUPPRESS_TESTS.diff | 308 +++
patches/gtk3-opengl-slideshow.diff | 558 -----
patches/icu-59-uchar.diff | 146 --
patches/install-fixes.diff | 3 +-
patches/javadoc-optional.diff | 50 +-
patches/m68k-alignment.diff | 112 -
patches/m68k-use-mlong-jump-table-offsets.diff | 74 -
patches/make-package-modules-not-suck.diff | 38 +-
patches/mysqlcppconn-libmysqlclient-SONAME.diff | 6 +-
patches/no-openssl.diff | 32 +-
patches/no-packagekit-per-default.diff | 18 +-
patches/odk-settings-JAVA_PROC_TYPE.diff | 52 -
patches/sdk-cat-sed-bin.diff | 15 -
patches/series | 11 +-
patches/split-evoab.diff | 23 +-
rules | 293 ++-
scripts/gid2pkgdirs.sh | 6 +-
scripts/locale-gen | 32 +
source/include-binaries | 2 +-
tests/control | 8 +-
tests/junit-subsequentcheck | 16 +-
tests/odk-build-examples | 38 +
tests/patches/odk-build-examples-standalone.diff | 50 +
tests/patches/uicheck-standalone.diff | 69 +
tests/sdk-examples | 83 -
tests/uicheck | 60 +
42 files changed, 1462 insertions(+), 4172 deletions(-)
diff --cc control
index 3d2efa7,7fbd78b..beb1d39
--- a/control
+++ b/control
@@@ -183,10 -190,10 +190,10 @@@ Build-Conflicts: amd-libopencl1
nvidia-glx-legacy-dev,
nvidia-libopencl1,
qt3-dev-tools
- Standards-Version: 3.9.4
- Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
+ Standards-Version: 4.0.0
+ Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.4
Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
--Bugs:
++Bugs: mailto:debian-openoffice at lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@@ -367,9 -376,20 +373,10 @@@ Breaks: browser-plugin-libreoffice
libreoffice-gtk2 (<< ${binary:Version}),
libreoffice-gtk3 (<< ${binary:Version}),
libreoffice-impress (<< ${binary:Version}),
- libreoffice-kab (<< 1:3.4.1~),
libreoffice-kde (<< ${binary:Version}),
libreoffice-officebean (<< ${binary:Version}),
+ libreoffice-pdfimport (<< 1:5.4~),
- libreoffice-presentation-minimizer (<< 1:4.2~),
- libreoffice-sdbc-postgresql (<< 0.8.1~),
- libreoffice-style-andromeda (<< 1:3.3.0-1),
- libreoffice-style-crystal (<< 1:3.3.0-1),
- libreoffice-style-galaxy (<< 1:3.3.0-1),
- libreoffice-style-hicontrast (<< 1:3.3.0-1),
- libreoffice-style-oxygen (<< 1:3.3.0-1),
- libreoffice-style-tango (<< 1:3.3.0-1),
libreoffice-writer (<< ${binary:Version}),
- mozilla-libreoffice (<< 1:3.5.0~beta~),
mozilla-plugin-vlc (<< 1.0),
myspell-af (<< 1:3.1.0-3),
myspell-ca (<< 0.6-8),
@@@ -416,7 -436,11 +423,7 @@@
myspell-tl (<< 0.4-0-5)
Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
Provides: libreoffice-bundled
- Replaces: libreoffice-common (<< 1:4.4.0~rc3-1)
-Replaces: libreoffice-calc (<< 1:3.3.2-5),
- libreoffice-common (<< 1:4.4.0~rc3-1),
- libreoffice-pdfimport (<< 1:5.4~),
- uno-libs3 (<< 1:3.6.1-2),
- ure (<< 1:3.6.1-2)
++Replaces: libreoffice-pdfimport (<< 1:5.4~)
Description: office productivity suite -- arch-dependent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -444,6 -469,16 +451,8 @@@ Conflicts: broffice
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
+ libreoffice-help (<< 5.4),
+ libreoffice-help-5.2,
- libreoffice-mysql-connector (<< 1.0.1+LibO3.6.5-1),
- libreoffice-pdfimport (<< 1:5.4~),
- libreoffice-presentation-minimizer (<< 1.0.4),
- libreoffice-presenter-console (<< 1.1.1),
- libreoffice-report-builder (<< 1.2.3),
- libreoffice-script-provider-bsh (<< 1:3.6~),
- libreoffice-script-provider-js (<< 1:3.6~),
- libreoffice-script-provider-python (<< 1:3.6~),
libreoffice-style-andromeda (<< 1:${oover}~),
libreoffice-style-crystal (<< 1:${oover}~),
libreoffice-style-crystal (>= 1:${next-oover}~),
@@@ -458,7 -493,12 +467,8 @@@
libreoffice-writer2latex (<< 1.0.2-9),
libreoffice-writer2xhtml (<< 1.0.2-9),
libtextcat-data (<< 2.2-8),
- openoffice.org-common (<< 1:3.3.0~),
zotero-libreoffice-integration (<= 3.0.11.1-26-g08fb709-1)
-Replaces: libreoffice-emailmerge (<< 1:4.0.2~rc1),
- libreoffice-pdfimport (<< 1:5.4~),
- openoffice.org-common (<< 1:3.3.0~)
++Replaces: libreoffice-pdfimport (<< 1:5.4~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -909,23 -948,23 +906,23 @@@ Description: office productivity suite
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
--Package: libreoffice-l10n-am
++Package: libreoffice-l10n-
Section: localization
Architecture: all
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
--Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-am
++Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
--Suggests: hunspell-dictionary-am | myspell-dictionary-am,
-- hyphen-am,
-- libreoffice-grammarcheck-am,
-- libreoffice-help-am,
-- mythes-am
--Description: office productivity suite -- Amharic language package
++Suggests: hunspell-dictionary- | myspell-dictionary-,
++ hyphen-,
++ libreoffice-grammarcheck-,
++ libreoffice-help-,
++ mythes-
++Description: office productivity suite -- language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
-- Amharic.
++ .
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
@@@ -1757,23 -1796,23 +1754,23 @@@ Description: office productivity suite
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
--Package: libreoffice-l10n-gug
++Package: libreoffice-l10n-
Section: localization
Architecture: all
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
--Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-gug
++Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
--Suggests: hunspell-dictionary-gug | myspell-dictionary-gug,
-- hyphen-gug,
-- libreoffice-grammarcheck-gug,
-- libreoffice-help-gug,
-- mythes-gug
--Description: office productivity suite -- Guarani language package
++Suggests: hunspell-dictionary- | myspell-dictionary-,
++ hyphen-,
++ libreoffice-grammarcheck-,
++ libreoffice-help-,
++ mythes-
++Description: office productivity suite -- language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
-- Guarani.
++ .
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
@@@ -2138,23 -2177,23 +2135,23 @@@ Description: office productivity suite
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
--Package: libreoffice-l10n-kmr
++Package: libreoffice-l10n-
Section: localization
Architecture: all
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
--Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-kmr
++Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
--Suggests: hunspell-dictionary-kmr | myspell-dictionary-kmr,
-- hyphen-kmr,
-- libreoffice-grammarcheck-kmr,
-- libreoffice-help-kmr,
-- mythes-kmr
--Description: office productivity suite -- Kurmanji language package
++Suggests: hunspell-dictionary- | myspell-dictionary-,
++ hyphen-,
++ libreoffice-grammarcheck-,
++ libreoffice-help-,
++ mythes-
++Description: office productivity suite -- language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
-- Kurmanji.
++ .
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
diff --cc control.in
index db2a6a4,39d5554..b446a95
--- a/control.in
+++ b/control.in
@@@ -250,10 -262,15 +249,11 @@@ Breaks: hunspell-ar (<< 0.0.0+20080110-
myspell-sw (<< 1:3.1.0-3),
myspell-th (<< 1:3.1.0-3),
myspell-tl (<< 0.4-0-5),
- browser-plugin-libreoffice
+ browser-plugin-libreoffice,
+ libreoffice-pdfimport (<< 1:5.4~)
Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
Provides: libreoffice-bundled
- Replaces: libreoffice-common (<< 1:4.4.0~rc3-1)
-Replaces: libreoffice-calc (<< 1:3.3.2-5),
- libreoffice-common (<< 1:4.4.0~rc3-1),
- uno-libs3 (<< 1:3.6.1-2),
- ure (<< 1:3.6.1-2),
- libreoffice-pdfimport (<< 1:5.4~)
++Replaces: libreoffice-pdfimport (<< 1:5.4~)
Description: office productivity suite -- arch-dependent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -294,6 -314,17 +296,7 @@@ Breaks: libreoffice-core (<< 1:${oover}
libreoffice-writer2latex (<< 1.0.2-9),
libreoffice-writer2xhtml (<< 1.0.2-9),
zotero-libreoffice-integration (<= 3.0.11.1-26-g08fb709-1)
-Replaces: openoffice.org-common (<< 1:3.3.0~), libreoffice-emailmerge (<< 1:4.0.2~rc1), libreoffice-pdfimport (<< 1:5.4~)
++Replaces: libreoffice-pdfimport (<< 1:5.4~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
--
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