[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. b23afd6f18e7d2a53be09adf2cb90d5b5a9a859f
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit b23afd6f18e7d2a53be09adf2cb90d5b5a9a859f
Merge: e168827064d63ed665d20decb2423ecc1b4177a0 a571b1111de25baca675dbaee98a3b95d4c2548d
Author: Rene Engelhard <rene@debian.org>
Date: Sat Apr 16 21:53:55 2011 +0200
Merge remote branch 'origin/master' into debian-experimental-3.4.0
diff --combined changelog
index dd1c52b,3c294be..917de3b
--- a/changelog
+++ b/changelog
@@@ -1,27 -1,36 +1,56 @@@
+libreoffice (1:3.4.0~beta1-1) UNRELEASED; urgency=low
+
+ * new upstream beta
+ - handles various tble columns differing in case correct
+ (closes: #617596)
+
+ * 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
+ - update for new extension configure switches and for mingw
+ * 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)
+
+ -- Rene Engelhard <rene@debian.org> Fri, 15 Apr 2011 13:57:22 +0200
+
- libreoffice (1:3.3.2-2) UNRELEASED; urgency=low
+ libreoffice (1:3.3.2-3) UNRELEASED; urgency=low
+
+ * debian/rules, debian/control.in:
+ - readd recommends for libtextcat-data though libtextcat0 depends on it.
+ Makes more clear what we need now (see #620568)
+ * debian/rules:
+ - run dpkg -s gcj-jdk on openjdk-using archs only when we build -gcj,
+ as otherwise it's not installed on the buildds (and we end up with a
+ eventually "wrong" gcc).
+ - restrict parallel=x to 2, at least 6 breaks, and don't experiment :)
+ - don't reference -ctl-he anymore and update settings in ctl_he.xcd
+ (closes: #622301)
+ - enable is (icelandic) l10n
+ * debian/control.in:
+ - build-conflict against at3-dev-tools, it installs a moc-qt3 alternative
+ for moc, which might hose the KDE VCLplug build - and configure insists
+ on ../bin/moc relative to libQt.so (thus /usr/bin/moc) now
+ * debian/control.gcj.in: move -gcj into Section: java
+ * debian/*.lintian-overrides*: update for new lintian 2.5.0 (s#/usr#usr#g)
+
+ -- Rene Engelhard <rene@debian.org> Tue, 12 Apr 2011 23:51:52 +0000
+
+ libreoffice (1:3.3.2-2) unstable; urgency=medium
+
+ * debian/patches/fix-evolution-local.diff: backport from libreoffice-3-3
+ branch
* debian/rules:
- really use internal libtextcat on squeeze (thanks dba)
+ - re-enable -evolution
+ - hack around gcc vs. libgcj mismatch for jni.h, explicitly build against
+ (and use) gcc x.y matching the gcj-x.y-jdk version
+ - remove obsolete s390 and armel gcc builddeps
* debian/libreoffice-common.postinst.in:
- try to remove /etc/openoffice if it's empty
* debian/*.mime:
@@@ -30,8 -39,11 +59,11 @@@
* debian/rules, debian/*.mime:
- remove obsolete KDE 3 stuff
* debian/shlibs.override.kde: remove, obsolete
+ * debian/rules, debian/libreoffice-common.links.in:
+ - remove fingerprint link, create on the fly in rules; we don't want
+ this if we use the internal data
- -- Rene Engelhard <rene@debian.org> Thu, 24 Mar 2011 09:34:40 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 01 Apr 2011 22:37:37 +0000
libreoffice (1:3.3.2-1) unstable; urgency=low
diff --combined control.in
index 19440e4,94160f7..0f06a1b
--- a/control.in
+++ b/control.in
@@@ -46,7 -46,7 +46,7 @@@ Build-Depends: lsb-release
wget | curl
%BUILD_DEPS%
Build-Depends-Indep: fdupes, xml-core, imagemagick %BUILD_DEPS_INDEP%
- 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~), ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%]
+ 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) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%]
Standards-Version: 3.9.1
XS-Python-Version: @PYTHON_VERSION@
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
@@@ -213,7 -213,8 +213,8 @@@ Suggests: libreofficeVER-style-hicontra
libreofficeVER-style-tango,
libreofficeVER-style-crystal,
libreofficeVER-style-oxygen
- Recommends: xfonts-mathml
+ Recommends: xfonts-mathml,
+ ${textcat-data-recommends}
Conflicts: libtextcat-data (<< 2.2-8),
broffice,
openoffice.org-common (<< 1:3.3.0~)
@@@ -244,6 -245,7 +245,6 @@@ Architecture: al
Depends: libreofficeVER-common,
${java-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.
@@@ -580,35 -582,3 +581,35 @@@ 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.
+
diff --combined rules
index b01483e,312c0ca..368ec48
--- a/rules
+++ b/rules
@@@ -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=DEV300
+MILESTONE=m103
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
-OOO_BUILD_BRANCH=libreoffice-3-3-2
-OOO_BUILD_VERSION=3.3.2.2
+OOO_BUILD_BRANCH=libreoffice-3-4
+OOO_BUILD_VERSION=3.3.99.1
# 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)
@@@ -150,6 -150,8 +150,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"
@@@ -201,7 -203,11 +201,7 @@@ PACKAGE_SDK=
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "openjdk"
RUN_SMOKETEST=y
- ifneq (,$(findstring $(ARCH),$(OOO_STLPORT_ARCHS)))
- RUN_SUBSEQUENT_TESTS=y
- else
- RUN_SUBSEQUENT_TESTS=n
- endif
+ RUN_SUBSEQUENT_TESTS=y
else
ifneq ($(ON_BUILDD),y)
RUN_SMOKETEST=n
@@@ -243,7 -249,7 +243,7 @@@ ENABLE_MINIMIZER=
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
- ENABLE_EVO2=n
+ ENABLE_EVO2=y
ENABLE_GVFS=y
ENABLE_GCONF=y
# broken!
@@@ -257,7 -263,7 +257,7 @@@ PACKAGE_BASE=
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
ALLOC=system
- SYSTEM_STUFF += textcat
+ SYSTEM_STUFF += libtextcat
USE_SYSTEM_TEXTCAT_DATA=y
SYSTEM_STUFF += cppunit
@@@ -325,7 -331,7 +325,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"
@@@ -423,7 -429,7 +423,7 @@@ endi
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds textcat graphite, $(SYSTEM_STUFF))
- 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
@@@ -431,12 -437,25 +431,25 @@@ CONFIGURE_FLAGS += $(foreach i, $(SYSTE
CC_PREFIX:=$(shell gcc -dumpmachine)-
- ifeq (s390,$(findstring s390,$(OOO_ARCHS)))
- BUILD_DEPS += , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390]
- endif
- ifeq "$(SYSTEM_GCC_VERSION)" "4.4"
- ifeq (armel,$(findstring armel,$(OOO_ARCHS)))
- BUILD_DEPS += , g++-4.4 (>= 4.4.2-5) [armel]
+ ifeq "$(GCC_VERSION)" ""
+ ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
+ ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_ARCHS)))
+ GCJ_JDK_PACKAGE=$(shell dpkg -s gcj-jdk | grep Depends | sed -e 's/.*\(gcj-[0-9]\.[0-9]-jdk\).*/\1/')
+ GCJ_JDK_VERSION=$(shell echo $(GCJ_JDK_PACKAGE) | cut -d- -f2)
+ ifneq "$(SYSTEM_GCC_VERSION)" "$(GCJ_JDK_VERSION)"
+ BUILD_DEPS += , gcc-$(GCJ_JDK_VERSION) [$(OOO_GCJ_JDK_ARCHS)], g++-$(GCJ_JDK_VERSION) [$(OOO_GCJ_JDK_ARCHS)]
+ ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
+ # sanity check. amd64 is in kfreebsd-amd64; same for i386
+ ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_OPENJDK_ARCHS)))
+ GCC_VERSION := $(GCJ_JDK_VERSION)
+ else
+ GCC_VERSION := $(SYSTEM_GCC_VERSION)
+ endif
+ else
+ GCC_VERSION := $(SYSTEM_GCC_VERSION)
+ endif
+ endif
+ endif
endif
endif
@@@ -469,31 -488,34 +482,31 @@@ ifneq "$(PACKAGE_SDK)" "y
endif
ifeq "$(ENABLE_MINIMIZER)" "y"
- CONFIGURE_FLAGS += --enable-minimizer
+ CONFIGURE_FLAGS += --enable-ext-minimizer
endif
ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- CONFIGURE_FLAGS += --enable-presenter-console
+ CONFIGURE_FLAGS += --ext-enable-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
endif
- ifneq (,$(filter textcat, $(SYSTEM_STUFF)))
+ ifneq (,$(filter libtextcat, $(SYSTEM_STUFF)))
BUILD_DEPS += , libtextcat-dev (>= 2.2-8)
endif
ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
CONFIGURE_FLAGS += --with-external-libtextcat-data=/usr/share/libtextcat/LM
+ TEXTCAT_DATA_RECOMMENDS := libtextcat-data (>= 2.2-9)
endif
ifeq "$(USE_LIBCURL4)" "y"
@@@ -581,6 -603,9 +594,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
@@@ -606,7 -631,7 +619,7 @@@ ifneq "$(BUILD_ONLY_EN_US)" "y
# 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 \
- en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id it ja \
+ 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 \
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
@@@ -615,7 -640,7 +628,7 @@@
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 \
- en-GB en-ZA eo es et eu fa fi fr ga gl gu he hi hr hu id it ja \
+ 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 \
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
@@@ -703,11 -728,11 +716,11 @@@ 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++
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
@@@ -732,12 -757,12 +745,12 @@@
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
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)" ""
@@@ -817,8 -842,19 +830,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)))
@@@ -840,7 -876,7 +853,7 @@@
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev
+ BUILD_DEPS += , libmdds-dev (>= 0.5.0)
endif
ifneq (,$(filter vigra, $(SYSTEM_STUFF)))
@@@ -967,7 -1003,7 +980,7 @@@ ifeq "$(ENABLE_JAVA)" "y
endif
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
endif
@@@ -1073,9 -1109,17 +1086,18 @@@ ifeq "$(NUM_CPUS)" "
NUM_CPUS := $(shell expr $(AVAIL_CPUS))
endif
endif
+ else
+ ifneq "$(PARALLEL_BUILD)" "y"
+ # no more than 2, please. At least 6 seems to fail.
+ ifneq ($(NUM_CPUS),1)
+ ifneq ($(NUM_CPUS),2)
+ NUM_CPUS := 2
+ endif
+ 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)
@@@ -1090,7 -1134,9 +1112,9 @@@ els
BUILD_DEPS += , gcc-snapshot
else
BUILD_PATH = /usr/lib/jvm/java-gcj/bin:$(CURDIR)/debian/usr/bin:$$PATH
+ ifeq "$(GCJ_JDK_VERSION)" ""
BUILD_DEPS += , gcc-$(GCC_VERSION), g++-$(GCC_VERSION)
+ endif
endif
endif
BUILD_PATH := $(CURDIR)/debian/usr/bin:$(BUILD_PATH)
@@@ -1426,10 -1472,6 +1450,6 @@@ endi
perl -pi -e "s,%OOO_GCJ_JDK_ARCHS%,$(OOO_GCJ_JDK_ARCHS),g" debian/control
perl -pi -e "s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g" debian/control
- ifeq (he,$(findstring he,$(LANGPACKISOS)))
- perl -pi -e 's/libreoffice-help-he$$/libreoffice-help-he, libreoffice-ctl-he/' debian/control
- endif
-
ifeq (sk,$(findstring sk,$(HELPISOS)))
perl -pi -e 's/(Depends:.*)libreoffice-l10n-sk(.*)$$/\1libreoffice-l10n-sk, libreoffice-help-cs\2/' debian/control
endif
@@@ -1454,8 -1496,10 +1474,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
@@@ -1550,13 -1594,17 +1570,6 @@@ ifneq ($(GCC_VERSION),
endif
endif
- ifeq "$(BUILD_KDE)" "y"
- # be sure we use the right moc, it's an alternative and can point
- # to either Qt3 or Qt4s moc.
- mkdir -p $(CURDIR)/debian/usr/bin
- ln -sf /usr/bin/moc-qt4 $(CURDIR)/debian/usr/bin/moc
- 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
@@@ -2027,6 -2075,11 +2040,11 @@@ els
rm -f $(PKGDIR)-common/$(OOBRANDDIR)/program/about-pt_BR.png
endif
+ ifeq (he,$(findstring he,$(LANGPACKISOS)))
+ perl -pi -e 's#<prop oor:name="CTLSequenceChecking"><value>true</value></prop>#<prop oor:name="CTLSequenceChecking"><value>false</value></prop>#' $(PKGDIR)-l10n-he/$(OOBASISDIR)/share/registry/ctl_he.xcd
+ perl -pi -e 's#</oor:component-data>#<node oor:name="General"><prop oor:name="DefaultLocale_CTL"><value>he-IL</value></prop></node></oor:component-data>#' $(PKGDIR)-l10n-he/$(OOBASISDIR)/share/registry/ctl_he.xcd
+ endif
+
touch $@
native-jars: $(STAMP_NATIVE_JARS)
@@@ -2382,9 -2435,6 +2400,9 @@@ 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
+ mkdir -p debian/python-uno/$(OOBRANDDIR)/share/extensions
+ mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-python \
+ debian/python-uno/$(OOBRANDDIR)/share/extensions
mkdir -p debian/python-uno/usr/share/doc/python-uno
cp -r $(SOURCE_TREE)/pyuno/demo \
@@@ -2419,6 -2469,12 +2437,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
@@@ -2488,10 -2544,12 +2506,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"
@@@ -2816,10 -2874,15 +2834,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
@@@ -2947,31 -3010,6 +2965,31 @@@ ifeq "$(PACKAGE_SDK)" "y
ln -s /$(OOSDKDIR)/index.html index.html
endif
+ifeq "$(ENABLE_JAVA)" "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/$(OODIR)/program/classes/bsh.jar
+ endif
+ mkdir -p $(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/Scripts
+ mv $(PKGDIR)-common/$(OODIR)/share/Scripts/beanshell \
+ $(PKGDIR)-script-provider-bsh/$(OODIR)/Scripts
+
+ 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)/program/classes
+ mv $(PKGDIR)-java-common/$(OODIR)/program/classes/js.jar \
+ $(PKGDIR)-script-provider-js/$(OODIR)/program/classes
+ mkdir -p $(PKGDIR)-script-provider-js/$(OOBRANDDIR)/share/Scripts
+ mv $(PKGDIR)-common/$(OODIR)/share/Scripts/javascript \
+ $(PKGDIR)-script-provider-js/$(OODIR)/Scripts
+endif
+
ifeq "$(ENABLE_REPORTDESIGN)" "y"
ifeq "$(ENABLE_JAVA)" "y"
rm -rf $(PKGDIR)-report-builder
@@@ -3025,6 -3063,10 +3043,10 @@@ endi
fi; \
done
+ ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
+ echo "usr/share/libtextcat/LM $(OOBASISDIR)/share/fingerprint" >> debian/libreoffice-common.links
+ endif
+
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
# menu files from sysui
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice >/dev/null; pwd`" ;\
@@@ -3193,9 -3235,6 +3215,9 @@@ 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
@@@ -3212,6 -3251,7 +3234,6 @@@ endi
-V"ure:Version=$(shell grep UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`" \
-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)' \
@@@ -3357,12 -3397,13 +3379,13 @@@ endi
-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-common-java-depends=$(JAVA_COMMON_JAVA_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'lucene-depends=$(LUCENE_DEPENDS)' \
-V'lucene-conflicts=$(LUCENE_CONFLICTS)' \
+ -V'textcat-data-recommends=$(TEXTCAT_DATA_RECOMMENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
--
LibreOffice packaging repository
Reply to: