summaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog57
-rw-r--r--debian/control361
-rw-r--r--debian/control.in1
-rw-r--r--debian/control.lang.in4
-rwxr-xr-xdebian/libreoffice-core.bug-script.in2
-rw-r--r--debian/patches/python-3.12.diff120
-rw-r--r--debian/patches/series1
-rwxr-xr-xdebian/rules116
-rw-r--r--debian/source/include-binaries2
-rw-r--r--debian/source/lintian-overrides9
10 files changed, 292 insertions, 381 deletions
diff --git a/debian/changelog b/debian/changelog
index 826fe2d4e0..4b9ea86628 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,60 @@
+libreoffice (4:24.2.3-1) unstable; urgency=medium
+
+ * LibreOffice 24.2.3 final release (identical to rc2)
+
+ * upload to unstable
+
+ -- Rene Engelhard <rene@debian.org> Mon, 29 Apr 2024 21:36:22 +0200
+
+libreoffice (4:24.2.3~rc2-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ -- Rene Engelhard <rene@debian.org> Mon, 29 Apr 2024 20:53:47 +0200
+
+libreoffice (4:24.2.3~rc1-3) unstable; urgency=medium
+
+ * debian/rules:
+ - revert bsh build change from -2 for now
+
+ -- Rene Engelhard <rene@debian.org> Wed, 17 Apr 2024 21:07:49 +0200
+
+libreoffice (4:24.2.3~rc1-2) unstable; urgency=medium
+
+ * upload to unstable
+
+ * debian/rules:
+ - move bsh build-dep to Build-Depends-Indep: and build rhino
+ and bsh scripting only in build-indep
+
+ -- Rene Engelhard <rene@debian.org> Wed, 17 Apr 2024 17:40:08 +0200
+
+libreoffice (4:24.2.3~rc1-1) experimental; urgency=medium
+
+ * New upstream release candidate
+
+ * debian/rules:
+ - more target fixes to make Rules-Requires-Root: no work
+ + make binary-{arch,indep} depend on prepare and build-{arch,indep} since
+ with Rules-Requires-Root: no "build{-*}" is not calld anymore itself
+ + fix install-common dependencies (needs to depend on
+ $(STAMP_DIR)/build-{arch,indep}; only depend on build-arch/build-indep
+ on binary-arch/binary-indep builds)
+ - check for binary-indep instead of build-indep for arch-indep builds as
+ Rules-Requires-Root: no builds now (only) call binary-indep without
+ build-indep before
+ - remove firebird/KDE workerounds in install-common again; works without
+ with binary-indep/Rules-Requires-Root: no now
+ - remove extra individual Suggests on -{hyphenation,spellcheck}-xy
+ - fix the ability to ignore make check errors;
+ don't let the value be overridden by the list of archs where
+ "smoketest-only" is fatal
+ * debian/control.in: set Rules-Requires-Root: no
+ * debian/control.lang.in: add Suggests on -{hyphenation,spellcheck}-xy
+ unconditionally for all languages
+
+ -- Rene Engelhard <rene@debian.org> Thu, 11 Apr 2024 19:59:04 +0200
+
libreoffice (4:24.2.2-3) unstable; urgency=medium
* debian/rules: make -commons -mysql and -firebird Breaks: << 4:24.2.2-2~
diff --git a/debian/control b/debian/control
index 8153e1251e..353f3f00c3 100644
--- a/debian/control
+++ b/debian/control
@@ -100,7 +100,6 @@ Build-Depends: autoconf,
libodfgen-dev (>= 0.1),
liborcus-dev (<< 0.20~),
liborcus-dev (>= 0.19.1),
- liborcus-dev (>> 0.19.2-3+b1) [armhf] <!nocheck>,
libpagemaker-dev,
libpagemaker-dev (<< 0.1~),
libpentaho-reporting-flow-engine-java [!armhf !hppa !kfreebsd-amd64 !kfreebsd-i386 !mips64 !powerpcspe !ppc64el !s390x !sparc] <!nojava>,
@@ -141,7 +140,6 @@ Build-Depends: autoconf,
libxml2-dev,
libxml2-utils,
libxmlsec1-dev (>= 1.2.35),
- libxmlsec1-dev (>= 1.2.39-5) [armhf] <!nocheck>,
libxrandr-dev,
libxrender-dev,
libxslt1-dev,
@@ -216,9 +214,11 @@ Build-Depends-Arch: at-spi2-core [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd6
libmariadb-dev,
libnumbertext-data (>= 1.0.11) <!nocheck>,
libopenjp2-7-dev [alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 loong64 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el riscv64 s390x sparc sparc64],
+ liborcus-dev (>> 0.19.2-3+b1) [armhf] <!nocheck>,
libpq-dev,
libqt5x11extras5-dev,
libxcb1-dev,
+ libxmlsec1-dev (>= 1.2.39-5) [armhf] <!nocheck>,
llvm [!alpha !hppa !ia64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !s390x !sparc !sparc64],
locales [!alpha !armel !hppa !i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !mips !mipsel !mips64 !mips64el !powerpc !powerpcspe !ppc64 !ppc64el !riscv64 !s390x !sparc !sparc64] <!nocheck>,
lp-solve,
@@ -255,6 +255,7 @@ Build-Conflicts: amd-libopencl1,
nvidia-glx-legacy-dev,
nvidia-libopencl1
Standards-Version: 4.0.1
+Rules-Requires-Root: no
Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git
Vcs-Browser: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice
Bugs:
@@ -1389,8 +1390,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-af | myspell-dictionary-af,
- hyphen-af,
+Suggests: hunspell-dictionary-af | myspell-dictionary-af | libreoffice-spellcheck-af,
+ hyphen-af | libreoffice-hyphenation-af,
libreoffice-grammarcheck-af,
libreoffice-help-af,
mythes-af
@@ -1420,8 +1421,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-am | myspell-dictionary-am,
- hyphen-am,
+Suggests: hunspell-dictionary-am | myspell-dictionary-am | libreoffice-spellcheck-am,
+ hyphen-am | libreoffice-hyphenation-am,
libreoffice-grammarcheck-am,
libreoffice-help-am,
mythes-am
@@ -1454,8 +1455,8 @@ Recommends: fonts-hosny-amiri,
fonts-sil-scheherazade,
libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ar | myspell-dictionary-ar,
- hyphen-ar,
+Suggests: hunspell-dictionary-ar | myspell-dictionary-ar | libreoffice-spellcheck-ar,
+ hyphen-ar | libreoffice-hyphenation-ar,
libreoffice-grammarcheck-ar,
libreoffice-help-ar,
mythes-ar
@@ -1485,8 +1486,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-as | myspell-dictionary-as,
- hyphen-as,
+Suggests: hunspell-dictionary-as | myspell-dictionary-as | libreoffice-spellcheck-as,
+ hyphen-as | libreoffice-hyphenation-as,
libreoffice-grammarcheck-as,
libreoffice-help-as,
mythes-as
@@ -1516,8 +1517,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ast | myspell-dictionary-ast,
- hyphen-ast,
+Suggests: hunspell-dictionary-ast | myspell-dictionary-ast | libreoffice-spellcheck-ast,
+ hyphen-ast | libreoffice-hyphenation-ast,
libreoffice-grammarcheck-ast,
libreoffice-help-ast,
mythes-ast
@@ -1547,8 +1548,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-be | myspell-dictionary-be,
- hyphen-be,
+Suggests: hunspell-dictionary-be | myspell-dictionary-be | libreoffice-spellcheck-be,
+ hyphen-be | libreoffice-hyphenation-be,
libreoffice-grammarcheck-be,
libreoffice-help-be,
mythes-be
@@ -1578,8 +1579,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-bg | myspell-dictionary-bg,
- hyphen-bg,
+Suggests: hunspell-dictionary-bg | myspell-dictionary-bg | libreoffice-spellcheck-bg,
+ hyphen-bg | libreoffice-hyphenation-bg,
libreoffice-grammarcheck-bg,
libreoffice-help-bg,
mythes-bg
@@ -1609,8 +1610,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-beng, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-bn | myspell-dictionary-bn,
- hyphen-bn,
+Suggests: hunspell-dictionary-bn | myspell-dictionary-bn | libreoffice-spellcheck-bn,
+ hyphen-bn | libreoffice-hyphenation-bn,
libreoffice-grammarcheck-bn,
libreoffice-help-bn,
mythes-bn
@@ -1640,8 +1641,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-br | myspell-dictionary-br,
- hyphen-br,
+Suggests: hunspell-dictionary-br | myspell-dictionary-br | libreoffice-spellcheck-br,
+ hyphen-br | libreoffice-hyphenation-br,
libreoffice-grammarcheck-br,
libreoffice-help-br,
mythes-br
@@ -1671,8 +1672,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-bs | myspell-dictionary-bs,
- hyphen-bs,
+Suggests: hunspell-dictionary-bs | myspell-dictionary-bs | libreoffice-spellcheck-bs,
+ hyphen-bs | libreoffice-hyphenation-bs,
libreoffice-grammarcheck-bs,
libreoffice-help-bs,
mythes-bs
@@ -1702,8 +1703,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ca | myspell-dictionary-ca,
- hyphen-ca,
+Suggests: hunspell-dictionary-ca | myspell-dictionary-ca | libreoffice-spellcheck-ca,
+ hyphen-ca | libreoffice-hyphenation-ca,
libreoffice-grammarcheck-ca,
libreoffice-help-ca,
mythes-ca
@@ -1733,8 +1734,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-cs | myspell-dictionary-cs,
- hyphen-cs,
+Suggests: hunspell-dictionary-cs | myspell-dictionary-cs | libreoffice-spellcheck-cs,
+ hyphen-cs | libreoffice-hyphenation-cs,
libreoffice-grammarcheck-cs,
libreoffice-help-cs,
mythes-cs
@@ -1764,8 +1765,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-cy | myspell-dictionary-cy,
- hyphen-cy,
+Suggests: hunspell-dictionary-cy | myspell-dictionary-cy | libreoffice-spellcheck-cy,
+ hyphen-cy | libreoffice-hyphenation-cy,
libreoffice-grammarcheck-cy,
libreoffice-help-cy,
mythes-cy
@@ -1795,8 +1796,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-da | myspell-dictionary-da,
- hyphen-da,
+Suggests: hunspell-dictionary-da | myspell-dictionary-da | libreoffice-spellcheck-da,
+ hyphen-da | libreoffice-hyphenation-da,
libreoffice-grammarcheck-da,
libreoffice-help-da,
mythes-da
@@ -1826,8 +1827,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-de | myspell-dictionary-de,
- hyphen-de,
+Suggests: hunspell-dictionary-de | myspell-dictionary-de | libreoffice-spellcheck-de,
+ hyphen-de | libreoffice-hyphenation-de,
libreoffice-grammarcheck-de,
libreoffice-help-de,
mythes-de
@@ -1857,8 +1858,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-dzongkha, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-dz | myspell-dictionary-dz,
- hyphen-dz,
+Suggests: hunspell-dictionary-dz | myspell-dictionary-dz | libreoffice-spellcheck-dz,
+ hyphen-dz | libreoffice-hyphenation-dz,
libreoffice-grammarcheck-dz,
libreoffice-help-dz,
mythes-dz
@@ -1888,8 +1889,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-el | myspell-dictionary-el,
- hyphen-el,
+Suggests: hunspell-dictionary-el | myspell-dictionary-el | libreoffice-spellcheck-el,
+ hyphen-el | libreoffice-hyphenation-el,
libreoffice-grammarcheck-el,
libreoffice-help-el,
mythes-el
@@ -1919,8 +1920,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-en-gb | myspell-dictionary-en-gb,
- hyphen-en-gb,
+Suggests: hunspell-dictionary-en-gb | myspell-dictionary-en-gb | libreoffice-spellcheck-en-gb,
+ hyphen-en-gb | libreoffice-hyphenation-en-gb,
libreoffice-grammarcheck-en-gb,
libreoffice-help-en-gb,
mythes-en-gb
@@ -1950,8 +1951,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-en-za | myspell-dictionary-en-za,
- hyphen-en-za,
+Suggests: hunspell-dictionary-en-za | myspell-dictionary-en-za | libreoffice-spellcheck-en-za,
+ hyphen-en-za | libreoffice-hyphenation-en-za,
libreoffice-grammarcheck-en-za,
libreoffice-help-en-za,
mythes-en-za
@@ -1981,8 +1982,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-eo | myspell-dictionary-eo,
- hyphen-eo,
+Suggests: hunspell-dictionary-eo | myspell-dictionary-eo | libreoffice-spellcheck-eo,
+ hyphen-eo | libreoffice-hyphenation-eo,
libreoffice-grammarcheck-eo,
libreoffice-help-eo,
mythes-eo
@@ -2012,8 +2013,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-es | myspell-dictionary-es,
- hyphen-es,
+Suggests: hunspell-dictionary-es | myspell-dictionary-es | libreoffice-spellcheck-es,
+ hyphen-es | libreoffice-hyphenation-es,
libreoffice-grammarcheck-es,
libreoffice-help-es,
mythes-es
@@ -2043,8 +2044,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-et | myspell-dictionary-et,
- hyphen-et,
+Suggests: hunspell-dictionary-et | myspell-dictionary-et | libreoffice-spellcheck-et,
+ hyphen-et | libreoffice-hyphenation-et,
libreoffice-grammarcheck-et,
libreoffice-help-et,
mythes-et
@@ -2074,8 +2075,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-eu | myspell-dictionary-eu,
- hyphen-eu,
+Suggests: hunspell-dictionary-eu | myspell-dictionary-eu | libreoffice-spellcheck-eu,
+ hyphen-eu | libreoffice-hyphenation-eu,
libreoffice-grammarcheck-eu,
libreoffice-help-eu,
mythes-eu
@@ -2105,8 +2106,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-farsiweb, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-fa | myspell-dictionary-fa,
- hyphen-fa,
+Suggests: hunspell-dictionary-fa | myspell-dictionary-fa | libreoffice-spellcheck-fa,
+ hyphen-fa | libreoffice-hyphenation-fa,
libreoffice-grammarcheck-fa,
libreoffice-help-fa,
mythes-fa
@@ -2198,8 +2199,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ga | myspell-dictionary-ga,
- hyphen-ga,
+Suggests: hunspell-dictionary-ga | myspell-dictionary-ga | libreoffice-spellcheck-ga,
+ hyphen-ga | libreoffice-hyphenation-ga,
libreoffice-grammarcheck-ga,
libreoffice-help-ga,
mythes-ga
@@ -2229,8 +2230,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-gd | myspell-dictionary-gd,
- hyphen-gd,
+Suggests: hunspell-dictionary-gd | myspell-dictionary-gd | libreoffice-spellcheck-gd,
+ hyphen-gd | libreoffice-hyphenation-gd,
libreoffice-grammarcheck-gd,
libreoffice-help-gd,
mythes-gd
@@ -2260,8 +2261,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-gl | myspell-dictionary-gl,
- hyphen-gl,
+Suggests: hunspell-dictionary-gl | myspell-dictionary-gl | libreoffice-spellcheck-gl,
+ hyphen-gl | libreoffice-hyphenation-gl,
libreoffice-grammarcheck-gl,
libreoffice-help-gl,
mythes-gl
@@ -2291,8 +2292,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-gujr, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-gu | myspell-dictionary-gu,
- hyphen-gu,
+Suggests: hunspell-dictionary-gu | myspell-dictionary-gu | libreoffice-spellcheck-gu,
+ hyphen-gu | libreoffice-hyphenation-gu,
libreoffice-grammarcheck-gu,
libreoffice-help-gu,
mythes-gu
@@ -2322,8 +2323,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-gug | myspell-dictionary-gug,
- hyphen-gug,
+Suggests: hunspell-dictionary-gug | myspell-dictionary-gug | libreoffice-spellcheck-gug,
+ hyphen-gug | libreoffice-hyphenation-gug,
libreoffice-grammarcheck-gug,
libreoffice-help-gug,
mythes-gug
@@ -2353,8 +2354,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: culmus, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-he | myspell-dictionary-he,
- hyphen-he,
+Suggests: hunspell-dictionary-he | myspell-dictionary-he | libreoffice-spellcheck-he,
+ hyphen-he | libreoffice-hyphenation-he,
libreoffice-grammarcheck-he,
libreoffice-help-he,
mythes-he
@@ -2384,8 +2385,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-hi | myspell-dictionary-hi,
- hyphen-hi,
+Suggests: hunspell-dictionary-hi | myspell-dictionary-hi | libreoffice-spellcheck-hi,
+ hyphen-hi | libreoffice-hyphenation-hi,
libreoffice-grammarcheck-hi,
libreoffice-help-hi,
mythes-hi
@@ -2415,8 +2416,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-hr | myspell-dictionary-hr,
- hyphen-hr,
+Suggests: hunspell-dictionary-hr | myspell-dictionary-hr | libreoffice-spellcheck-hr,
+ hyphen-hr | libreoffice-hyphenation-hr,
libreoffice-grammarcheck-hr,
libreoffice-help-hr,
mythes-hr
@@ -2446,8 +2447,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-hu | myspell-dictionary-hu,
- hyphen-hu,
+Suggests: hunspell-dictionary-hu | myspell-dictionary-hu | libreoffice-spellcheck-hu,
+ hyphen-hu | libreoffice-hyphenation-hu,
libreoffice-grammarcheck-hu,
libreoffice-help-hu,
mythes-hu
@@ -2477,8 +2478,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-hy | myspell-dictionary-hy,
- hyphen-hy,
+Suggests: hunspell-dictionary-hy | myspell-dictionary-hy | libreoffice-spellcheck-hy,
+ hyphen-hy | libreoffice-hyphenation-hy,
libreoffice-grammarcheck-hy,
libreoffice-help-hy,
mythes-hy
@@ -2508,8 +2509,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-id | myspell-dictionary-id,
- hyphen-id,
+Suggests: hunspell-dictionary-id | myspell-dictionary-id | libreoffice-spellcheck-id,
+ hyphen-id | libreoffice-hyphenation-id,
libreoffice-grammarcheck-id,
libreoffice-help-id,
mythes-id
@@ -2539,8 +2540,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-is | myspell-dictionary-is,
- hyphen-is,
+Suggests: hunspell-dictionary-is | myspell-dictionary-is | libreoffice-spellcheck-is,
+ hyphen-is | libreoffice-hyphenation-is,
libreoffice-grammarcheck-is,
libreoffice-help-is,
mythes-is
@@ -2570,8 +2571,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-it | myspell-dictionary-it,
- hyphen-it,
+Suggests: hunspell-dictionary-it | myspell-dictionary-it | libreoffice-spellcheck-it,
+ hyphen-it | libreoffice-hyphenation-it,
libreoffice-grammarcheck-it,
libreoffice-help-it,
mythes-it
@@ -2601,8 +2602,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ja | myspell-dictionary-ja,
- hyphen-ja,
+Suggests: hunspell-dictionary-ja | myspell-dictionary-ja | libreoffice-spellcheck-ja,
+ hyphen-ja | libreoffice-hyphenation-ja,
libreoffice-grammarcheck-ja,
libreoffice-help-ja,
mythes-ja
@@ -2632,8 +2633,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ka | myspell-dictionary-ka,
- hyphen-ka,
+Suggests: hunspell-dictionary-ka | myspell-dictionary-ka | libreoffice-spellcheck-ka,
+ hyphen-ka | libreoffice-hyphenation-ka,
libreoffice-grammarcheck-ka,
libreoffice-help-ka,
mythes-ka
@@ -2663,8 +2664,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-kk | myspell-dictionary-kk,
- hyphen-kk,
+Suggests: hunspell-dictionary-kk | myspell-dictionary-kk | libreoffice-spellcheck-kk,
+ hyphen-kk | libreoffice-hyphenation-kk,
libreoffice-grammarcheck-kk,
libreoffice-help-kk,
mythes-kk
@@ -2694,8 +2695,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-khmeros, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-km | myspell-dictionary-km,
- hyphen-km,
+Suggests: hunspell-dictionary-km | myspell-dictionary-km | libreoffice-spellcheck-km,
+ hyphen-km | libreoffice-hyphenation-km,
libreoffice-grammarcheck-km,
libreoffice-help-km,
mythes-km
@@ -2725,8 +2726,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-kmr | myspell-dictionary-kmr,
- hyphen-kmr,
+Suggests: hunspell-dictionary-kmr | myspell-dictionary-kmr | libreoffice-spellcheck-kmr,
+ hyphen-kmr | libreoffice-hyphenation-kmr,
libreoffice-grammarcheck-kmr,
libreoffice-help-kmr,
mythes-kmr
@@ -2756,8 +2757,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-kn | myspell-dictionary-kn,
- hyphen-kn,
+Suggests: hunspell-dictionary-kn | myspell-dictionary-kn | libreoffice-spellcheck-kn,
+ hyphen-kn | libreoffice-hyphenation-kn,
libreoffice-grammarcheck-kn,
libreoffice-help-kn,
mythes-kn
@@ -2787,8 +2788,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ko | myspell-dictionary-ko,
- hyphen-ko,
+Suggests: hunspell-dictionary-ko | myspell-dictionary-ko | libreoffice-spellcheck-ko,
+ hyphen-ko | libreoffice-hyphenation-ko,
libreoffice-grammarcheck-ko,
libreoffice-help-ko,
mythes-ko
@@ -2818,8 +2819,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-lt | myspell-dictionary-lt,
- hyphen-lt,
+Suggests: hunspell-dictionary-lt | myspell-dictionary-lt | libreoffice-spellcheck-lt,
+ hyphen-lt | libreoffice-hyphenation-lt,
libreoffice-grammarcheck-lt,
libreoffice-help-lt,
mythes-lt
@@ -2849,8 +2850,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-lv | myspell-dictionary-lv,
- hyphen-lv,
+Suggests: hunspell-dictionary-lv | myspell-dictionary-lv | libreoffice-spellcheck-lv,
+ hyphen-lv | libreoffice-hyphenation-lv,
libreoffice-grammarcheck-lv,
libreoffice-help-lv,
mythes-lv
@@ -2880,8 +2881,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-mk | myspell-dictionary-mk,
- hyphen-mk,
+Suggests: hunspell-dictionary-mk | myspell-dictionary-mk | libreoffice-spellcheck-mk,
+ hyphen-mk | libreoffice-hyphenation-mk,
libreoffice-grammarcheck-mk,
libreoffice-help-mk,
mythes-mk
@@ -2911,8 +2912,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-mn | myspell-dictionary-mn,
- hyphen-mn,
+Suggests: hunspell-dictionary-mn | myspell-dictionary-mn | libreoffice-spellcheck-mn,
+ hyphen-mn | libreoffice-hyphenation-mn,
libreoffice-grammarcheck-mn,
libreoffice-help-mn,
mythes-mn
@@ -2942,8 +2943,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-mlym, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ml | myspell-dictionary-ml,
- hyphen-ml,
+Suggests: hunspell-dictionary-ml | myspell-dictionary-ml | libreoffice-spellcheck-ml,
+ hyphen-ml | libreoffice-hyphenation-ml,
libreoffice-grammarcheck-ml,
libreoffice-help-ml,
mythes-ml
@@ -2973,8 +2974,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-deva, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-mr | myspell-dictionary-mr,
- hyphen-mr,
+Suggests: hunspell-dictionary-mr | myspell-dictionary-mr | libreoffice-spellcheck-mr,
+ hyphen-mr | libreoffice-hyphenation-mr,
libreoffice-grammarcheck-mr,
libreoffice-help-mr,
mythes-mr
@@ -3004,8 +3005,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-nb | myspell-dictionary-nb,
- hyphen-nb,
+Suggests: hunspell-dictionary-nb | myspell-dictionary-nb | libreoffice-spellcheck-nb,
+ hyphen-nb | libreoffice-hyphenation-nb,
libreoffice-grammarcheck-nb,
libreoffice-help-nb,
mythes-nb
@@ -3035,8 +3036,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-deva, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ne | myspell-dictionary-ne,
- hyphen-ne,
+Suggests: hunspell-dictionary-ne | myspell-dictionary-ne | libreoffice-spellcheck-ne,
+ hyphen-ne | libreoffice-hyphenation-ne,
libreoffice-grammarcheck-ne,
libreoffice-help-ne,
mythes-ne
@@ -3066,8 +3067,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-nl | myspell-dictionary-nl,
- hyphen-nl,
+Suggests: hunspell-dictionary-nl | myspell-dictionary-nl | libreoffice-spellcheck-nl,
+ hyphen-nl | libreoffice-hyphenation-nl,
libreoffice-grammarcheck-nl,
libreoffice-help-nl,
mythes-nl
@@ -3097,8 +3098,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-nn | myspell-dictionary-nn,
- hyphen-nn,
+Suggests: hunspell-dictionary-nn | myspell-dictionary-nn | libreoffice-spellcheck-nn,
+ hyphen-nn | libreoffice-hyphenation-nn,
libreoffice-grammarcheck-nn,
libreoffice-help-nn,
mythes-nn
@@ -3128,8 +3129,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-nr | myspell-dictionary-nr,
- hyphen-nr,
+Suggests: hunspell-dictionary-nr | myspell-dictionary-nr | libreoffice-spellcheck-nr,
+ hyphen-nr | libreoffice-hyphenation-nr,
libreoffice-grammarcheck-nr,
libreoffice-help-nr,
mythes-nr
@@ -3159,8 +3160,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-nso | myspell-dictionary-nso,
- hyphen-nso,
+Suggests: hunspell-dictionary-nso | myspell-dictionary-nso | libreoffice-spellcheck-nso,
+ hyphen-nso | libreoffice-hyphenation-nso,
libreoffice-grammarcheck-nso,
libreoffice-help-nso,
mythes-nso
@@ -3190,8 +3191,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-oc | myspell-dictionary-oc,
- hyphen-oc,
+Suggests: hunspell-dictionary-oc | myspell-dictionary-oc | libreoffice-spellcheck-oc,
+ hyphen-oc | libreoffice-hyphenation-oc,
libreoffice-grammarcheck-oc,
libreoffice-help-oc,
mythes-oc
@@ -3221,8 +3222,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-om | myspell-dictionary-om,
- hyphen-om,
+Suggests: hunspell-dictionary-om | myspell-dictionary-om | libreoffice-spellcheck-om,
+ hyphen-om | libreoffice-hyphenation-om,
libreoffice-grammarcheck-om,
libreoffice-help-om,
mythes-om
@@ -3252,8 +3253,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-orya, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-or | myspell-dictionary-or,
- hyphen-or,
+Suggests: hunspell-dictionary-or | myspell-dictionary-or | libreoffice-spellcheck-or,
+ hyphen-or | libreoffice-hyphenation-or,
libreoffice-grammarcheck-or,
libreoffice-help-or,
mythes-or
@@ -3283,8 +3284,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-guru, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-pa-in | myspell-dictionary-pa-in,
- hyphen-pa-in,
+Suggests: hunspell-dictionary-pa-in | myspell-dictionary-pa-in | libreoffice-spellcheck-pa-in,
+ hyphen-pa-in | libreoffice-hyphenation-pa-in,
libreoffice-grammarcheck-pa-in,
libreoffice-help-pa-in,
mythes-pa-in
@@ -3314,8 +3315,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-pl | myspell-dictionary-pl,
- hyphen-pl,
+Suggests: hunspell-dictionary-pl | myspell-dictionary-pl | libreoffice-spellcheck-pl,
+ hyphen-pl | libreoffice-hyphenation-pl,
libreoffice-grammarcheck-pl,
libreoffice-help-pl,
mythes-pl
@@ -3345,8 +3346,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-pt | myspell-dictionary-pt,
- hyphen-pt,
+Suggests: hunspell-dictionary-pt | myspell-dictionary-pt | libreoffice-spellcheck-pt,
+ hyphen-pt | libreoffice-hyphenation-pt,
libreoffice-grammarcheck-pt,
libreoffice-help-pt,
mythes-pt
@@ -3376,8 +3377,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-pt-br | myspell-dictionary-pt-br,
- hyphen-pt-br,
+Suggests: hunspell-dictionary-pt-br | myspell-dictionary-pt-br | libreoffice-spellcheck-pt-br,
+ hyphen-pt-br | libreoffice-hyphenation-pt-br,
libreoffice-grammarcheck-pt-br,
libreoffice-help-pt-br,
mythes-pt-br
@@ -3407,8 +3408,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ro | myspell-dictionary-ro,
- hyphen-ro,
+Suggests: hunspell-dictionary-ro | myspell-dictionary-ro | libreoffice-spellcheck-ro,
+ hyphen-ro | libreoffice-hyphenation-ro,
libreoffice-grammarcheck-ro,
libreoffice-help-ro,
mythes-ro
@@ -3438,8 +3439,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ru | myspell-dictionary-ru,
- hyphen-ru,
+Suggests: hunspell-dictionary-ru | myspell-dictionary-ru | libreoffice-spellcheck-ru,
+ hyphen-ru | libreoffice-hyphenation-ru,
libreoffice-grammarcheck-ru,
libreoffice-help-ru,
mythes-ru
@@ -3469,8 +3470,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-rw | myspell-dictionary-rw,
- hyphen-rw,
+Suggests: hunspell-dictionary-rw | myspell-dictionary-rw | libreoffice-spellcheck-rw,
+ hyphen-rw | libreoffice-hyphenation-rw,
libreoffice-grammarcheck-rw,
libreoffice-help-rw,
mythes-rw
@@ -3500,8 +3501,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-si | myspell-dictionary-si,
- hyphen-si,
+Suggests: hunspell-dictionary-si | myspell-dictionary-si | libreoffice-spellcheck-si,
+ hyphen-si | libreoffice-hyphenation-si,
libreoffice-grammarcheck-si,
libreoffice-help-si,
mythes-si
@@ -3531,8 +3532,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-sk | myspell-dictionary-sk,
- hyphen-sk,
+Suggests: hunspell-dictionary-sk | myspell-dictionary-sk | libreoffice-spellcheck-sk,
+ hyphen-sk | libreoffice-hyphenation-sk,
libreoffice-grammarcheck-sk,
libreoffice-help-sk,
mythes-sk
@@ -3562,8 +3563,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-sl | myspell-dictionary-sl,
- hyphen-sl,
+Suggests: hunspell-dictionary-sl | myspell-dictionary-sl | libreoffice-spellcheck-sl,
+ hyphen-sl | libreoffice-hyphenation-sl,
libreoffice-grammarcheck-sl,
libreoffice-help-sl,
mythes-sl
@@ -3593,8 +3594,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-sr | myspell-dictionary-sr,
- hyphen-sr,
+Suggests: hunspell-dictionary-sr | myspell-dictionary-sr | libreoffice-spellcheck-sr,
+ hyphen-sr | libreoffice-hyphenation-sr,
libreoffice-grammarcheck-sr,
libreoffice-help-sr,
mythes-sr
@@ -3624,8 +3625,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ss | myspell-dictionary-ss,
- hyphen-ss,
+Suggests: hunspell-dictionary-ss | myspell-dictionary-ss | libreoffice-spellcheck-ss,
+ hyphen-ss | libreoffice-hyphenation-ss,
libreoffice-grammarcheck-ss,
libreoffice-help-ss,
mythes-ss
@@ -3655,8 +3656,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-st | myspell-dictionary-st,
- hyphen-st,
+Suggests: hunspell-dictionary-st | myspell-dictionary-st | libreoffice-spellcheck-st,
+ hyphen-st | libreoffice-hyphenation-st,
libreoffice-grammarcheck-st,
libreoffice-help-st,
mythes-st
@@ -3686,8 +3687,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-sv | myspell-dictionary-sv,
- hyphen-sv,
+Suggests: hunspell-dictionary-sv | myspell-dictionary-sv | libreoffice-spellcheck-sv,
+ hyphen-sv | libreoffice-hyphenation-sv,
libreoffice-grammarcheck-sv,
libreoffice-help-sv,
mythes-sv
@@ -3717,8 +3718,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-szl | myspell-dictionary-szl,
- hyphen-szl,
+Suggests: hunspell-dictionary-szl | myspell-dictionary-szl | libreoffice-spellcheck-szl,
+ hyphen-szl | libreoffice-hyphenation-szl,
libreoffice-grammarcheck-szl,
libreoffice-help-szl,
mythes-szl
@@ -3748,8 +3749,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-taml, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ta | myspell-dictionary-ta,
- hyphen-ta,
+Suggests: hunspell-dictionary-ta | myspell-dictionary-ta | libreoffice-spellcheck-ta,
+ hyphen-ta | libreoffice-hyphenation-ta,
libreoffice-grammarcheck-ta,
libreoffice-help-ta,
mythes-ta
@@ -3779,8 +3780,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-telu, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-te | myspell-dictionary-te,
- hyphen-te,
+Suggests: hunspell-dictionary-te | myspell-dictionary-te | libreoffice-spellcheck-te,
+ hyphen-te | libreoffice-hyphenation-te,
libreoffice-grammarcheck-te,
libreoffice-help-te,
mythes-te
@@ -3810,8 +3811,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-tg | myspell-dictionary-tg,
- hyphen-tg,
+Suggests: hunspell-dictionary-tg | myspell-dictionary-tg | libreoffice-spellcheck-tg,
+ hyphen-tg | libreoffice-hyphenation-tg,
libreoffice-grammarcheck-tg,
libreoffice-help-tg,
mythes-tg
@@ -3841,8 +3842,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: fonts-thai-tlwg, libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-th | myspell-dictionary-th,
- hyphen-th,
+Suggests: hunspell-dictionary-th | myspell-dictionary-th | libreoffice-spellcheck-th,
+ hyphen-th | libreoffice-hyphenation-th,
libreoffice-grammarcheck-th,
libreoffice-help-th,
mythes-th
@@ -3872,8 +3873,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-tn | myspell-dictionary-tn,
- hyphen-tn,
+Suggests: hunspell-dictionary-tn | myspell-dictionary-tn | libreoffice-spellcheck-tn,
+ hyphen-tn | libreoffice-hyphenation-tn,
libreoffice-grammarcheck-tn,
libreoffice-help-tn,
mythes-tn
@@ -3934,8 +3935,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ts | myspell-dictionary-ts,
- hyphen-ts,
+Suggests: hunspell-dictionary-ts | myspell-dictionary-ts | libreoffice-spellcheck-ts,
+ hyphen-ts | libreoffice-hyphenation-ts,
libreoffice-grammarcheck-ts,
libreoffice-help-ts,
mythes-ts
@@ -3965,8 +3966,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ug | myspell-dictionary-ug,
- hyphen-ug,
+Suggests: hunspell-dictionary-ug | myspell-dictionary-ug | libreoffice-spellcheck-ug,
+ hyphen-ug | libreoffice-hyphenation-ug,
libreoffice-grammarcheck-ug,
libreoffice-help-ug,
mythes-ug
@@ -3996,8 +3997,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-uk | myspell-dictionary-uk,
- hyphen-uk,
+Suggests: hunspell-dictionary-uk | myspell-dictionary-uk | libreoffice-spellcheck-uk,
+ hyphen-uk | libreoffice-hyphenation-uk,
libreoffice-grammarcheck-uk,
libreoffice-help-uk,
mythes-uk
@@ -4027,8 +4028,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-uz | myspell-dictionary-uz,
- hyphen-uz,
+Suggests: hunspell-dictionary-uz | myspell-dictionary-uz | libreoffice-spellcheck-uz,
+ hyphen-uz | libreoffice-hyphenation-uz,
libreoffice-grammarcheck-uz,
libreoffice-help-uz,
mythes-uz
@@ -4058,8 +4059,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-ve | myspell-dictionary-ve,
- hyphen-ve,
+Suggests: hunspell-dictionary-ve | myspell-dictionary-ve | libreoffice-spellcheck-ve,
+ hyphen-ve | libreoffice-hyphenation-ve,
libreoffice-grammarcheck-ve,
libreoffice-help-ve,
mythes-ve
@@ -4089,8 +4090,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-vi | myspell-dictionary-vi,
- hyphen-vi,
+Suggests: hunspell-dictionary-vi | myspell-dictionary-vi | libreoffice-spellcheck-vi,
+ hyphen-vi | libreoffice-hyphenation-vi,
libreoffice-grammarcheck-vi,
libreoffice-help-vi,
mythes-vi
@@ -4120,8 +4121,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-xh | myspell-dictionary-xh,
- hyphen-xh,
+Suggests: hunspell-dictionary-xh | myspell-dictionary-xh | libreoffice-spellcheck-xh,
+ hyphen-xh | libreoffice-hyphenation-xh,
libreoffice-grammarcheck-xh,
libreoffice-help-xh,
mythes-xh
@@ -4151,8 +4152,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-zh-cn | myspell-dictionary-zh-cn,
- hyphen-zh-cn,
+Suggests: hunspell-dictionary-zh-cn | myspell-dictionary-zh-cn | libreoffice-spellcheck-zh-cn,
+ hyphen-zh-cn | libreoffice-hyphenation-zh-cn,
libreoffice-grammarcheck-zh-cn,
libreoffice-help-zh-cn,
mythes-zh-cn
@@ -4182,8 +4183,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-zh-tw | myspell-dictionary-zh-tw,
- hyphen-zh-tw,
+Suggests: hunspell-dictionary-zh-tw | myspell-dictionary-zh-tw | libreoffice-spellcheck-zh-tw,
+ hyphen-zh-tw | libreoffice-hyphenation-zh-tw,
libreoffice-grammarcheck-zh-tw,
libreoffice-help-zh-tw,
mythes-zh-tw
@@ -4213,8 +4214,8 @@ Depends: libreoffice-common (>= 1:7.0.0~alpha~),
${misc:Depends}
Recommends: libreoffice-core (>> ${base-version})
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-zu | myspell-dictionary-zu,
- hyphen-zu,
+Suggests: hunspell-dictionary-zu | myspell-dictionary-zu | libreoffice-spellcheck-zu,
+ hyphen-zu | libreoffice-hyphenation-zu,
libreoffice-grammarcheck-zu,
libreoffice-help-zu,
mythes-zu
diff --git a/debian/control.in b/debian/control.in
index da6bc5132b..da77b5243e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -14,6 +14,7 @@ Build-Conflicts: nvidia-glx-dev,
fontconfig-config (= 2.14.1-2) <!nocheck>,
fontconfig-config (= 2.14.1-3) <!nocheck>
Standards-Version: 4.0.1
+Rules-Requires-Root: no
Vcs-Git: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice.git
Vcs-Browser: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice
Bugs: @BUGS@
diff --git a/debian/control.lang.in b/debian/control.lang.in
index 9503656935..55546fd76b 100644
--- a/debian/control.lang.in
+++ b/debian/control.lang.in
@@ -4,8 +4,8 @@ Architecture: all
Depends: libreoffice-common (>= 1:7.0.0~alpha~), ${misc:Depends}, @LOCALES_DEPENDS@
Recommends: libreoffice-core (>> ${base-version}) @FONT_RECOMMENDS@
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
-Suggests: hunspell-dictionary-@LCODE@ | myspell-dictionary-@LCODE@,
- hyphen-@LCODE@,
+Suggests: hunspell-dictionary-@LCODE@ | myspell-dictionary-@LCODE@ | libreoffice-spellcheck-@LCODE@,
+ hyphen-@LCODE@ | libreoffice-hyphenation-@LCODE@,
libreoffice-grammarcheck-@LCODE@,
libreoffice-help-@LCODE@,
mythes-@LCODE@
diff --git a/debian/libreoffice-core.bug-script.in b/debian/libreoffice-core.bug-script.in
index aaa8b2dcbe..3ba60de164 100755
--- a/debian/libreoffice-core.bug-script.in
+++ b/debian/libreoffice-core.bug-script.in
@@ -17,4 +17,4 @@ fi
# installed VCLplugs
echo "" >&3
echo "Installed VCLplugs:" >&3
-dpkg -l libreoffice-gtk3 libreoffice-qt5 libreoffice-kf5 libreoffice-qt6 >&3
+dpkg -l libreoffice-gtk3 libreoffice-gtk4 libreoffice-qt5 libreoffice-kf5 libreoffice-qt6 libreoffice-kf6 >&3
diff --git a/debian/patches/python-3.12.diff b/debian/patches/python-3.12.diff
deleted file mode 100644
index 40a341470c..0000000000
--- a/debian/patches/python-3.12.diff
+++ /dev/null
@@ -1,120 +0,0 @@
-From 7a561440acd01949e9b7b4efef9062ce05ce5d64 Mon Sep 17 00:00:00 2001
-From: Justin Luth <jluth@mail.com>
-Date: Wed, 13 Mar 2024 08:38:40 -0400
-Subject: allow build with python 3.12.0: initialize new tp_watched
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes the build failure after I updated Ubuntu 24.04 (alpha),
-which upgraded python 3.11.7 to python 3.12.0, causing the error:
-
-libreoffice/pyuno/source/module/pyuno_callable.cxx:249:1:
-error: missing initializer for member ‘_typeobject::tp_watched’
-[-Werror=missing-field-initializers]
-...
-
-I gleaned this information from a July 2023 commit for
-https://github.com/xbmc/xbmc/issues/23503
-
-tp_watched was added in upstream commit python/cpython@82ccbf6
-https://github.com/python/cpython/commit/82ccbf69a842db25d8117f1c41b47aa5b4ed96ab
-
-This change first appeared in Python v3.12.0a1
-
-Change-Id: If82ff1eb47d66d2669d90d6e00e0feff3c55b5ca
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164775
-Tested-by: Jenkins
-Reviewed-by: Justin Luth <jluth@mail.com>
-Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164785
----
- pyuno/source/module/pyuno.cxx | 3 +++
- pyuno/source/module/pyuno_callable.cxx | 3 +++
- pyuno/source/module/pyuno_iterator.cxx | 6 ++++++
- pyuno/source/module/pyuno_runtime.cxx | 3 +++
- pyuno/source/module/pyuno_struct.cxx | 3 +++
- 5 files changed, 18 insertions(+)
-
-diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx
-index bd4904d5f729..a589c72ba3bf 100644
---- a/pyuno/source/module/pyuno.cxx
-+++ b/pyuno/source/module/pyuno.cxx
-@@ -1667,6 +1667,9 @@ static PyTypeObject PyUNOType =
- #pragma clang diagnostic pop
- #endif
- #endif
-+#if PY_VERSION_HEX >= 0x030C00A1
-+ , 0 // tp_watched
-+#endif
- #endif
- #endif
- };
-diff --git a/pyuno/source/module/pyuno_callable.cxx b/pyuno/source/module/pyuno_callable.cxx
-index f22de316b7de..8f19fc8eb654 100644
---- a/pyuno/source/module/pyuno_callable.cxx
-+++ b/pyuno/source/module/pyuno_callable.cxx
-@@ -244,6 +244,9 @@ static PyTypeObject PyUNO_callable_Type =
- #pragma clang diagnostic pop
- #endif
- #endif
-+#if PY_VERSION_HEX >= 0x030C00A1
-+ , 0 // tp_watched
-+#endif
- #endif
- #endif
- };
-diff --git a/pyuno/source/module/pyuno_iterator.cxx b/pyuno/source/module/pyuno_iterator.cxx
-index 134f318a1017..2fc70a32fcff 100644
---- a/pyuno/source/module/pyuno_iterator.cxx
-+++ b/pyuno/source/module/pyuno_iterator.cxx
-@@ -177,6 +177,9 @@ static PyTypeObject PyUNO_iterator_Type =
- #pragma clang diagnostic pop
- #endif
- #endif
-+#if PY_VERSION_HEX >= 0x030C00A1
-+ , 0 // tp_watched
-+#endif
- #endif
- #endif
- };
-@@ -323,6 +326,9 @@ static PyTypeObject PyUNO_list_iterator_Type =
- #pragma clang diagnostic pop
- #endif
- #endif
-+#if PY_VERSION_HEX >= 0x030C00A1
-+ , 0 // tp_watched
-+#endif
- #endif
- #endif
- };
-diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
-index cb95e5a46dc1..91e971fdd582 100644
---- a/pyuno/source/module/pyuno_runtime.cxx
-+++ b/pyuno/source/module/pyuno_runtime.cxx
-@@ -139,6 +139,9 @@ static PyTypeObject RuntimeImpl_Type =
- #pragma clang diagnostic pop
- #endif
- #endif
-+#if PY_VERSION_HEX >= 0x030C00A1
-+ , 0 // tp_watched
-+#endif
- #endif
- #endif
- };
-diff --git a/pyuno/source/module/pyuno_struct.cxx b/pyuno/source/module/pyuno_struct.cxx
-index c8fd7e987905..364f2776011a 100644
---- a/pyuno/source/module/pyuno_struct.cxx
-+++ b/pyuno/source/module/pyuno_struct.cxx
-@@ -354,6 +354,9 @@ static PyTypeObject PyUNOStructType =
- #pragma clang diagnostic pop
- #endif
- #endif
-+#if PY_VERSION_HEX >= 0x030C00A1
-+ , 0 // tp_watched
-+#endif
- #endif
- #endif
- };
---
-cgit v1.2.3 \ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index aea9d1e126..5ca46579bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -49,5 +49,4 @@ adapt-for-new-carlito.diff
fix-system-abseil-build.diff
fix-riscv64-bridge.diff
pdfium-ports.diff
-python-3.12.diff
split-sdbc-firebird-mariadb.diff
diff --git a/debian/rules b/debian/rules
index aaad22edce..b43cc79c3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -83,7 +83,7 @@ lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentf
# 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-24-2-2
+GIT_BRANCH=libreoffice-24-2-3
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@ -248,11 +248,11 @@ ifeq ($(filter noinsttest,$(DEB_BUILD_PROFILES)),)
endif
endif
-ifneq ($(MAKECMDGOALS),build-indep)
+ifneq ($(MAKECMDGOALS),binary-indep)
ENABLE_SYMBOLS=y
SMALL_SYMBOLS=y
endif
-ifeq ($(MAKECMDGOALS),build-indep)
+ifeq ($(MAKECMDGOALS),binary-indep)
# no need to do a double build...
BUILD_NOGUI_PACKAGES=n
# go sure
@@ -301,7 +301,6 @@ else
PACKAGE_SDK_DOCS=y
endif
PACKAGE_LOKIT=y
-ENABLE_CHART_TESTS=n
# will not work, uses schema/ stripped in the tarballs
ifeq "$(USE_SOURCE_TARBALLS)" "y"
ENABLE_EXPORT_VALIDATION_TESTS=n
@@ -462,13 +461,8 @@ SYSTEM_STUFF += libtiff
SYSTEM_STUFF += frozen
SYSTEM_STUFF += argon2
-# override stuff for build-indep to save build dependencies
-# This is a hack. dpkg calls build-indep for -A so this is in effect.
-# but for the binary target it calls binary-indep which calls install etc
-# apparently without these. so those guards do not work if stuff is moved
-# in install-common. e.g. qt/kf5, firebird_sdbc.xcd. Those need to be guarded
-# with an if [ -f or similar
-ifeq ($(MAKECMDGOALS),build-indep)
+# override stuff for indep builds to save build dependencies
+ifeq ($(MAKECMDGOALS),binary-indep)
ENABLE_EVOAB=n
BUILD_GTK3=n
ENABLE_INTROSPECTION=n
@@ -666,13 +660,16 @@ ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
endif
IGNORE_MAKE_FAILURES=-
TEST_TIMEOUT := timeout --foreground --preserve-status -v -k 250m 200m
- ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(OOO_CHECK_FATAL_ARCHS)))
+ ifeq "$(RUN_MAKE_CHECK)" "y"
+ ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(OOO_CHECK_FATAL_ARCHS)))
IGNORE_MAKE_FAILURES:=
TEST_TIMEOUT:=
- endif
- ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(OOO_SMOKETEST_FATAL_ARCHS)))
+ endif
+ else
+ ifeq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(OOO_SMOKETEST_FATAL_ARCHS)))
IGNORE_MAKE_FAILURES:=
TEST_TIMEOUT:=
+ endif
endif
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
@@ -755,7 +752,7 @@ DEBHELPER_OPTIONS += -Nlibreoffice-core-nogui -Nlibreoffice-calc-nogui -Nlibreof
endif
ifeq "$(AUTOPKGTEST_BUILD)" "y"
-# as above (for build-indep), no need to do two builds here...
+# as above (for binary-indep), no need to do two builds here...
# needs to be here since there is arch-specific rules before
BUILD_NOGUI_PACKAGES=n
# go sure
@@ -1028,7 +1025,9 @@ endif
ifneq (,$(filter xmlsec, $(SYSTEM_STUFF)))
BUILD_DEPS += , libxmlsec1-dev (>= 1.2.35)
ifneq ($(BOOKWORM_BACKPORT),y)
- BUILD_DEPS += , libxmlsec1-dev (>= 1.2.39-5) [$(filter $(OOO_CHECK_ARCHS),$(filter-out i386,$(OOO_32BIT_ARCHS)))] <!nocheck>
+ ifneq (,$(filter $(OOO_CHECK_ARCHS),$(filter-out i386,$(OOO_32BIT_ARCHS))))
+ BUILD_DEPS_ARCH += , libxmlsec1-dev (>= 1.2.39-5) [$(filter $(OOO_CHECK_ARCHS),$(filter-out i386,$(OOO_32BIT_ARCHS)))] <!nocheck>
+ endif
endif
endif
ifneq (,$(filter expat, $(SYSTEM_STUFF)))
@@ -1217,7 +1216,7 @@ endif
BUILD_DEPS_ARCH += , libcppunit-dev (>= 1.15.1-4) [$(filter $(OOO_CHECK_ARCHS),$(OOO_ARCHS))] <!nocheck>
endif
endif
- ifeq ($(MAKECMDGOALS),build-indep)
+ ifeq ($(MAKECMDGOALS),binary-indep)
CONFIGURE_FLAGS_INDEP += --without-cppunit
endif
endif
@@ -1226,9 +1225,6 @@ endif
else
CONFIGURE_FLAGS += --without-junit
endif
- ifeq "$(ENABLE_CHART_TESTS)" "y"
- CONFIGURE_FLAGS += --enable-chart-tests
- endif
ifeq "$(ENABLE_EXPORT_VALIDATION_TESTS)" "y"
BUILD_DEPS += , libofficeotron-java$(OOO_NO_CHECK_ARCHS) <!nocheck !nojava>, libodfvalidator-java$(OOO_NO_CHECK_ARCHS) <!nocheck !nojava>
else
@@ -1412,7 +1408,9 @@ endif
ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
BUILD_DEPS += , liborcus-dev (>= 0.19.1), liborcus-dev (<< 0.20~)
ifneq ($(BOOKWORM_BACKPORT),y)
- BUILD_DEPS += , liborcus-dev (>> 0.19.2-3+b1) [$(filter $(OOO_CHECK_ARCHS),$(filter-out i386,$(OOO_32BIT_ARCHS)))] <!nocheck>
+ ifneq (,$(filter $(OOO_CHECK_ARCHS),$(filter-out i386,$(OOO_32BIT_ARCHS))))
+ BUILD_DEPS_ARCH += , liborcus-dev (>> 0.19.2-3+b1) [$(filter $(OOO_CHECK_ARCHS),$(filter-out i386,$(OOO_32BIT_ARCHS)))] <!nocheck>
+ endif
endif
endif
@@ -2244,17 +2242,6 @@ endif
$(PYTHON) debian/scripts/joinctrl.py < debian/control.new > debian/control.tmp
mv debian/control.tmp debian/control.new
- # make -l10n-fi suggest libreoffice-spellcheck-fi to
- # match myspell-fi and libreoffice-soikko/-voikko
- perl -pi -e 's/myspell-dictionary-fi/myspell-dictionary-fi | libreoffice-spellcheck-fi/' debian/control.new
- perl -pi -e 's/hyphen-fi/hyphen-fi | libreoffice-hyphenation-fi/' debian/control.new
- # similar for -l10n-tr and zemberek
- perl -pi -e 's/myspell-dictionary-tr/myspell-dictionary-tr | libreoffice-spellcheck-tr/' debian/control.new
- perl -pi -e 's/hyphen-tr/hyphen-tr | libreoffice-hyphenation-tr/' debian/control.new
- # and for -l10n-fr and grammalecte
- perl -pi -e 's/myspell-dictionary-fr/myspell-dictionary-fr | libreoffice-spellcheck-fr/' debian/control.new
- perl -pi -e 's/hyphen-fr/hyphen-fr | libreoffice-hyphenation-fr/' debian/control.new
-
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.new
@@ -2637,7 +2624,16 @@ endif
install: $(STAMP_DIR)/install-common $(STAMP_DIR)/install-arch $(STAMP_DIR)/install-indep
install-common: $(STAMP_DIR)/install-common
-$(STAMP_DIR)/install-common:
+ifeq ($(MAKECMDGOALS),binary)
+$(STAMP_DIR)/install-common: $(STAMP_DIR)/build-arch $(STAMP_DIR)/build-indep
+else
+ifeq ($(MAKECMDGOALS),binary-indep)
+$(STAMP_DIR)/install-common: $(STAMP_DIR)/build-indep
+endif
+ifeq ($(MAKECMDGOALS),binary-arch)
+$(STAMP_DIR)/install-common: $(STAMP_DIR)/build-arch
+endif
+endif
dh_testdir
dh_testroot
@@ -2671,44 +2667,34 @@ endif
# we need to do it here. If -kf5 isn't built
# there's no -kf5.install generated, so dh_missing complains later
ifeq "$(ENABLE_QT5)" "y"
- if [ -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt5lo.so ]; then \
- mkdir -p debian/tmp/pkg/libreoffice-qt5/$(OODIR)/program; \
- mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt5lo.so\
- debian/tmp/pkg/libreoffice-qt5/$(OODIR)/program; \
- fi
+ mkdir -p debian/tmp/pkg/libreoffice-qt5/$(OODIR)/program
+ mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt5lo.so\
+ debian/tmp/pkg/libreoffice-qt5/$(OODIR)/program
endif
ifeq "$(ENABLE_QT6)" "y"
- if [ -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt6lo.so ]; then \
- mkdir -p debian/tmp/pkg/libreoffice-qt6/$(OODIR)/program; \
- mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt6lo.so\
- debian/tmp/pkg/libreoffice-qt6/$(OODIR)/program; \
- fi
+ mkdir -p debian/tmp/pkg/libreoffice-qt6/$(OODIR)/program
+ mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_qt6lo.so\
+ debian/tmp/pkg/libreoffice-qt6/$(OODIR)/program
endif
ifeq "$(shell echo $(ENABLE_KF5)$(ENABLE_KF6) | grep -q y && echo true)" "true"
ifeq "$(BUILD_PLASMA)" "y"
- if [ -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libkf$(PLASMA_VERSION)be1lo.so ]; then \
- mkdir -p debian/tmp/pkg/libreoffice-plasma/$(OODIR)/program; \
- mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libkf$(PLASMA_VERSION)be1lo.so \
- debian/tmp/pkg/libreoffice-plasma/$(OODIR)/program; \
- fi
+ mkdir -p debian/tmp/pkg/libreoffice-plasma/$(OODIR)/program
+ mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libkf$(PLASMA_VERSION)be1lo.so \
+ debian/tmp/pkg/libreoffice-plasma/$(OODIR)/program
# remove other ones maybe built by --enable-kfX
rm -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/libkf*be1lo.so
else
rm -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/libkf*be1lo.so
endif
ifeq "$(ENABLE_KF5)" "y"
- if [ -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf5lo.so ]; then \
- mkdir -p debian/tmp/pkg/libreoffice-kf5/$(OODIR)/program; \
- mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf5lo.so \
- debian/tmp/pkg/libreoffice-kf5/$(OODIR)/program; \
- fi
+ mkdir -p debian/tmp/pkg/libreoffice-kf5/$(OODIR)/program
+ mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf5lo.so \
+ debian/tmp/pkg/libreoffice-kf5/$(OODIR)/program
endif
ifeq "$(ENABLE_KF6)" "y"
- if [ -f debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf6lo.so ]; then \
- mkdir -p debian/tmp/pkg/libreoffice-kf6/$(OODIR)/program; \
- mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf6lo.so \
- debian/tmp/pkg/libreoffice-kf6/$(OODIR)/program; \
- fi
+ mkdir -p debian/tmp/pkg/libreoffice-kf6/$(OODIR)/program
+ mv debian/tmp/pkg/libreoffice-kde/$(OODIR)/program/libvclplug_kf6lo.so \
+ debian/tmp/pkg/libreoffice-kf6/$(OODIR)/program
endif
endif
@@ -2953,11 +2939,9 @@ ifeq "$(ENABLE_JAVA)" "y"
endif
ifeq "$(ENABLE_FIREBIRD)" "y"
- if [ -f $(PKGDIR)-common/$(OODIR)/share/registry/firebird_sdbc.xcd ]; then \
- mkdir -p $(PKGDIR)-sdbc-firebird/$(OODIR)/share/registry; \
- mv $(PKGDIR)-common/$(OODIR)/share/registry/firebird_sdbc.xcd \
- $(PKGDIR)-sdbc-firebird/$(OODIR)/share/registry; \
- fi
+ mkdir -p $(PKGDIR)-sdbc-firebird/$(OODIR)/share/registry
+ mv $(PKGDIR)-common/$(OODIR)/share/registry/firebird_sdbc.xcd \
+ $(PKGDIR)-sdbc-firebird/$(OODIR)/share/registry
endif
ifeq "$(PACKAGE_SDK)" "y"
@@ -4092,7 +4076,7 @@ endif
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
-$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/maintscripts
+$(STAMP_DIR)/binary-arch: $(STAMP_DIR)/prepare $(STAMP_DIR)/build-arch $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/maintscripts
dh_testdir
dh_testroot
@@ -4355,8 +4339,8 @@ endif
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
+binary-indep: $(STAMP_DIR)/binary-indep
+$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/prepare $(STAMP_DIR)/build-indep $(STAMP_DIR)/install-indep debian/control $(STAMP_DIR)/maintscripts $(STAMP_DIR)/langpacks
ifneq ($(DEB_HOST_ARCH),$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo "For uploads with binary-all packages, please use arches where Java is enabled"
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
index 53ac5da47d..cdfd4785b9 100644
--- a/debian/source/include-binaries
+++ b/debian/source/include-binaries
@@ -7,5 +7,3 @@ tarballs/pdfium-6179.tar.bz2
tarballs/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz
tarballs/dtoa-20180411.tgz
tarballs/Java-WebSocket-1.5.4.tar.gz
-emfio/qa/cppunit/emf/data/TestEmfPlusDrawCurve.emf
-emfio/qa/cppunit/emf/data/TestEmfPlusFillClosedCurve.emf
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 87d017cd05..dcfd284ed9 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -15,10 +15,6 @@ libreoffice source: source-is-missing [sw/qa/extras/htmlimport/data/image-lazy-r
libreoffice source: source-is-missing [sw/qa/extras/htmlimport/data/tdf142781.html]
# <META NAME="GENERATOR" CONTENT="OpenOffice.org 2.3 (Linux)">
libreoffice source: source-is-missing [sw/qa/extras/layout/data/forcepoint94.html]
-# similar, this is NOT minified.
-libreoffice source: source-is-missing [helpcontent2/help3xsl/prism.js]
-# no, it isn't. the one is always, the other is for tests (<!nocheck>)!
-libreoffice source: redundant-build-prerequisites libmwaw-dev (>= 0.3.1), libmwaw-dev (>= 0.3.21)
# hrmpf. of course they are there
# $ ls tarballs/*
# tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip tarballs/dtoa-20180411.tgz
@@ -33,11 +29,6 @@ libreoffice source: superfluous-file-pattern tarballs/skia* [debian/copyright:13
# patched in by us
libreoffice source: superfluous-file-pattern wizards/source/access2base/access2base.html [debian/copyright:203]
libreoffice source: source-is-missing [wizards/source/access2base/access2base.html]
-# this is 盖闻天地之数，有十二万九千六百岁为一元。(UTF-8) in GB18030 as verifiable by
-# recode GB18030..UTF-8 sw/qa/extras/txtimport/data/GB18030.txt. Thus this *is* the source
-# and not a windows binary at all.
-# Needs to be GB18030 for sw/qa/extras/txtimport/txtimport.cxx - testTdf92161_gb18030
-libreoffice source: source-contains-prebuilt-windows-binary [sw/qa/extras/txtimport/data/GB18030.txt]
# two licenses..
libreoffice source: duplicate-globbing-patterns helpcontent2/help3xsl/polyfills.js (lines 232 236) [debian/copyright]
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 18:24:35 +0000