[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-3-113-g35fa053
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 35fa0530b95bbeec86feb07b48dbedf0616d4a2f
Merge: 4d874586219d7169e2813fc0660bdd4f39a87281 fc9c25dc1f2da6ac49161765378c80417dd1405f
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jul 6 01:02:14 2011 +0200
Merge remote branch 'origin/master' into debian-experimental-3.4.0
diff --combined changelog
index 515ee9d,c299927..b96f9c0
--- a/changelog
+++ b/changelog
@@@ -1,40 -1,15 +1,47 @@@
-libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
+libreoffice (1:3.4.1-1) UNRELEASED; urgency=low
+ * new upstream release
+ - handles various table columns differing in case correct
+ (closes: #617596)
+ - should fix embedding of (some) fonts in PDFs (closes: #616117)
+ - (still) use libreoffice-build for now; not tagged,
+ use 317da212d159685a03607ff62c99b6ef8d5ea928
+
+ * debian/patches/debian-debug.diff: readd option to build with small
+ symbols (removed upstream), otherwise we get a too big -dbg (760M, 2G I-S)
+ * debian/patches/update-debian-opt.diff: call dpkg-buildflags correctly
-
+
+ * debian/rules:
+ - bump build-dep on libmdds-dev to >= 0.5.0
+ - build-depend on libgraphite2-dev instead of libgraphite-dev
+ - update for new extension and mingw configure switches
+ - temporarily build only for en-US
+ - temprarily don't install gengal, not built anymore since the switch to
+ GNU Make...
+ - install .component files to registered-components
+ - build-dep on translate-toolkit, now needed for translations module
+ * debian/control.sdk.in, debian/rules:
+ - stop building with STLport on i386, just create a symlink in ure.
+ Should suffice for compat with binary-only OOo extensions
+ * debian/control.in, debian/rules:
+ - the script providers are now extensions. split js and bsh out into
+ extra packages (also closes: #603595)
+ * debian/uno-libs3.symbols: update
+ * debian/rules, debian/patches/packcomponents-remove-split-components.diff:
+ remove evoab, binfilter and kdeab deregistering into patch patching
+ the new packcomponents
+ * debian/shell-lib-components.sh: add new update_services_rdb() merging
+ "default" services.rdb and the .component files from registered-components
+ * debian/libreoffice-common.triggers.in, libreoffice-*.p*.in:
+ new trigger running update_services_rdb, remove obsolete maintainer scripts
+ * debian/changelog: mention VU#953183 in 1:3.3.3-1
+ * debian/control.in:
+ - fix description: s/libreoffice-hyphenation/hyphen/,
+ s/libreoffice-thesaurus/mythes/
+ * debian/rules:
+ - don't try to change libreoffice-base when we don't built it
- -- Rene Engelhard <rene@debian.org> Tue, 05 Jul 2011 08:14:16 +0000
+ -- Rene Engelhard <rene@debian.org> Wed, 06 Jul 2011 00:38:09 +0200
libreoffice (1:3.3.3-4) unstable; urgency=low
@@@ -42,8 -17,9 +49,14 @@@
* debian/rules:
- bump javahelper build-dep to (>= 0.35)
++<<<<<<< HEAD
+ - run s/ure (>= ${source:Version})/ure//g on -officebeans .substvars
+ to not have unsatisfiable dependencies on ure (other versioning scheme)
++=======
+ - exclude ure for jh_depends. Readd it manually for -officebean. jh_depends
+ would add a ure (>= ${source:Version}) which doesn't match the ure
+ versioning scheme.
++>>>>>>> origin/master
-- Rene Engelhard <rene@debian.org> Fri, 01 Jul 2011 16:37:17 +0000
@@@ -72,7 -48,7 +85,7 @@@ libreoffice (1:3.3.3-2) unstable; urgen
- move evolocal.odb into -evolution proper
- use OpenJDK on mips(el), seems to work. (ia64 still SIGSEGVs)
* debian/libreoffice-filter-binfilter.links.in: actually create symlink
- for libbindet*so in registered-components
+ for libbindet*so in registered-components
* debian/control.in:
- move libpaper-utils from Suggests to Recommends
- fix libreoffice Description: - -filter-binfilter is not installed
@@@ -80,20 -56,22 +93,22 @@@
* debian/control.in, debian/rules: move libpq-dev builddep to a
conditional
* debian/rules, debian/control*in:
- - run jh_depends and add ${java:Depends} where we have Java
+ - run jh_depends and add ${java:Depends} where we have Java
-- Rene Engelhard <rene@debian.org> Wed, 29 Jun 2011 10:03:21 +0200
libreoffice (1:3.3.3-1) unstable; urgency=medium
* new upstream release
+ - fixes VU#953183: 'Lotus Word Pro' document import filter
+ multiple vulnerabilities
[ Rene Engelhard ]
* debian/patches/disable-optional-outplace-ole.diff: as name says; makes
toolbars work in e.g. Base edit forms (closes: #617319)
* debian/rules:
- - disable -sdbc-postgresql until fixed (closes: #620100)
+ - disable -sdbc-postgresql until fixed (closes: #620100)
- stop moving vbaevents*.uno.so to -calc. Move libvbaswobj*uno.so
to -writer
- make -l10n-sw (if enabled) depend on locales (>= 2.13-5)
diff --combined control
index ec15592,93e1180..6df6286
--- a/control
+++ b/control
@@@ -3,9 -3,9 +3,15 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
++<<<<<<< HEAD
+Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite2-dev (>= 0.9.3), libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), libcppunit-dev (>= 1.12), tcsh, openjdk-6-jdk [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s39
0 s390x sparc], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.35), xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64
i386 ia64 kfreebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev (>= 0.5.0), libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-
dev
+Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge, translate-toolkit
+Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~), libstlport4.6-dev
++=======
+ Build-Depends: lsb-release, bzip2, bison, flex | flex-old, libxaw7-dev, unzip, zip, autoconf, automake, sharutils, pkg-config, libfontconfig1-dev, libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, po-debconf, bc, wget | curl, dpkg-dev (>= 1.15.1), libgl1-mesa-dev [!armel !mips !mipsel], libglu1-mesa-dev [!armel !mips !mipsel], libpoppler-dev (>= 0.8.0), libgraphite-dev, libtextcat-dev (>= 2.2-8), libcurl4-gnutls-dev, libssl-dev, libdb-dev, python (>= 2.6.6-3+squeeze4), python-dev, debhelper (>= 7.2.3~), epm, libcppunit-dev (>= 1.12), openjdk-6-jdk [alpha amd64 armel armhf i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc
], gcj-native-helper [!powerpc !powerpcspe !ppc64], libgcj-common (>= 1:4.4.1) [!powerpc !powerpcspe !ppc64], ant (>= 1.7.0), ant-optional (>= 1.7.0), gcc-mingw32, mingw32-runtime, libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java, libservlet2.5-java, libbase-java-openoffice.org [!armel], libsac-java [!armel], libxml-java-openoffice.org [!armel], libflute-java-openoffice.org [!armel], libpentaho-reporting-flow-engine-java-openoffice.org [!armel], liblayout-java-openoffice.org [!armel], libloader-java-openoffice.org [!armel], libformula-java-openoffice.org [!armel], librepository-java-openoffice.org [!armel], libfonts-java-openoffice.org [!armel], libserializer-java-openoffice.org [!armel], libcommons-logging-java, libservlet2.5-java, javahelper (>= 0.35), xulrunner-dev, libnss3-dev (>= 3.12.3), dmake (>= 1:4.11), mono-devel (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libmono-dev (>= 2.4.2.3) [amd64 i386 ia64 kfr
eebsd-amd64 kfreebsd-i386], mono-utils (>= 2.4.2.3) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], cli-common-dev (>= 0.5.7) [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386], libhunspell-dev (>= 1.1.5-2), libhyphen-dev (>= 2.4), libstlport4.6-dev (>= 4.6.2-3) [i386], libboost-dev (>= 1.38), libmdds-dev, libvigraimpex-dev, libwpd-dev (>= 0.9.0), libmythes-dev (>= 2:1.2), libwps-dev (>= 0.2.0), libwpg-dev (>= 0.2.0), libicu-dev (>= 4.0), libxslt1-dev, libcairo2-dev, kdelibs5-dev (>= 4:4.3.4), libqt4-dev (>= 4.5), libmysqlclient-dev, libmysqlcppconn-dev (>= 1.1.0~r791), libebook1.2-dev [!armel], libxrandr-dev, liblucene2-java (>= 2.3.2), libhsqldb-java (>> 1.8.0.10), bsh (>= 2.0b4), liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1), libsuitesparse-dev (>= 1:3.4.0), libdbus-glib-1-dev (>= 0.60), libgstreamer-plugins-base0.10-dev, libneon27-gnutls-dev, librdf0-dev (>= 1.0.8), libgtk2.0-dev (>= 2.10), libgnomevfs2-dev, libgconf2-dev, libldap2-dev
+ Build-Depends-Indep: fdupes, xml-core, imagemagick, fontforge
+ Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<< 1.3.9~), qt3-dev-tools, ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], ant (= 1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64], libmdds-dev (>= 0.4.0), base-files (= 6.0), base-files (= 6.0squeeze1), libhsqldb-java (>= 1.8.1~)
++>>>>>>> origin/master
Standards-Version: 3.9.1
XS-Python-Version: current
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
@@@ -120,6 -120,7 +126,6 @@@ Breaks: libreoffice-style-crystal (<< 1
libreoffice-style-tango (>= 1:${next-basis-version}~),
libreoffice-style-hicontrast (>= 1:${next-basis-version}~),
libreoffice-style-galaxy (>= 1:${next-basis-version}~),
- libreoffice-style-andromeda (>= 1:${next-basis-version}~)
Replaces: openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
@@@ -131,6 -132,7 +137,6 @@@
Package: libreoffice-java-common
Architecture: all
Depends: libreoffice-common, ${java:Depends}, ${misc:Depends}
-Suggests: ${common-bsh-depends}
Description: office productivity suite -- arch-independent Java support files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -291,6 -293,20 +297,6 @@@ Description: office productivity suite
MS Windows (tm) and when not using GNOME or KDE, needs to be manually
enabled in the LibreOffice option menu.
-Package: libreoffice-style-andromeda
-Architecture: all
-Depends: ${misc:Depends}, libreoffice-core
-Provides: libreoffice-style
-Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
-Description: office productivity suite -- Andromeda (Classic) symbol style
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the "Andromeda" symbol style from Sun; the "Classic"
- symbol style used by LibreOffice before 3.0 on MS Windows (tm) and when
- not using GNOME or KDE, needs to be manually enabled in the LibreOffice
- option menu.
-
Package: libreoffice-gtk
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
@@@ -338,7 -354,7 +344,7 @@@ Description: office productivity suite
to E-Mail.
Package: python-uno
-Provides: ${python:Provides}
+Provides: ${python:Provides}, libreoffice-script-provider-python
XB-Python-Version: ${python:Versions}
Section: python
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
@@@ -363,6 -379,23 +369,6 @@@ Description: office productivity suite
This package contains the LibreOffice Office Bean for embedding
LibreOffice in custom Java applications.
-Package: libreoffice-filter-binfilter
-Section: misc
-Architecture: alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-Description: office productivity suite -- legacy filters (e.g. StarOffice 5.2)
- LibreOffice is a full-featured office productivity suite that provides
- a near drop-in replacement for Microsoft(R) Office.
- .
- This package contains the "binfilters", legacy filters for
- - the old StarOffice 5.2 formats
- - StarWriter 1.0/2.0
- - StarWriter/DOS
- - *Writer* filters for
- + Excel
- + Lotus
-
Package: libreoffice-filter-mobiledev
Section: misc
Architecture: all
@@@ -391,38 -424,6 +397,38 @@@ Description: office productivity suite
This package contains the Document Type Definition (DTD) of the
OpenOffice.org 1.x(!) XML file format.
+Package: libreoffice-script-provider-bsh
+Architecture: all
+Section: java
+Depends: libreoffice-java-common, ${java-runtime-depends}, ${bsh-depends}
+Replaces: libreoffice-java-common (<< 1:3.4~)
+Description: BeanShell script support provider for LibreOffice scripting framework
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The Scripting Framework allows LibreOffice users to write and run macros
+ in multiple languages including LibreOffice Basic, Python, Java, BeanShell
+ and JavaScript. These macros can then be assigned to menus, toolbars,
+ keyboard shortcuts, events and embedded objects.
+ .
+ This package contains the script provider to support BeanShell.
+
+Package: libreoffice-script-provider-js
+Architecture: all
+Section: web
+Replaces: libreoffice-common (<< 1:3.4~)
+Depends: libreoffice-java-common, ${java-runtime-depends}
+Description: JavaScript script support provider for LibreOffice scripting framework
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ The Scripting Framework allows LibreOffice users to write and run macros
+ in multiple languages including LibreOffice Basic, Python, Java, BeanShell
+ and JavaScript. These macros can then be assigned to menus, toolbars,
+ keyboard shortcuts, events and embedded objects.
+ .
+ This package contains the script provider to support JavaScript.
+
Package: libreoffice-l10n-af
Section: localization
Architecture: all
@@@ -442,8 -443,7 +448,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -468,8 -468,7 +473,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -494,8 -493,7 +498,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -520,20 -518,19 +523,19 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: libreoffice-l10n-be-by
+Package: libreoffice-l10n-be
Section: localization
Architecture: all
Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-be
Provides: libreoffice-l10n-${help-l10n-virtual-version}
-Suggests: hunspell-dictionary-be-by | myspell-dictionary-be-by, hyphen-be-by, mythes-be-by, libreoffice-help-be-by
+Suggests: hunspell-dictionary-be | myspell-dictionary-be, hyphen-be, mythes-be, libreoffice-help-be
Description: office productivity suite -- Belarussian language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@@ -546,8 -543,7 +548,7 @@@
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -572,8 -568,7 +573,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -598,8 -593,7 +598,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -624,8 -618,7 +623,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -650,8 -643,7 +648,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -676,8 -668,7 +673,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -702,8 -693,7 +698,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -728,8 -718,7 +723,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -754,8 -743,7 +748,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -780,8 -768,7 +773,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -806,8 -793,7 +798,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -832,8 -818,7 +823,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -858,8 -843,7 +848,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -884,8 -868,7 +873,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -910,8 -893,7 +898,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -936,8 -918,7 +923,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -962,8 -943,7 +948,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -988,8 -968,7 +973,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1014,8 -993,7 +998,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1040,8 -1018,7 +1023,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1066,8 -1043,7 +1048,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1092,8 -1068,7 +1073,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1118,8 -1093,7 +1098,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1144,8 -1118,7 +1123,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1170,8 -1143,7 +1148,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1196,8 -1168,7 +1173,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1222,8 -1193,7 +1198,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1248,8 -1218,7 +1223,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1274,8 -1243,7 +1248,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1300,8 -1268,7 +1273,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1326,8 -1293,7 +1298,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1352,8 -1318,7 +1323,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1378,8 -1343,7 +1348,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1404,8 -1368,7 +1373,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1430,8 -1393,7 +1398,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1456,8 -1418,7 +1423,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1482,8 -1443,7 +1448,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1508,8 -1468,7 +1473,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1534,8 -1493,7 +1498,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1560,8 -1518,7 +1523,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1586,8 -1543,7 +1548,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1612,8 -1568,7 +1573,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1638,8 -1593,7 +1598,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1664,8 -1618,7 +1623,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1690,8 -1643,7 +1648,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1716,8 -1668,7 +1673,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1742,34 -1693,32 +1698,32 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
-Package: libreoffice-l10n-ns
+Package: libreoffice-l10n-nso
Section: localization
Architecture: all
-Depends: locales (>= 2.3.5-12) | belocs-locales-data | locales-all, ${misc:Depends}
-Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ns
+Depends: locales | belocs-locales-data | locales-all, ${misc:Depends}
+Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-nso
Provides: libreoffice-l10n-${help-l10n-virtual-version}
-Suggests: hunspell-dictionary-ns | myspell-dictionary-ns, hyphen-ns, mythes-ns, libreoffice-help-ns
-Description: office productivity suite -- Northernsotho language package
+Suggests: hunspell-dictionary-nso | myspell-dictionary-nso, hyphen-nso, mythes-nso, libreoffice-help-nso
+Description: office productivity suite -- Northern_sotho 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
- Northernsotho.
+ Northern_sotho.
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.
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1794,8 -1743,7 +1748,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1820,8 -1768,7 +1773,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1846,8 -1793,7 +1798,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1872,8 -1818,7 +1823,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1898,8 -1843,7 +1848,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1924,8 -1868,7 +1873,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1950,8 -1893,7 +1898,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -1976,8 -1918,7 +1923,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2002,8 -1943,7 +1948,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2028,8 -1968,7 +1973,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2054,8 -1993,7 +1998,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2080,8 -2018,7 +2023,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2106,8 -2043,7 +2048,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2132,8 -2068,7 +2073,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2158,8 -2093,7 +2098,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2184,8 -2118,7 +2123,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2210,8 -2143,7 +2148,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2236,8 -2168,7 +2173,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2262,8 -2193,7 +2198,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2288,8 -2218,7 +2223,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2314,8 -2243,7 +2248,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2340,8 -2268,7 +2273,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2366,8 -2293,7 +2298,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2392,8 -2318,7 +2323,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2418,8 -2343,7 +2348,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2444,8 -2368,7 +2373,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2470,8 -2393,7 +2398,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2496,8 -2418,7 +2423,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2522,8 -2443,7 +2448,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2548,8 -2468,7 +2473,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2574,8 -2493,7 +2498,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2600,8 -2518,7 +2523,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -2626,8 -2543,7 +2548,7 @@@ Description: office productivity suite
.
Spelling dictionaries, hyphenation patterns, thesauri and help are not
included in this package. There are some available in separate packages
- (myspell-*, libreoffice-hyphenation-*, libreoffice-thesaurus-*,
- libreoffice-help-*)
+ (myspell-*, hyphen-*, mythes-*, libreoffice-help-*)
.
If you just want to be able to spellcheck etc. in other languages, you can
install extra dictionaries/hyphenation patterns/thesauri independently of
@@@ -3399,7 -3315,7 +3320,7 @@@ Description: office productivity suite
Package: libreoffice-dev
Section: devel
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${dev-stl-depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Recommends: dmake, g++, ${java-runtime-depends}, ${java-common-depends}
Suggests: libreoffice-dev-doc, libmythes-dev, c-shell
Description: office productivity suite -- SDK
@@@ -3465,7 -3381,7 +3386,7 @@@ Description: MySQL Connector extension
Package: libreoffice-evolution
Architecture: alpha amd64 armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: gnome
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>= 1:3.4.0~), libreoffice-base, ${shlibs:Depends}, ${libebook-dep}, ${misc:Depends}
Recommends: evolution
Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
Replaces: libreoffice-common (<< 1:3.3.3-2~)
@@@ -3476,20 -3392,3 +3397,20 @@@ Description: office productivity suite
This package allows LibreOffice to access Evolution address books.
You need to install evolution separately.
+Package: libreoffice-filter-binfilter
+Section: misc
+Architecture: alpha amd64 hppa i386 ia64 powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-common (>= 1:3.4.0~), ${shlibs:Depends}, ${misc:Depends}
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Description: office productivity suite -- legacy filters (e.g. StarOffice 5.2)
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the "binfilters", legacy filters for
+ - the old StarOffice 5.2 formats
+ - StarWriter 1.0/2.0
+ - StarWriter/DOS
+ - *Writer* filters for
+ + Excel
+ + Lotus
+
diff --combined rules
index f4ceefc,4ebdf4f..5ec45b0
--- a/rules
+++ b/rules
@@@ -24,10 -24,10 +24,10 @@@ BASE_VERSION:=$(shell echo $(SOURCE_VER
BINARY_VERSION=$(SOURCE_VERSION)
#BINARY_VERSION=1:2.4.0-$(shell dpkg-parsechangelog | grep urgency \
| awk '{print $$2}' | sed -e s/"("// -e s/")"// | cut -d"-" -f2)
-HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
-#HELP_L10N_VIRTUAL_VERSION:=3.3
+#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(UPSTREAM_VERSION) | cut -d: -f2 | tr [~] [\\-])
+HELP_L10N_VIRTUAL_VERSION:=3.4
#VER:=3
-OOVER:=3.3
+OOVER:=3.4
BASIS_VERSION:=$(OOVER)
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
NEXT_BASIS_VERSION:=$(NEXT_OOVER)
@@@ -77,12 -77,12 +77,12 @@@ export QUILT_OPTIONS="-p1 -F0
# work around tcsh bugs.debian.org/339034: tcsh: Unknown colorls variable `su'
unexport LS_COLORS
-MWS=OOO330
-MILESTONE=m19
+MWS=OOO340
+MILESTONE=m1
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
-OOO_BUILD_BRANCH=libreoffice-3-3-3
-OOO_BUILD_VERSION=3.3.3.1
+OOO_BUILD_BRANCH=libreoffice-3-4-1
+OOO_BUILD_VERSION=3.4.1.3
# in ooo-build releases the same as OOO_BUILD_VERSION
OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
OOO_BUILD_TAG=libreoffice-$(OOO_BUILD_TARBALL_VERSION)
@@@ -109,9 -109,6 +109,9 @@@ BUILD_DEPS
SYSTEM_STUFF = dicts
BUILD_PYUNO=y
+ifeq "$(BUILD_PYUNO)" "y"
+ ENABLE_SCRIPT_PROVIDER_PYTHON=y
+endif
PYTHON_HELPER=dh_python2
# THIS IS ONLY FOR TESTING. When building against a specified pythonX.Y
# this will work inside OOo but *not* from outside OOo unless the user
@@@ -155,6 -152,8 +155,6 @@@ LIBALTLINUXHYPH_MINVER= (>= 0.1.1-11
LIBHYPHEN_MINVER= (>= 2.4)
USE_AGG=n
# SYSTEM_STUFF += agg
-USE_STLPORT=n
-USE_SYSTEM_STLPORT=y
SYSTEM_STUFF += boost
BOOST_VERSION=default
ifeq "$(BOOST_VERSION)" "default"
@@@ -208,8 -207,16 +208,8 @@@ USE_OOO_BUILD_DESKTOPS=
PACKAGE_SDK=y
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "openjdk"
- ifneq "$(ARCH)" "sparc"
- RUN_SMOKETEST=y
- else
- RUN_SMOKETEST=n
- endif
- ifneq (,$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
- RUN_SUBSEQUENT_TESTS=y
- else
- RUN_SUBSEQUENT_TESTS=n
- endif
+ RUN_SMOKETEST=n
+ RUN_SUBSEQUENT_TESTS=y
else
ifneq ($(ON_BUILDD),y)
RUN_SMOKETEST=n
@@@ -239,19 -246,9 +239,19 @@@ ENABLE_OPENGL=
SYSTEM_STUFF += openssl
NEW_DPKG_SHLIBDEPS=y
ifeq "$(ENABLE_JAVA)" "y"
- ENABLE_REPORTDESIGN=y
+ ifeq (,$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
+ ENABLE_REPORTDESIGN=y
+ SYSTEM_STUFF += jfreereport
+ else
+ ENABLE_REPORTDESIGN=n
+ endif
ENABLE_MEDIAWIKI=y
- SYSTEM_STUFF += jfreereport apache-commons
+ SYSTEM_STUFF += apache-commons
+ # if you change these, add something like disable-rhino.diff and/or remove it as long
+ # as we have the gcj/ant multiarch braekage. See
+ # http://lists.debian.org/debian-java/2011/06/msg00108.html and replies
+ ENABLE_SCRIPT_PROVIDER_BSH=y
+ ENABLE_SCRIPT_PROVIDER_JS=n
else
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
@@@ -285,7 -282,7 +285,7 @@@ SYSTEM_STUFF += cppuni
# otherwise
INTERNAL_STDLIBS=n
DEFAULT_IMAGE=galaxy
-IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen classic
+IMAGES:=$(DEFAULT_IMAGE) crystal hicontrast tango oxygen
ENABLE_MYSQLNATIVE=y
# cannot be disabled, unless you have a internal MySQL somewhere :-)
SYSTEM_STUFF += mysql mysql-cppconn
@@@ -313,8 -310,7 +313,8 @@@ CONFIGURE_FLAGS= --disable-post-install
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--with-additional-sections="$(ADDITIONAL_SECTIONS)" \
--enable-broffice \
- --with-extension-integration
+ --with-extension-integration \
+ --disable-online-update
ifeq "$(USE_SOURCE_TARBALLS)" "y"
CONFIGURE_FLAGS += --without-git
@@@ -345,7 -341,7 +345,7 @@@ PLATFORMID := $(shell grep PLATFORMID d
# ABI-compatability
OOO_STLPORT_ARCHS= i386
ifeq "$(ARCH)" "i386"
- USE_STLPORT=y
+ LINK_TO_STLPORT=y
endif
ifeq "$(ENABLE_OPENGL)" "y"
@@@ -443,7 -439,7 +443,7 @@@ endi
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes libtextcat, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libtextcat graphite, $(SYSTEM_STUFF))
JUNIT_MIN_VER=
endif
@@@ -502,19 -498,22 +502,19 @@@ ifneq "$(PACKAGE_SDK)" "y
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
- CONFIGURE_FLAGS += --enable-minimizer
+ CONFIGURE_FLAGS += --enable-ext-presenter-minimizer
endif
ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- CONFIGURE_FLAGS += --enable-presenter-console
+ CONFIGURE_FLAGS += --enable-ext-presenter-console
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
- CONFIGURE_FLAGS += --enable-pdfimport
+ CONFIGURE_FLAGS += --enable-ext-pdfimport
BUILD_DEPS += , libpoppler-dev (>= 0.8.0)
endif
ifeq "$(ENABLE_GRAPHITE)" "y"
ifneq (,$(filter graphite, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libgraphite-dev
- ifeq "$(USE_STLPORT)" "y"
- ADDITIONAL_SECTIONS += SystemBitsWithSTLport
- endif
+ BUILD_DEPS += , libgraphite2-dev (>= 0.9.3)
endif
else
CONFIGURE_FLAGS += --disable-graphite
@@@ -549,6 -548,7 +549,6 @@@ ifneq "$(BUILD_DBG_PACKAGE)" "y
else
# -g gives a far too big deb (>400M, ca. 1GB I-S)
ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- # ooo-build defaults to --enable-symbols (without SMALL)
SMALL_SYMBOLS = n
else
SMALL_SYMBOLS = y
@@@ -563,11 -563,6 +563,11 @@@ endi
# Small symbols?
ifeq "$(SMALL_SYMBOLS)" "y"
CONFIGURE_FLAGS += --enable-symbols=SMALL
+ CFLAGS := $(shell echo $(CFLAGS) | sed -e "s/-g/-g1/")
+ CXXFLAGS := $(shell echo $(CXXFLAGS) | sed -e "s/-g/-g1/")
+export CFLAGS CXXFLAGS
+else
+ CONFIGURE_FLAGS += --enable-symbols
endif
ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@@ -618,6 -613,9 +618,6 @@@ ifeq "$(RUN_TESTTOOL)" "y
endif
ifneq (,$(filter cppunit, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcppunit-dev (>= 1.12)
- ifeq "$(USE_STLPORT)" "y"
- ADDITIONAL_SECTIONS += SystemBitsWithSTLport
- endif
endif
ifeq "$(RUN_SUBSEQUENT_TESTS)" "y"
BUILD_DEPS += , tcsh
@@@ -642,18 -640,18 +642,18 @@@ ifneq "$(BUILD_ONLY_EN_US)" "y
# one to that gid_Module_Root always is english and the other langpacks
# have gid_Module_Root.$iso
#ISOS=$(shell $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i all')
- ISOS:=en-US af ar as ast be-BY bg bn br bs ca cs cy da de dz el \
+ ISOS:=en-US af ar as ast be bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
- ka km ko ku lt lv mk mn ml mr nb ne nl nn nr ns oc om or \
+ ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
#HELPISOS:=$(shell $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i all')
HELPISOS:=en-US ca cs da de dz el en-GB es et eu fi fr gl hi hu it \
ja km ko nl om pl pt pt-BR ru sk sl sv zh-CN zh-TW
#LANGPACKISOS:=$(shell $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i all')
- LANGPACKISOS:=en-US af ar as ast be-BY bg bn br bs ca cs cy da de dz el \
+ LANGPACKISOS:=en-US af ar as ast be bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja \
- ka km ko ku lt lv mk mn ml mr nb ne nl nn nr ns oc om or \
+ ka km ko ku lt lv mk mn ml mr nb ne nl nn nr nso oc om or \
pa-IN pl pt pt-BR ro ru rw si sk sl sr ss st sv \
ta te tg th tn tr ts ug uk uz ve vi xh zh-CN zh-TW zu
endif
@@@ -698,6 -696,7 +698,6 @@@ ifeq "$(ENABLE_JAVA)" "y
endif
TEST_JAVA_HOME=$(JAVA_HOME)
ifeq "$(BUILD_JARS_NATIVE)" "y"
- CONFIGURE_FLAGS += --enable-gcjaot
BUILD_DEPS += , gcj-native-helper$(OOO_NO_GCJ_ARCHS), libgcj-common (>= 1:4.4.1)$(OOO_NO_GCJ_ARCHS)
else
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
@@@ -742,14 -741,11 +742,14 @@@ export JAVA_HOM
ifeq "$(DIST)" "Debian"
BUILD_DEPS += , gcc-mingw32$(OOO_NO_JAVA_ARCHS), mingw32-runtime$(OOO_NO_JAVA_ARCHS)
CONFIGURE_FLAGS += --enable-build-unowinreg
- CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
+ CONFIGURE_FLAGS += --with-mingw=i586-mingw32msvc-g++
+ # this normally is done in configure with sed -e s/[cg]++/strip/ but that somehow
+ # doesn't work. Workaround. FIXME.
+export MINGWSTRIP = i586-mingw32msvc-strip
endif
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
- CONFIGURE_FLAGS += --enable-wiki-publisher
+ CONFIGURE_FLAGS += --enable-ext-wiki-publisher
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
MEDIAWIKI_BUILD_DEPS += , libcommons-codec-java$(OOO_NO_JAVA_ARCHS), libcommons-httpclient-java$(OOO_NO_JAVA_ARCHS), libcommons-lang-java$(OOO_NO_JAVA_ARCHS), libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
MEDIAWIKI_JAR_DEPENDS := , libcommons-codec-java, libcommons-httpclient-java, libcommons-lang-java, libcommons-logging-java
@@@ -774,13 -770,13 +774,13 @@@
CONFIGURE_FLAGS += --with-system-servlet-api --with-servlet-api-jar=$(shell dpkg -L `dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }'` | grep servlet-api.*\.jar$ | head -n 1)
BUILD_DEPS += , $(shell dpkg -s libcommons-logging-java | grep Suggests | cut -d"," -f1 | sed -e s/^\ // | awk '{ print $$2 }')
endif
- CONFIGURE_FLAGS += --enable-report-builder
+ CONFIGURE_FLAGS += --enable-ext-report-builder
endif
OOO_OFFICEBEAN_DEP = libreoffice$(VER)-officebean
BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)
else
CONFIGURE_FLAGS += --without-java
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-officebean -Nlibreoffice$(VER)-java-common -Nlibreoffice$(VER)-filter-mobiledev -Nlibreoffice$(VER)-gcj
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-officebean -Nlibreoffice$(VER)-java-common -Nlibreoffice$(VER)-filter-mobiledev -Nlibreoffice$(VER)-gcj -Nlibreoffice$(VER)-script-provider-bsh -Nlibreoffice$(VER)-script-provider-js
endif
ifneq "$(MOZILLA)" ""
@@@ -860,8 -856,19 +860,8 @@@ ifeq "$(USE_AGG)" "y
endif
ifneq "$(OOO_STLPORT_ARCHS)" ""
- ifeq "$(USE_SYSTEM_STLPORT)" "y"
LIBSTLPORT_MINVER= (>= 4.6.2-3)
BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_STLPORT_ARCHS)]
- DEV_STL_DEPENDS=, libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_STLPORT_ARCHS)]
- endif
-endif
-ifneq "$(USE_STLPORT)" "y"
- CONFIGURE_FLAGS += --without-stlport
-else
- CONFIGURE_FLAGS += --with-stlport
- ifeq "$(USE_SYSTEM_STLPORT)" "y"
- CONFIGURE_FLAGS+= --with-stlport=$(CURDIR)/stlport
- endif
endif
ifneq (,$(filter boost, $(SYSTEM_STUFF)))
@@@ -883,7 -890,7 +883,7 @@@
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev
+ BUILD_DEPS += , libmdds-dev (>= 0.5.0)
endif
ifneq (,$(filter vigra, $(SYSTEM_STUFF)))
@@@ -953,7 -960,7 +953,7 @@@ els
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
- CONFIGURE_FLAGS += --enable-mysql-connector
+ CONFIGURE_FLAGS += --enable-ext-mysql-connector
ifneq (,$(filter mysql, $(SYSTEM_STUFF)))
BUILD_DEPS += , libmysqlclient-dev
endif
@@@ -992,15 -999,12 +992,15 @@@ endi
ifeq "$(BUILD_BINFILTERS)" "y"
CONFIGURE_FLAGS+= --enable-binfilter
OOO_BINFILTER_DEP = libreoffice$(VER)-filter-binfilter
-else
- DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-filter-binfilter
endif
ifneq "$(BUILD_PYUNO)" "y"
DEBHELPER_OPTIONS+= -Npython-uno
+ CONFIGURE_FLAGS += --disable-python
+else
+ ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"
+ CONFIGURE_FLAGS += --enable-ext-scripting-python
+ endif
endif
ifeq "$(ENABLE_JAVA)" "y"
@@@ -1016,20 -1020,10 +1016,20 @@@
BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER), libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)
JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj
endif
- ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
+ ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
+ ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
BUILD_DEPS += , bsh (>= 2.0b4)$(OOO_NO_JAVA_ARCHS)
- COMMON_BSH_DEPENDS = bsh (>= 2.0b4)
+ BSH_DEPENDS = bsh (>= 2.0b4)
JAVA_GCJ_DEPENDS += , bsh-gcj
+ endif
+ CONFIGURE_FLAGS += --enable-ext-scripting-beanshell
+ else
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-script-provider-bsh
+ endif
+ ifeq "$(ENABLE_SCRIPT_PROVIDER_JS)" "y"
+ CONFIGURE_FLAGS += --enable-ext-scripting-javascript
+ else
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-script-provider-js
endif
endif
@@@ -1114,11 -1108,6 +1114,11 @@@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y
BUILD_DEPS_INDEP += , fontforge
endif
+ifeq "$(BUILD_ONLY_EN_US)" "n"
+ CONFIGURE_FLAGS += --with-system-translate-toolkit
+ BUILD_DEPS_INDEP += , translate-toolkit
+endif
+
# Use compiler cache? Include ccache in DEB_BUILD_OPTIONS for much faster rebuild times
# A complete build uses about 200Mb of compiler cache.
ifeq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
@@@ -1149,8 -1138,7 +1149,8 @@@ els
endif
endif
endif
- CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
+# disabled for now. needs fixed GNU make (#622644)
+# CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
# breaks. At least with 2
# CONFIGURE_FLAGS += --with-max-jobs=$(NUM_CPUS)
@@@ -1488,10 -1476,6 +1488,10 @@@ ifeq "$(ENABLE_EVO2)" "y
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.evolution.in
endif
+ifeq "$(BUILD_BINFILTERS)" "y"
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.binfilter.in
+endif
ifeq "$(ENABLE_KDEAB)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.kab.in
@@@ -1534,8 -1518,10 +1534,8 @@@ ifneq (,$(filter hsqldb, $(SYSTEM_STUFF
perl -pi -e "s/(Build-Conflicts: .*)/\1, libhsqldb-java (>= $(HSQLDB_TOONEWVER)~)/" debian/control
endif
-ifneq "$(USE_SYSTEM_STLPORT)" "y"
# at least here it crashes the build in some funny way.
perl -pi -e "s/(Build-Conflicts: .*)/\1, libstlport4.6-dev/" debian/control
-endif
ifeq (4.4,$(SYSTEM_GCC_VERSION))
perl -pi -e 's/flex \|/flex (>= 2.5.25-7) |/' debian/control
@@@ -1630,6 -1616,17 +1630,6 @@@ ifneq ($(GCC_VERSION),
endif
endif
-ifeq "$(USE_STLPORT)" "y"
- ifeq "$(USE_SYSTEM_STLPORT)" "y"
- # stlport home
- if [ ! -d stlport ]; then \
- mkdir -p stlport; \
- ln -sf /usr/include/stlport stlport/stlport; \
- ln -sf /usr/lib stlport/lib; \
- fi
- endif
-endif
-
ifneq "$(BUILD_ONLY_EN_US)" "y"
ifneq "$(LANGPACKISOS)" "en-US"
# copy and extract extra GSIs
@@@ -1706,9 -1703,9 +1706,9 @@@ ifeq "$(BUILD_KDE)" "n
endif
ifeq ($(ON_BUILDD),y)
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE)
+ cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build
else
- cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE)
+ cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1 VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) build
endif
# apparently setting this here globally doesn't work, so hack around.
@@@ -1795,18 -1792,10 +1795,18 @@@ $(STAMP_DIR)/install: $(STAMP_DIR)/buil
# somehow in the installer LD_LIBRARY_PATH doesn't contain
# /usr/lib/libfakeroot anymore, causiong loads of ERROR:'s from
# ld.so. Set LD_PRELOAD to the full path here manually.
- cd $(OOO_BUILD_TREE)/; PATH=$(BUILD_PATH) \
+ cd $(SOURCE_TREE)/; \
+ . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ PATH=$(BUILD_PATH) \
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(BUILD_LD_LIBRARY_PATH)" \
LD_PRELOAD=/usr/lib/libfakeroot/libfakeroot-$(shell update-alternatives --query fakeroot | grep Value: | cut -d"-" -f2).so \
- DESTDIR=$(CURDIR)/debian/tmp $(MAKE) install
+ DESTDIR=$(CURDIR)/debian/tmp \
+ solenv/bin/ooinstall /$(OOBRANDDIR)
+ # FIXME: Move here so that we don't rely on libreoffice-build here.
+ # Would also obsolete disable-ooinstall-in-package-ooo.diff
+ cd $(OOO_BUILD_TREE)/bin; \
+ export OODESTDIR=$(CURDIR)/debian/tmp; \
+ ./package-ooo
# prepare install/dir files for dh
for i in `cd $(CURDIR)/debian/tmp/pkg; ls -1 | xargs`; do \
@@@ -1889,6 -1878,9 +1889,6 @@@ ifeq (sk,$(findstring sk,$(HELPISOS))
$(PKGDIR)-help-sk/$(shell echo $(OOBASISDIR) | sed -e s/lib/share/)/help/sk
endif
- # add registered-components dir
- mkdir -p $(PKGDIR)-core/$(OOBASISDIR)/registered-components
-
ifeq "$(ENABLE_JAVA)" "y"
# move officebean.jar into -officebean (They will be moved out of -core
# in the install-arch target). Do the /usr/share move here already
@@@ -1948,7 -1940,7 +1948,7 @@@ endi
rm -f $(PKGDIR)-common/$(OODIR)/program/.testtoolrc
ifeq "$(BUILD_GTK)" "y"
- # Gtk quickstarter for the eggtrtray stuff, so to -gtk (via -gnome)
+ # Gtk quickstarter, so to -gtk (via -gnome)
mkdir -p -m755 $(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
mv $(PKGDIR)-common/$(OOBRANDDIR)/share/xdg/qstart.desktop \
$(PKGDIR)-gnome/$(OOBRANDDIR)/share/xdg
@@@ -1958,17 -1950,17 +1958,17 @@@
$(PKGDIR)-gnome/$(OODIR)/share/registry
endif
-ifeq "$(PACKAGE_SDK)" "y"
- # move gengal stuff into -dev
- mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- mv $(PKGDIR)-core/$(OODIR)/program/gengal* \
- $(PKGDIR)-dev/$(OODIR)/program
- mv $(PKGDIR)-common/$(OODIR)/program/gengal \
- $(PKGDIR)-dev/$(OODIR)/program
-else
- rm -f $(PKGDIR)-core/$(OODIR)/program/gengal*
- rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
-endif
+#ifeq "$(PACKAGE_SDK)" "y"
+# # move gengal stuff into -dev
+# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+# mv $(PKGDIR)-core/$(OODIR)/program/gengal* \
+# $(PKGDIR)-dev/$(OODIR)/program
+# mv $(PKGDIR)-common/$(OODIR)/program/gengal \
+# $(PKGDIR)-dev/$(OODIR)/program
+#else
+# rm -f $(PKGDIR)-core/$(OODIR)/program/gengal*
+# rm -f $(PKGDIR)-common/$(OODIR)/program/gengal
+#endif
ifeq "$(PACKAGE_SDK)" "y"
# move SDK documentation into own package
@@@ -2024,8 -2016,7 +2024,8 @@@ $(STAMP_DIR)/maintscripts: $(wildcard d
echo "" >> $$MAINTSCRIPT; \
if egrep -q "(add|remove|validate|sync)_extension" $$MAINTSCRIPT.in; then \
cat debian/shell-lib-extensions.sh >> $$MAINTSCRIPT; \
- elif grep -q services_rdb $$MAINTSCRIPT.in; then \
+ fi; \
+ if grep -q services_rdb $$MAINTSCRIPT.in; then \
cat debian/shell-lib-components.sh >> $$MAINTSCRIPT; \
fi; \
sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \
@@@ -2172,6 -2163,32 +2172,6 @@@ $(STAMP_DIR)/install-arch: $(STAMP_DIR)
dh_testroot
umask 022
-ifeq "$(ENABLE_EVO2)" "y"
- debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
- -r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -br $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -c 'vnd.sun.star.expand:$$OOO_BASE_DIR/program/libevoab$(LIBSUFFIX).so'
-endif
-ifeq "$(ENABLE_KDEAB)" "y"
- debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
- -r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -br $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -c 'vnd.sun.star.expand:$$OOO_BASE_DIR/program/libkab1.so'
-endif
-ifeq "$(BUILD_BINFILTERS)" "y"
- debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
- -r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -br $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -c 'vnd.sun.star.expand:$$OOO_BASE_DIR/program/libbf_migratefilter$(LIBSUFFIX).so'
- debian/ure/$(OOBRANDDIR)/ure/bin/regcomp -revoke \
- -r $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -br $(PKGDIR)-core/$(OODIR)/program/services.rdb \
- -c 'vnd.sun.star.expand:$$OOO_BASE_DIR/program/libbindet$(LIBSUFFIX).so'
-endif
-
- # the regcomps above fail after done once, force install again
- rm -f $(STAMP_DIR)/install
-
# move the URE to /usr/lib/ure
mv debian/ure/$(OOBRANDDIR)/ure debian/ure/usr/lib
rmdir debian/ure/$(OOBRANDDIR)
@@@ -2242,9 -2259,6 +2242,9 @@@ ifeq "$(ENABLE_KDEAB)" "y
for f in libkab*so; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-kab/$(OODIR)/program || exit 1 ;\
done
+ mkdir -p $(PKGDIR)-kab/$(OODIR)/registered-components
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/kab1.component \
+ $(PKGDIR)-kab/$(OODIR)/registered-components/kab1.component
endif
# move the GNOME stuff which are *not* in gid_Module_Optional_Gnome
@@@ -2255,7 -2269,9 +2255,7 @@@ ifeq "$(BUILD_GTK)" "y
for f in fps_gnome.uno.so libvclplug_gtk*.so; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
done
- for f in libeggtray* libqstart_gtk*; do \
- mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
- done
+ mv $(PKGDIR)-core/$(OODIR)/program/libqstart_gtk* $(PKGDIR)-gnome/$(OODIR)/program || exit 1
endif
# split out gtk stuff
@@@ -2283,17 -2299,6 +2283,17 @@@ endi
ifeq "$(ENABLE_EVO2)" "y"
mkdir -p -m755 $(PKGDIR)-evolution/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/libevoab*.so $(PKGDIR)-evolution/$(OODIR)/program
+ mkdir -p $(PKGDIR)-evolution/$(OODIR)/registered-components
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/evoab.component \
+ $(PKGDIR)-evolution/$(OODIR)/registered-components/evoab.component
+endif
+
+ifeq "$(BUILD_BINFILTERS)" "y"
+ mkdir -p $(PKGDIR)-filter-binfilter/$(OODIR)/registered-components
+ for i in bf_migratefilter bindet; do \
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/$$i.component \
+ $(PKGDIR)-filter-binfilter/$(OODIR)/registered-components/$$i.component; \
+ done
endif
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
@@@ -2349,10 -2354,10 +2349,10 @@@ endi
$(PKGDIR)-base/$(OODIR)/program; \
# linked (amongst others) to libsc*
- mv $(PKGDIR)-core/$(OODIR)/program/libvbaobj*uno.so \
+ mv $(PKGDIR)-core/$(OODIR)/program/vbaobj*uno.so \
$(PKGDIR)-calc/$(OODIR)/program
# linked (amongst others) to libsw*
- mv $(PKGDIR)-core/$(OODIR)/program/libvbaswobj*uno.so \
+ mv $(PKGDIR)-core/$(OODIR)/program/vbaswobj*uno.so \
$(PKGDIR)-writer/$(OODIR)/program
ifeq "$(ENABLE_JAVA)" "y"
@@@ -2464,11 -2469,6 +2464,11 @@@ ifeq "$(BUILD_PYUNO)" "y
echo 'PYTHONPATH=$$PYTHONHOME $$PYTHONHOME/site-packages $$PYTHONHOME/lib-dynload $$PYTHONHOME/lib-tk $$ORIGIN' \
) > debian/python-uno/$(OODIR)/program/pythonloader.unorc
chmod u-w debian/python-uno/$(OODIR)/program/pythonloader.unorc
+ ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"
+ mkdir -p debian/python-uno/$(OOBRANDDIR)/share/extensions
+ mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-python \
+ debian/python-uno/$(OOBRANDDIR)/share/extensions
+ endif
mkdir -p debian/python-uno/usr/share/doc/python-uno
cp -r $(SOURCE_TREE)/pyuno/demo \
@@@ -2485,6 -2485,8 +2485,6 @@@ ifeq "$(ENABLE_MONO)" "y
mkdir -p -m755 debian/cli-uno-bridge/$(OOUREDIR)/lib
mv $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib/cli_uno_bridge.dll \
debian/cli-uno-bridge/$(OOUREDIR)/lib
- mv $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib/cli_uno_bridge.dll.config \
- debian/cli-uno-bridge/$(OOUREDIR)/lib
mv $(PKGDIR)-core/$(OOBRANDDIR)/ure/lib/mono_loader*.uno.so \
debian/cli-uno-bridge/$(OOUREDIR)/lib
@@@ -2501,6 -2503,12 +2501,6 @@@ endi
rm -rf $(PKGDIR)-core/$(OOBRANDDIR)/ure
ifeq "$(PACKAGE_SDK)" "y"
- ifeq "$(USE_SYSTEM_STLPORT)" "y"
- # when we use external stlport, we just can and should do a symlink
- # for the SDK includes
- cd $(PKGDIR)-dev/usr/include/$(OODIRNAME) && \
- rm -rf stl && ln -s /usr/include/stlport stl
- endif
ifeq "$(ENABLE_JAVA)" "y"
# move SDK Java stuff into /usr/share/java
rm -f $(PKGDIR)-dev/$(OOSDKDIR)/classes
@@@ -2543,7 -2551,6 +2543,7 @@@
rm docs
# install gsicheck into -dev
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/program
install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD/$$OUTPATH$$PROEXT)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
( \
@@@ -2571,10 -2578,12 +2571,10 @@@ ifeq "$(INTERNAL_STDLIBS)" "y
echo "libstdc++ $$LIBSTDCPP_SOVER" > debian/shlibs.override.stdlibs; \
echo "libgcc_s $$LIBGCC_SOVER" >> debian/shlibs.override.stdlibs
endif
-ifeq "$(USE_STLPORT)" "y"
- ifeq "$(USE_SYSTEM_STLPORT)" "y"
+ifeq "$(LINK_TO_STLPORT)" "y"
rm -f debian/ure/$(OOUREDIR)/lib/libstlport*
ln -s `readlink -f /usr/lib/libstlport_gcc.so` \
debian/ure/$(OOUREDIR)/lib/libstlport_gcc.so
- endif
endif
ifeq "$(ENABLE_JAVA)" "y"
@@@ -2674,12 -2683,10 +2674,12 @@@ ifeq "$(ENABLE_PDFIMPORT)" "y
rm -f $(PKGDIR)-pdfimport/$(OOBRANDDIR)/share/extensions/pdfimport/registration/LICENSE
endif
- # move services.rdb to /var/lib/openoffice
- mkdir -p $(PKGDIR)-core/var/lib/$(OODIRNAME)/basis$(OOVER)/program
+ # move "default" services.rdb to a hidden file
mv $(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb \
- $(PKGDIR)-core/var/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb
+ $(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/.services.rdb
+ # create dir for services.rdb which is read. like when we merged
+ # additional/optional components
+ mkdir -p $(PKGDIR)-core/var/lib/$(OODIRNAME)/basis$(OOVER)/program
ln -s /var/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb \
$(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb
@@@ -2901,10 -2908,15 +2901,10 @@@ endi
for x in *.png; do convert $$x `basename $$x .png`.xpm; done
ifeq "$(ENABLE_JAVA)" "y"
- # symlink jars we use externally
ifneq (,$(filter saxon, $(SYSTEM_STUFF)))
ln -sf /usr/share/java/saxonb.jar \
$(PKGDIR)-java-common/$(OODIR)/program/classes/saxon9.jar
endif
- ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
- ln -sf /usr/share/java/bsh.jar \
- $(PKGDIR)-java-common/$(OODIR)/program/classes/bsh.jar
- endif
endif
# remove extra license files
rm -rf $(PKGDIR)-common/$(OOBRANDDIR)/licenses
@@@ -2989,6 -3001,7 +2989,6 @@@ endi
for i in $(IMAGES); do \
z=images_$$i.zip; p=$$i; \
case "$$i" in $(DEFAULT_IMAGE)) z=images.zip; esac; \
- case "$$i" in classic) p=andromeda; esac; \
mkdir -p $(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config; \
mv $(PKGDIR)-common/$(OODIR)/share/config/$$z \
$(PKGDIR)-style-$$p/$(shell echo $(OODIR) | sed -e s/lib/share/)/share/config/; \
@@@ -3031,32 -3044,6 +3031,32 @@@ ifeq "$(PACKAGE_SDK)" "y
ln -s /$(OOSDKDIR)/index.html index.html
endif
+ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
+ rm -rf $(PKGDIR)-script-provider-bsh
+ mkdir -p $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions
+ mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-beanshell \
+ $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions
+ ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
+ ln -sf /usr/share/java/bsh.jar \
+ $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions/script-provider-for-beanshell/bsh.jar
+ endif
+ mkdir -p $(PKGDIR)-script-provider-bsh/$(OODIR)/share/Scripts
+ mv $(PKGDIR)-common/$(OODIR)/share/Scripts/beanshell \
+ $(PKGDIR)-script-provider-bsh/$(OODIR)/share/Scripts
+ endif
+
+ ifeq "$(ENABLE_SCRIPT_PROVIDER_JS)" "y"
+ rm -rf $(PKGDIR)-script-provider-js
+ mkdir -p $(PKGDIR)-script-provider-js/$(OOBRANDDIR)/share/extensions
+ mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-javascript \
+ $(PKGDIR)-script-provider-js/$(OOBRANDDIR)/share/extensions
+ mkdir -p $(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts
+ mv $(PKGDIR)-common/$(OODIR)/share/Scripts/javascript \
+ $(PKGDIR)-script-provider-js/$(OODIR)/share/Scripts
+ endif
+endif
+
ifeq "$(ENABLE_REPORTDESIGN)" "y"
ifeq "$(ENABLE_JAVA)" "y"
rm -rf $(PKGDIR)-report-builder
@@@ -3123,13 -3110,16 +3123,13 @@@ ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n
-e 's/ / /' \
< $$dirname/extension.desktop \
> $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop || exit 1
perl -pi -e "s/Icon=openofficeorg.*-extension/Icon=application-vnd.openofficeorg.extension.png/" $(PKGDIR)-common/usr/share/mimelnk/application/vnd.openofficeorg.extension.desktop
endif
- # fix permission
- chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
+#ifeq "$(PACKAGE_SDK)" "y"
+# # fix permission
+# chmod 644 $(PKGDIR)-common/$(OODIR)/program/gengalrc
+#endif
# install extension shell lib for use by extensions not from here
install -D -m644 debian/shell-lib-extensions.sh \
@@@ -3236,8 -3226,8 +3236,8 @@@ ifeq "$(ENABLE_MONO)" "y
dh_installcligac -s
endif
dh_compress -s -X.py -X.mk -X.sxd
- dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" -- -c0 -v$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
- dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" -- -v$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ dh_makeshlibs -puno-libs3 -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" -- -c0 -v`echo $(BINARY_VERSION) | cut -d: -f2`
+ dh_makeshlibs -n -pure -V"ure (>= $(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }'))" -- -v`echo $(BINARY_VERSION) | cut -d: -f2`
# ugly hack, but why does that happen? It's not in .symbols...
TMP=`mktemp -q`; \
grep -v PRIVATE debian/uno-libs3/DEBIAN/symbols > $$TMP && \
@@@ -3279,17 -3269,16 +3279,19 @@@ ifeq "$(ENABLE_JAVA)" "y
-ldebian/uno-libs3/$(OOUREDIR)/lib:debian/ure/$(OOUREDIR)/lib:$(PKGDIR)-core/$(OODIR)/program:$(GCJ_JAWT_DIR) \
$(SHLIBS_OVERRIDE)
endif
+ifeq "$(LINK_TO_STLPORT)" "y"
+ perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/libstlport4.6*.shlibs | awk '{ print $$3,$$4,$$5 }')/' debian/ure.substvars
+endif
ifeq "$(ENABLE_MONO)" "y"
dh_makeclilibs -s
dh_clideps -s
endif
ifeq "$(ENABLE_JAVA)" "y"
jh_depends -a -Xlibreoffice$(VER)-gcj -Xure
+ ifeq "$(PACKAGE_BASE)" "y"
perl -pi -e "s/libhsqldb-java/$(BASE_HSQLDB_DEPENDS)/" \
debian/libreoffice$(VER)-base.substvars
+ endif
# jh_depends adds ure (${source:Version}) entries. They are overly strict
# and do not fit anyway given ure has a different versioning scheme. Excluded
# above, readd here unversioned
@@@ -3305,9 -3294,10 +3307,9 @@@ endi
-Nlibreoffice$(VER)-pdfimport \
-Nlibreoffice$(VER)-sdbc-postgresql \
-Nlibreoffice$(VER)-mysql-connector -- \
- -V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`" \
+ -V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')" \
-V'base-version=$(BASE_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
- -V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS) $(JAVA_COMMON_DEPENDS_VERSION)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
@@@ -3353,9 -3343,9 +3355,9 @@@ ifeq "$(PACKAGE_BASE)" "y
endif
endif
dh_gencontrol -pure -pure-dbg -puno-libs3 -puno-libs3-dbg -- \
- -V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`" \
- -v$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
- dh_md5sums -s -X$(shell echo $(OOBASISDIR) | sed -e s/usr/var/)/program/services.rdb
+ -V"ure:Version=`echo $(BINARY_VERSION) | cut -d: -f2`" \
+ -v"`echo $(BINARY_VERSION) | cut -d: -f2`"
+ dh_md5sums -s
dh_builddeb -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
touch $@
@@@ -3442,7 -3432,7 +3444,7 @@@ endi
ifeq "$(ENABLE_JAVA)" "y"
# the help recommends lucene. this is enough. no need for a hard depend in
# -common, IMHO
- jh_depends -i -Xbsh -Xlibreoffice$(VER)-gcj -Xliblucene2-java
+ jh_depends -i -Xlibreoffice$(VER)-gcj -Xliblucene2-java
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
@@@ -3458,7 -3448,7 +3460,7 @@@
-V'basis-version=$(BASIS_VERSION)' \
-V'next-basis-version=$(NEXT_BASIS_VERSION)' \
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
- -V'common-bsh-depends=$(COMMON_BSH_DEPENDS)' \
+ -V'bsh-depends=$(BSH_DEPENDS)' \
-V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'lucene-depends=$(LUCENE_DEPENDS)' \
--
LibreOffice packaging repository
Reply to: