The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 09c0ff3e955b5720127a0d883ededd6ed0209052
Merge: f8115ea82bee6cd3e55830e8edfb6fab150df5e3
661fbd3b6f3d050a910a23d41f9727389550ddf9
Author: Rene Engelhard <r...@debian.org>
Date: Mon Aug 29 16:36:59 2011 +0200
Merge remote branch 'origin/master' into debian-experimental-3.4.0
diff --combined changelog
index 8934757,d96720c..1d50d38
--- a/changelog
+++ b/changelog
@@@ -1,156 -1,54 +1,157 @@@
-libreoffice (1:3.3.4-3) UNRELEASED; urgency=low
+libreoffice (1:3.4.2-3) UNRELEASED; urgency=low
+ * debian/patches/fdo35784.diff: add patch from fdo35784, thanks lmamane
+ * debian/patches/mipsel-jfw-plugin-arch.diff: fix JFW_PLUGIN_ARCH
+ (s/mips32/mipsel/) in jvmfwk for mipsel, thanks Aurelien Jarno
* debian/rules:
+ - try build with openjdk on mipsel again now that jvmfwk knows the
+ correct arch
- fix SYSTEM_STUFF for ENABLE_JAVA=n
+ - don't try to run dh_nativejava if ENABLE_JAVA=n
- -- Rene Engelhard <r...@debian.org> Mon, 29 Aug 2011 14:33:47 +0000
+ -- Rene Engelhard <r...@debian.org> Wed, 17 Aug 2011 09:25:08 +0000
-libreoffice (1:3.3.4-2) unstable; urgency=medium
+libreoffice (1:3.4.2-2) experimental; urgency=low
+
+ * debian/patches/make-gengal-work-again.diff: as name says
+ * debian/patches/fix-distro-config.diff: really use system sane.h
- * debian/patches/mipsel-jfw-plugin-arch.diff: fix JFW_PLUGIN_ARCH
- (s/mips32/mipsel/) in jvmfwk for mipsel, thanks Aurelien Jarno
* debian/rules:
- - try build with openjdk on mipsel again now that jvmfwk knows the
- correct arch
+ - fix syntax of graphite removal from SYSTEM_STUFF (forgot s/+=/:=/)
+ - install gengal again
+ - on sid (and when building with debug), compress -dbg with xz; make bzip2
+ compression unconditional
- -- Rene Engelhard <r...@debian.org> Mon, 22 Aug 2011 17:30:35 +0000
+ -- Rene Engelhard <r...@debian.org> Tue, 16 Aug 2011 12:55:45 +0000
-libreoffice (1:3.3.4-1) unstable; urgency=low
+libreoffice (1:3.4.2-1) experimental; urgency=low
- * New upstream release
+ * new upstream release
+
+ * debian/patches/*: migrate to libreoffice-build/hotfixes where possible
+ * debian/rules:
+ - try gcj again on mipsel, stay with OpenJDK for mips
+ - use system-graphite again, disable graphite on armel and sparc for
+ the time being as we don't have a graphite2 which doesn't fail its tests
+ there yet
+
+ -- Rene Engelhard <r...@debian.org> Thu, 11 Aug 2011 08:13:02 +0000
+
+libreoffice (1:3.4.1-4) experimental; urgency=low
+
+ * debian/rules:
+ - don't statically check for /build/buildd- but use grep, which will
+ catch also /build/buildd2- as on lucatelli2...
+ - reverse conditional to not build reportbuilder to really disable
+ its build on gcj archs (apparently ant and envvars still broken due
+ to multiarch)
+ - add libstlport4.6-dev builddep only when something is in
+ OOO_STLPORT_ARCHS, don't rely on LINK_TO_STLPORT. Not set on !i386...
+
+ -- Rene Engelhard <r...@debian.org> Thu, 28 Jul 2011 09:31:12 +0000
+
+libreoffice (1:3.4.1-3) experimental; urgency=low
- * debian/patches/update-debian-opt.diff: call dpkg-buildflags correctly
* debian/patches/fix-bridges-cpp-uno-depends.diff: fix mising depends in
bridges' build.lst which can cause FTBFS on s390(x), arm, ia64, hppa,
alpha
- * debian/patches/fdo35784.diff: add patch from fdo35784, thanks lmamane
- * debian/patches/disable-sdbc-postgresql.diff: remove
+ * debian/patches/no-prctl-on-kfreebsd.diff: don't try to #include
<sys/prctl.h>,
+ it doesn't exist for FreeBSD
+
+ * debian/rules:
+ - also set ON_BUILDD=y if $(CURDIR) begins with /build/buildd-
+ - build-depend on javahelper >= 0.37~ instead of >= 0.37 to help
+ squeeze-backpors
+
+ -- Rene Engelhard <r...@debian.org> Fri, 22 Jul 2011 16:06:11 +0000
+
+libreoffice (1:3.4.1-2) experimental; urgency=low
+
+ [ Rene Engelhard ]
+ * debian/patches/vbaobj-visibility-fix.diff: fix sc build on i386, imported
+ from Fedora
+
+ * debian/libreoffice-common.postinst.in, libreoffice-core.postinst.in,
+ debian/shell-lib-components.sh:
+ check for /@OOBASISDIR@/program/.services.rdb before using it
+ (closes: #633396) and replace manual call of the function by
+ dpkg-trigger. Also run the trigger in -cores postinst
+ (thanks Jonathan Nieder)
+ * debian/control.in:
+ - make new -common break old -evolution/-filter-binfilter
+ * debian/rules:
+ - also -Xlibreoffice-dbg on jh_depends... (closes: #633540)
+ - update ENABLE_OPENGL configure flags, now --enable-opengl is default
+ upstream
+ - fix build with make 3.82: remove space after, in $(call; build-depend
+ on make >= 3.82 if PARALLEL_BUILD=y
+ - fix -javafilter.destop Exec=
+ - remove obsolete libstlport4.6-dev build-conflict, thanks Björn
+ Michaelsen
+ - fix conditional for translate-toolkit
+ - explicitely specify --without-stlport
+ - temporarily build with internal graphite2 until the system graphite2
+ package is ready for use
+ * debian/copyright: s/Specificatin/Specification/, thanks Jakub Wilk
+ * merge from ubuntu-oneiric-3.4:
+ - gconf also needs liborbit2-dev
+ - bump libebook so name to allow for libebook-1.2.so-11 too
+ - disable --dynamic-list-cpp-new/--dynamic-list-cpp-typeino
+ as they SIGSEGV ld from binutils-2.21.52.20110707
+
+ [ Nelson A. de Oliveira ]
+ * debian/*menu.in, debian/*mime:
+ - Fix deprecated options when calling soffice and libreoffice
+ (closes: #634001)
+
+ -- Rene Engelhard <r...@debian.org> Wed, 20 Jul 2011 22:28:52 +0200
+libreoffice (1:3.4.1-1) experimental; 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 069b0a4b4f052255c97ece23f0e37be85921fe27
+
+ * 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
+ - 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/CVE-2011-2685 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
- - build-depend on javahelper (>= 0.37~) and use -s
- - fix build with make 3.82: remove space after, in $(call
- - also set ON_BUILDD=y if $(CURDIR) begins with /build/buildd-
- - try gcj again on mipsel, stay with OpenJDK for mips
- - on sid (and when building with debug), compress -dbg with xz; make bzip2
- compression unconditional
- - re-enable -sdbc-postgresql
+ - build-depend on javahelper (>= 0.37) and use -s
* debian/source.lintian-overrides:
- override new libreoffice source: dh_pycentral-is-obsolete line 3214
and libreoffice source: dh_python-is-obsolete line 3223
- - also -Xlibreoffice-dbg on jh_depends...
- * debian/copyright: s/Specificatin/Specification/, thanks Jakub Wilk
- * merge from ubuntu-oneiric-3.4:
- - gconf also needs liborbit2-dev
- - bump libebook so name to allow for libebook-1.2.so-11 too
- -- Rene Engelhard <r...@debian.org> Mon, 15 Aug 2011 16:45:06 +0000
+ -- Rene Engelhard <r...@debian.org> Wed, 06 Jul 2011 16:00:18 +0200
libreoffice (1:3.3.3-4) unstable; urgency=low
@@@ -189,7 -87,7 +190,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
@@@ -197,7 -95,7 +198,7 @@@
* 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 <r...@debian.org> Wed, 29 Jun 2011 10:03:21 +0200
@@@ -212,7 -110,7 +213,7 @@@ libreoffice (1:3.3.3-1) unstable; urgen
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 rules
index 7ff9282,6b65c2a..79afaea
--- 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)
@@@ -48,7 -48,7 +48,7 @@@ SHELL:=/bin/bas
SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n
'/^gcc/s/.*\(.\..\)\..$$/\1/p')
# Debian buildds run as user `buildd', other are using /CurrentlyBuilding
-ON_BUILDD := $(shell [ "`whoami`" = buildd -o -f /CurrentlyBuilding -o "`echo
$(CURDIR) | cut -d- -f1`" = "/build/buildd" ] && echo y || echo n)
+ON_BUILDD := $(shell if [ "`whoami`" = buildd -o -f /CurrentlyBuilding ] ||
echo $(CURDIR) | grep -q \/build\/buildd; then echo y; else echo n; fi)
PKGDIR:=debian/libreoffice$(VER)
OODIRNAME=libreoffice$(VER)
@@@ -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-4
-OOO_BUILD_VERSION=3.3.4.1
+OOO_BUILD_BRANCH=libreoffice-3-4-2
+OOO_BUILD_VERSION=3.4.2.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
@@@ -126,9 -123,6 +126,6 @@@ els
export PYTHON=python$(PYTHON_VERSION)
endif
PACKAGE_TTF_OPENSYMBOL=y
- ifeq (,$(filter $(ARCH), powerpc powerpcspe ppc64))
- BUILD_JARS_NATIVE=y
- endif
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
@@@ -154,6 -148,8 +151,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"
@@@ -195,6 -191,9 +192,9 @@@ ifeq "$(ENABLE_JAVA)" "y
# for UOF, but still for e.g. M$.
#SYSTEM_STUFF += saxon
SYSTEM_STUFF += lucene
+ ifeq (,$(filter $(ARCH), powerpc powerpcspe ppc64))
+ BUILD_JARS_NATIVE=y
+ endif
endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
@@@ -207,11 -206,18 +207,11 @@@ NEONSONR=2
SYSTEM_STUFF += redland
USE_OOO_BUILD_DESKTOPS=n
PACKAGE_SDK=y
+# FIXME: subsequenttests breaks with to high debug level 11
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=n
else
ifneq ($(ON_BUILDD),y)
RUN_SMOKETEST=n
@@@ -220,7 -226,7 +220,7 @@@
endif
else
RUN_SMOKETEST=n
- RUN_SUBSQUENT_TESTS=n
+ RUN_SUBSEQUENT_TESTS=n
endif
# "Unfortunately, running the unoapi tests is still not stable enough to give
# useful results. Therefore, running subsequenttests has been disabled in the
@@@ -242,20 -248,13 +242,20 @@@ SYSTEM_STUFF += openss
NEW_DPKG_SHLIBDEPS=y
ifeq "$(ENABLE_JAVA)" "y"
ENABLE_REPORTDESIGN=y
+ SYSTEM_STUFF += jfreereport
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
endif
-ENABLE_SDBC_POSTGRESQL=y
+# NOTE: if enabling this, disable debian/patches/disable-sdbc-postgresql.diff!
+ENABLE_SDBC_POSTGRESQL=n
ENABLE_MINIMIZER=y
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
@@@ -283,7 -282,7 +283,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
@@@ -309,8 -308,7 +309,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
@@@ -341,7 -339,7 +341,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"
@@@ -401,13 -399,6 +401,13 @@@ ifeq (,$(filter $(ARCH),$(OOO_JAVA_ARCH
ENABLE_MEDIAWIKI=n
endif
+ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
+ ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_OPENJDK_ARCHS)))
+ ENABLE_REPORTDESIGN=n
+ SYSTEM_STUFF := $(filter-out jfreereport, $(SYSTEM_STUFF))
+ endif
+endif
+
ifeq "$(ENABLE_MONO)" "y"
# mono
# ppc fails (#412967), arm(el), too
@@@ -446,9 -437,8 +446,9 @@@ endi
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backpo...@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=
+ PARALLEL_BUILD=n
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@@ -493,9 -483,7 +493,9 @@@ ifneq "$(OOO_OGLTRANS_ARCHS)" "
BUILD_DEPS += , libgl1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS),
libglu1-mesa-dev$(OOO_NO_OGLTRANS_ARCHS)
endif
ifeq "$(ENABLE_OPENGL)" "y"
- CONFIGURE_FLAGS += --enable-opengl --with-system-mesa-headers
+ CONFIGURE_FLAGS += --with-system-mesa-headers
+else
+ CONFIGURE_FLAGS += --disable-opengl
endif
ifneq "$(PACKAGE_SDK)" "y"
@@@ -503,29 -491,22 +503,29 @@@
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
+# fails their tests
+ifeq "$(ARCH)" "armel"
+ENABLE_GRAPHITE=n
+SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
+endif
+ifeq "$(ARCH)" "sparc"
+ENABLE_GRAPHITE=n
+SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
+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) [!armel !sparc]
endif
else
CONFIGURE_FLAGS += --disable-graphite
@@@ -559,6 -540,7 +559,6 @@@ ifneq "$(BUILD_DBG_PACKAGE)" "y
SMALL_SYMBOLS = y
else
ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
- # ooo-build defaults to --enable-symbols (without SMALL)
SMALL_SYMBOLS = n
# reduces -dbg size from 760M to ~320M
USE_XZ_COMPRESS = y
@@@ -575,11 -557,6 +575,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)))
@@@ -639,6 -616,9 +639,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
@@@ -663,18 -643,18 +663,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
@@@ -719,6 -699,7 +719,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)" ""
@@@ -763,14 -744,11 +763,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
@@@ -795,13 -773,13 +795,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)" ""
@@@ -881,9 -859,19 +881,9 @@@ 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)))
@@@ -905,7 -893,7 +905,7 @@@
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev
+ BUILD_DEPS += , libmdds-dev (>= 0.5.0)
endif
ifneq (,$(filter vigra, $(SYSTEM_STUFF)))
@@@ -962,7 -950,6 +962,7 @@@ ifeq "$(BUILD_KDE)" "n
CONFIGURE_FLAGS+= --with-images="$(IMAGES)"
else
CONFIGURE_FLAGS += --disable-kde
+ CONFIGURE_FLAGS += --enable-kde4
KDE_ICONSET_DEP=libreoffice$(VER)-style-oxygen
BUILD_DEPS += , kdelibs5-dev $(KDELIBS_MINVER)
BUILD_DEPS += , libqt4-dev $(QT_MINVER)
@@@ -976,7 -963,7 +976,7 @@@
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
@@@ -994,7 -981,6 +994,7 @@@ endi
ifeq "$(ENABLE_EVO2)" "n"
CONFIGURE_FLAGS += --disable-evolution2
else
+ CONFIGURE_FLAGS += --enable-evolution2
BUILD_DEPS += , libebook1.2-dev$(OOO_NO_BASE_ARCHS)
endif
@@@ -1016,15 -1002,12 +1016,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"
@@@ -1040,20 -1023,10 +1040,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
@@@ -1138,11 -1111,6 +1138,11 @@@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y
BUILD_DEPS_INDEP += , fontforge
endif
+ifneq "$(ISOS)" "en-US"
+ 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)))
@@@ -1162,8 -1130,6 +1162,8 @@@ ifeq "$(NUM_CPUS)" "
ifneq ($(AVAIL_CPUS),1)
NUM_CPUS := $(shell expr $(AVAIL_CPUS))
endif
+ # http://bugs.debian.org/622644
+ BUILD_DEPS += , make (>= 3.82)
endif
else
ifneq "$(PARALLEL_BUILD)" "y"
@@@ -1175,8 -1141,7 +1175,8 @@@
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)
@@@ -1318,7 -1283,6 +1318,7 @@@ endi
rm -f $(OOO_BUILD_TREE)/src/libreoffice-$(OOO_BUILD_TARBAL_VERSION)*
rm -f $(OOO_BUILD_TREE)/src/GSI*
+ rm -f $(OOO_BUILD_TREE)/src/*.log
for i in ext-sources-$(OOO_BUILD_TREE)/*; do \
rm -f $(OOO_BUILD_TREE)/src/`basename $$i`; \
@@@ -1334,11 -1298,6 +1334,11 @@@
rm -f $(OOO_BUILD_TREE)/download
rm -f $(OOO_BUILD_TREE)/distro-configs/*.conf
rm -f $(OOO_BUILD_TREE)/patches/apply.pl
+ find $(OOO_BUILD_TREE) -name "Makefile" | xargs rm -f
+ rm -f $(OOO_BUILD_TREE)/intltool-extract \
+ $(OOO_BUILD_TREE)/intltool-merge \
+ $(OOO_BUILD_TREE)/intltool-update
+ rm -f $(OOO_BUILD_TREE)/scratch/place
# left-over from ooo-pack-sources
rm -rf .releases
@@@ -1520,10 -1479,6 +1520,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
@@@ -1566,6 -1521,11 +1566,6 @@@ 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
endif
@@@ -1659,6 -1619,17 +1659,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
@@@ -1735,9 -1706,9 +1735,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.
@@@ -1754,14 -1725,6 +1754,14 @@@
PATH=$(BUILD_PATH) DPKG="dpkg" PKGFORMAT="deb"
NO_PKG_MANGLE=go-away \
../solenv/bin/build.pl && ../solenv/bin/deliver.pl
+ifeq "$(PACKAGE_SDK)" "y"
+ # build gengal...
+ cd $(SOURCE_TREE)/svx/source/gengal; \
+ . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ PATH=$(BUILD_PATH) \
+ dmake
+endif
+
ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
$(CURDIR)/debian/rules test
endif
@@@ -1832,18 -1795,10 +1832,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 \
@@@ -1926,6 -1881,9 +1926,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
@@@ -1985,7 -1943,7 +1985,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
@@@ -1996,6 -1954,18 +1996,6 @@@
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
rm -rf $(PKGDIR)-dev-doc
mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev-doc
@@@ -2049,8 -2019,7 +2049,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; \
@@@ -2197,6 -2166,32 +2197,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)
@@@ -2267,9 -2262,6 +2267,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
@@@ -2280,7 -2272,9 +2280,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
@@@ -2308,17 -2302,6 +2308,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"
@@@ -2374,10 -2357,10 +2374,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"
@@@ -2489,12 -2472,6 +2489,12 @@@ 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
+ rm -f
$debian/python-uno/$(OOBRANDDIR)/share/extensions/script-provider-for-python/registration/LICENSE
+ endif
mkdir -p debian/python-uno/usr/share/doc/python-uno
cp -r $(SOURCE_TREE)/pyuno/demo \
@@@ -2511,6 -2488,8 +2511,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
@@@ -2527,6 -2506,12 +2527,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
@@@ -2569,7 -2554,6 +2569,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
( \
@@@ -2597,10 -2581,12 +2597,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"
@@@ -2700,24 -2686,13 +2700,24 @@@ 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
+ifeq "$(PACKAGE_SDK)" "y"
+ # install gengal stuff into -dev
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+ install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/bin/gengal \
+ $(PKGDIR)-dev/$(OODIR)/program/gengal
+ install -m755 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
+ $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
+endif
+
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
@@@ -2873,7 -2848,7 +2873,7 @@@ ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n
# menu files from sysui
dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-filter-mobiledev/usr/share/applications ;\
- sed -e 's,Exec=ooffice \(.*\) %U,Exec=libreoffice$(VER) \1 %U,' \
+ sed -e 's,Exec=$${UNIXBASISROOTNAME} \(.*\) %U,Exec=libreoffice$(VER)
\1 %U,' \
-e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=libreoffice,' \
-e 's,Name=$${PRODUCTNAME} $${PRODUCTVERSION},Name=LibreOffice
$(VER),' \
-e 's,Name\[pt_BR\]=$${PRODUCTNAME_BR}
$${PRODUCTVERSION},Name[pt_BR]=BrOffice $(VER),' \
@@@ -2936,10 -2911,15 +2936,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
@@@ -3024,6 -3004,7 +3024,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/; \
@@@ -3066,33 -3047,6 +3066,33 @@@ 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
+ rm -f
$(PKGDIR)-script-provider-bsh/$(OOBRANDDIR)/share/extensions/script-provider-for-beanshell/registration/LICENSE
+ 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
@@@ -3159,9 -3113,17 +3159,9 @@@ 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
-
# install extension shell lib for use by extensions not from here
install -D -m644 debian/shell-lib-extensions.sh \
$(PKGDIR)-common/usr/share/$(OODIRNAME)/shell-lib-extensions.sh
@@@ -3203,12 -3165,6 +3203,12 @@@
# register technical.dic
perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/'
$(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
+ifeq "$(PACKAGE_SDK)" "y"
+ # install gengal stuff into -dev
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+ install -m644 $(SOURCE_TREE)/svx/$(shell . $(SOURCE_TREE)/*Env*.sh;
echo $$OUTPATH$$PROEXT)/bin/gengalrc \
+ $(PKGDIR)-common/$(OODIR)/program/gengalrc
+endif
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
@@@ -3237,8 -3193,10 +3237,10 @@@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/
dh_installchangelogs -s -k
dh_installmime -s
dh_installmenu -s
- ifeq "$(BUILD_JARS_NATIVE)" "y"
+ ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(BUILD_JARS_NATIVE)" "y"
dh_nativejava -plibreoffice$(VER)-gcj -o
+ endif
endif
ifeq ($(PYTHON_HELPER),dh_python2)
dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
@@@ -3273,8 -3231,8 +3275,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 && \
@@@ -3316,9 -3274,6 +3318,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
@@@ -3344,9 -3299,10 +3346,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)' \
@@@ -3392,9 -3348,9 +3394,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
ifeq "$(USE_XZ_COMPRESS)" "y"
dh_builddeb -plibreoffice$(VER)-dbg -s $(DEBHELPER_OPTIONS)
$(filter-out -Zbzip2,$(BUILDDEB_OPTIONS)) -Zxz
dh_builddeb -Nlibreoffice$(VER)-dbg -s $(DEBHELPER_OPTIONS)
$(BUILDDEB_OPTIONS)
@@@ -3486,7 -3442,7 +3488,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 -Xlibreoffice$(VER)-dbg
-Xliblucene2-java
+ jh_depends -i -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg
-Xliblucene2-java
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
@@@ -3502,7 -3458,7 +3504,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
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qy31c-0004ha...@vasks.debian.org
