[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.4.3-3-14-gabbd15c
The following commit has been merged in the debian-experimental-3.5 branch:
commit abbd15c9637fed6b0166bc48eecb02a1ad446693
Merge: 678c5eb8cc164ba15771705917354a25bef8fe9e eb09b5f97ba3f47a4394292e3c297dd586196841
Author: Rene Engelhard <rene@debian.org>
Date: Wed Sep 28 23:21:14 2011 +0200
Merge remote branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index e0a84a9,fb76593..28ff430
--- a/changelog
+++ b/changelog
@@@ -1,25 -1,26 +1,47 @@@
+libreoffice (1:3.5.0~git20110928-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+
+ * debian/patches/*: move from patches/hotfixes to patch the code
+ directly without libreoffice-build
+
+ * debian/rules, debian/vars.*, debian/*.links.in:
+ - loads of updates for new envfile name and gone LIBSUFFIX
+ * debian/rules:
+ - enable new build against Gtk3
+ - bump python b-d to >= 2.6 as we don't work with earlier anymore.
+ Also build python3-uno
+ - add new conditionals and build-deps for new libvisio,librsvg,gettext
+ usage and libexttextcat switch
+ * debian/rules, debian/control.in:
+ - move from self-defined UPSTREAM_VERSION/ARCH etc. to use
+ /usr/share/dpkg/*.mk
+
+ -- Rene Engelhard <rene@debian.org> Wed, 28 Sep 2011 09:02:08 +0200
+
- libreoffice (1:3.4.3-2) UNRELEASED; urgency=low
+ libreoffice (1:3.4.3-3) unstable; urgency=low
+
+ * debian/patches/jdk-1.7.0-vendorname.diff: backport from master; allow
+ "Oracle Corporation" JDK >= 1.7.0 (closes: #642425)
+ * debian/patches/s390x.diff: add patch from aurel32 to fix build on s390x
+ (closes: #642951)
+
+ * debian/rules:
+ - build against "normal" pentaho libraries again, in new upstream versions
+ (closes: #641594)
+ - build with -g on {,kfreebsd}{i386,amd64} (similar to linux-2.6's -dbgs)
+ as policy says. Compress with xz
+ - allow openjdk 7; build against it on ia64 even when the rest is at 6
+ - stop building -gcj on all openjdk-archs, keep it on gcj-using archs
+ - build with gcc 4.6 again, add build-conflicts on g++ 4.6.1-10 and -11
+
+ * merge from ubuntu-oneiric-3.4:
+ - fixing crash on closing document with footnotes (LP: #854626)
+ - fixing crash on screen resolution change (LP: #852819)
+
+ -- Rene Engelhard <rene@debian.org> Wed, 28 Sep 2011 13:41:27 +0200
+
+ libreoffice (1:3.4.3-2) unstable; urgency=medium
[ Rene Engelhard ]
* debian/patches/no-deprecated-options-in-qstart-wrappers.diff: use --writer
@@@ -29,19 -30,29 +51,29 @@@
for the patch (closes: #633480)
* debian/patches/update-sdbc-postgresql.diff: update SDBC PostgreSQL
driver to Lionels new LibreOffice version.
+ * debian/patches/handle-NULL-display-gracefully.diff: backport from
+ libreoffice-3-4
- * debian/control.in: remove obsolete Pre-Depends on debconf in ure
+ * debian/control.in:
+ - remove obsolete Pre-Depends on debconf in ure
+ - add Breaks: on incompatible -cores on -common (basis-link symlink)
+ (closes: #641357)
* debian/control.postgresql.in: add (>= 8,4) to postgresql suggests to make
more visible that we need >= 8.4 of PostgreSQL. Update Homepage for new
LibreOffice location
* debian/control.reportdesign.in: make -report-builder depend on
-report-builder-bin (>= ${base-version}) (closes: #640900)
- * debian/rules: re-enable -sdbc-postgresql
+ * debian/rules:
+ - re-enable -sdbc-postgresql
+ - fix adding PYTHONPATH to unopkg (closes: #625878)
+ - temporarily build with gcc 4.5 as gcc 4.6.1-10 breaks the vcl build
+ * debian/libreoffice-common.links, debian/rules:
+ - fix mimetype icon links for hicolor (closes: #641860)
[ Lionel Elie Mamane ]
* debian/rules: we need translate-toolkit (>= 1.9.0)
- -- Rene Engelhard <rene@debian.org> Thu, 08 Sep 2011 21:08:20 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 17 Sep 2011 08:28:13 +0000
libreoffice (1:3.4.3-1) unstable; urgency=low
diff --combined control.in
index 70e8e28,55b352b..e110e27
--- a/control.in
+++ b/control.in
@@@ -3,8 -3,7 +3,8 @@@ Section: editor
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release,
+Build-Depends: dpkg-dev (>= 1.16.1),
+ lsb-release,
bzip2,
bison,
flex | flex-old,
@@@ -46,7 -45,7 +46,7 @@@
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~), 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%]
+ 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%], g++-4.6 (= 4.6.1-10), g++-4.6 (= 4.6.1-11)
Standards-Version: 3.9.1
XS-Python-Version: @PYTHON_VERSION@
Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
@@@ -226,11 -225,13 +226,13 @@@ Breaks: libreofficeVER-style-crystal (<
libreofficeVER-style-hicontrast (<< 1:${basis-version}~),
libreofficeVER-style-galaxy (<< 1:${basis-version}~),
libreofficeVER-style-andromeda (<< 1:${basis-version}~),
+ libreofficeVER-core (<< 1:${basis-version}~),
libreofficeVER-style-crystal (>= 1:${next-basis-version}~),
libreofficeVER-style-oxygen (>= 1:${next-basis-version}~),
libreofficeVER-style-tango (>= 1:${next-basis-version}~),
libreofficeVER-style-hicontrast (>= 1:${next-basis-version}~),
libreofficeVER-style-galaxy (>= 1:${next-basis-version}~),
+ libreofficeVER-core (>= 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
@@@ -449,21 -450,6 +451,21 @@@ Description: office productivity suite
with Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME. It
also contains a QuickStarter for the "notification area".
+Package: libreofficeVER-gtk3
+Architecture: %OOO_ARCHS%
+Depends: libreofficeVER-core (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Recommends: libreofficeVER-style-tango
+Section: gnome
+Enhances: libreofficeVER
+Description: office productivity suite -- GTK+ 3.0 integration
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the Gtk plugin for drawing LibreOffices widgets
+ with Gtk+ 3.0
+
Package: libreofficeVER-gnome
Architecture: %OOO_ARCHS%
Depends: libreofficeVER-core (= ${binary:Version}),
@@@ -509,26 -495,6 +511,26 @@@ Depends: libreofficeVER-core (= ${binar
${python:Depends},
${shlibs:Depends},
${misc:Depends}
+Conflicts: python3-uno
+Description: Python-UNO bridge
+ The Python-UNO bridge allows use of the standard LibreOffice API
+ with the Python scripting language. It additionally allows
+ others to develop UNO components in Python, thus Python UNO components
+ may be run within the LibreOffice process and can be called from C++
+ or the built in StarBasic scripting language.
+Homepage: http://udk.openoffice.org/python/python-bridge.html
+
+Package: python3-uno
+Provides: ${python:Provides}, libreofficeVER-script-provider-python
+XB-Python-Version: ${python:Versions}
+Section: python
+Architecture: %OOO_ARCHS%
+Enhances: libreofficeVER
+Depends: libreofficeVER-core (= ${binary:Version}),
+ ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: python-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
diff --combined rules
index 02f7482,c8991a3..5faf5f9
--- a/rules
+++ b/rules
@@@ -15,13 -15,16 +15,13 @@@
################################################################################
vafilt = $(subst $(2)=,,$(filter $(2)=%,$(1)))
-CHANGELOG_VARS := $(shell dpkg-parsechangelog | \
- sed -n 's/ /_/g;/^[^_]/s/^\([^:]*\):_\(.*\)/\1=\2/p')
-PKGSOURCE := $(call vafilt,$(CHANGELOG_VARS),Source)
-SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
-UPSTREAM_VERSION:=$(shell echo "$(SOURCE_VERSION)"| cut -d: -f2 | cut -d- -f1)
-BASE_VERSION:=$(shell echo $(SOURCE_VERSION) | cut -d: -f1):$(UPSTREAM_VERSION)
-BINARY_VERSION=$(SOURCE_VERSION)
+
+include /usr/share/dpkg/pkg-info.mk
+BASE_VERSION:=$(shell echo $(DEB_VERSION) | cut -d: -f1):$(DEB_VERSION_UPSTREAM)
+BINARY_VERSION=$(DEB_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:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d: -f2 | tr [~] [\\-])
HELP_L10N_VIRTUAL_VERSION:=3.4
#VER:=3
OOVER:=3.4
@@@ -33,9 -36,13 +33,9 @@@ ARCH_INDEP_PACKAGES := $(shell dh_listp
ARCH_DEP_PACKAGES := $(shell dh_listpackages -s)
PACKAGES := $(ARCH_INDEP_PACKAGES) $(ARCH_DEP_PACKAGES)
-DPKG_VARS := $(shell dpkg-architecture)
-OS := $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH_OS)
-ARCH := $(call vafilt,$(DPKG_VARS),DEB_HOST_ARCH)
-DIST := $(shell if [ -x /usr/bin/dpkg-vendor ]; then dpkg-vendor --query Vendor; else lsb_release -is; fi)
+include /usr/share/dpkg/architecture.mk
+include /usr/share/dpkg/vendor.mk
DISTREL := $(shell lsb_release -cs)
-DEB_HOST_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(call vafilt,$(DPKG_VARS),DEB_BUILD_GNU_TYPE)
SHELL:=/bin/bash
SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
@@@ -54,7 -61,7 +54,7 @@@ OODIR:=$(OOBASISDIR
# Figure out who's building this package.
OOO_VENDOR:=The Document Foundation/Debian
-ifeq "$(DIST)" "Ubuntu"
+ifeq "$(DEB_VENDOR)" "Ubuntu"
OOO_VENDOR=The Document Foundation, Debian and Ubuntu
endif
export OOO_VENDOR
@@@ -94,7 -101,7 +94,7 @@@ endi
# Default package configuration
#
OOO_ARCHS = alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
-PATCHSET=$(DIST)
+PATCHSET=$(DEB_VENDOR)
BUILD_DEPS=
# These are components which can be built from internal copies, or used from the
@@@ -102,7 -109,6 +102,7 @@@
SYSTEM_STUFF = dicts
BUILD_PYUNO=y
+ENABLE_PYTHON3=y
ifeq "$(BUILD_PYUNO)" "y"
ENABLE_SCRIPT_PROVIDER_PYTHON=y
endif
@@@ -110,31 -116,23 +110,32 @@@ PYTHON_HELPER=dh_python
# 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
# uses pythonX.Y directly (and the dh_pycentral-created dependencies allow
-# also the non-working default python then) - see e.g. #587402
+# also the non-working default python then) - see e.g. #587402. Also
+# note we are NOT working with python < 2.6 anymore!
PYTHON_VERSION=current
ifeq "$(PYTHON_VERSION)" "current"
- PYTHON=python
+ PYTHON=python (>= 2.6)
export PYTHON=python
else
PYTHON=python$(PYTHON_VERSION)
export PYTHON=python$(PYTHON_VERSION)
endif
+ifeq "$(ENABLE_PYTHON3)" "y"
+ PYTHON3_VERSION=current
+ ifeq "$(PYTHON3_VERSION)" "current"
+ PYTHON3=python3
+ else
+ PYTHON3=python$(PYTHON3_VERSION)
+ endif
+endif
PACKAGE_TTF_OPENSYMBOL=y
BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
JDK=openjdk
- ifneq (,$(filter hppa ia64 kfreebsd%, $(DEB_HOST_ARCH)))
+ JAVA_MAINVER=6
- ifneq (,$(filter hppa kfreebsd%, $(ARCH)))
++ ifneq (,$(filter hppa kfreebsd%, $(DEB_HOST_ARCH)))
JDK=gcj-jdk
endif
endif
@@@ -171,7 -169,6 +172,7 @@@ SYSTEM_STUFF += mythe
SYSTEM_STUFF += icu
ICU_MINVER= (>= 4.0)
SYSTEM_STUFF += libwpd libwpg libwps
+#SYSTEM_STUFF += libvisio
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@@ -196,9 -193,6 +197,6 @@@ ifeq "$(ENABLE_JAVA)" "y
# for UOF, but still for e.g. M$.
#SYSTEM_STUFF += saxon
SYSTEM_STUFF += lucene
- ifeq (,$(filter $(DEB_HOST_ARCH), powerpc powerpcspe ppc64))
- BUILD_JARS_NATIVE=y
- endif
endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
@@@ -263,7 -257,6 +261,7 @@@ ENABLE_MINIMIZER=
ENABLE_PRESENTER_CONSOLE=y
ENABLE_PDFIMPORT=y
BUILD_GTK=y
+BUILD_GTK3=y
ENABLE_EVO2=y
ENABLE_GVFS=y
ENABLE_GCONF=y
@@@ -278,12 -271,10 +276,12 @@@ PACKAGE_BASE=
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
ALLOC=system
-SYSTEM_STUFF += libtextcat
+SYSTEM_STUFF += libexttextcat
USE_SYSTEM_TEXTCAT_DATA=y
SYSTEM_STUFF += cppunit
-
+ENABLE_LIBRSVG=y
+SYSTEM_LIBRSVG=y
+SYSTEM_STUFF += gettext
# when we have a package we want to have to be installed on older things with some older
# C++ ABI (like it was the case with libreoffice2), we need to set this. Don't touch
# otherwise
@@@ -307,7 -298,7 +305,7 @@@ CONFIGURE_FLAGS= --disable-post-install
--with-installed-ooo-dirname=$(OODIRNAME) \
--prefix=/usr --mandir=/usr/share/man \
--with-docdir=/usr/share/doc/libreoffice \
- --with-build-version="tag $(OOO_BUILD_TAG), $(DIST) package $(BINARY_VERSION)" \
+ --with-build-version="tag $(OOO_BUILD_TAG), $(DEB_VENDOR) package $(BINARY_VERSION)" \
--disable-strip \
--enable-lockdown \
--with-drink=coffee \
@@@ -340,19 -331,20 +338,19 @@@ define gen_no_arch
$$(_no_arch_macro) = $$(if $$(_no_arch_tmp_$1),$$(_empty) [$$(_no_arch_tmp_$1)])
endef
-LIBSUFFIX := $(shell grep LIBSUFFIX debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
-PLATFORMID := $(shell grep PLATFORMID debian/scripts/vars.$(ARCH) | cut -d"=" -f2)
+PLATFORMID := $(shell grep PLATFORMID debian/scripts/vars.$(DEB_HOST_ARCH) | cut -d"=" -f2)
# ./configure defaults to STLport on i386 and we should keep it for
# ABI-compatability
OOO_STLPORT_ARCHS= i386
-ifeq "$(ARCH)" "i386"
+ifeq "$(DEB_HOST_ARCH)" "i386"
LINK_TO_STLPORT=y
endif
ifeq "$(ENABLE_OPENGL)" "y"
# doesn't make that much sense on armel and mips(el), does it? :)
OOO_OGLTRANS_ARCHS = $(filter-out armel mips%, $(OOO_ARCHS))
- ifeq (,$(filter $(ARCH),$(OOO_OGLTRANS_ARCHS)))
+ ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_OGLTRANS_ARCHS)))
ENABLE_OPENGL=n
endif
$(eval $(call gen_no_archs,OOO_OGLTRANS_ARCHS))
@@@ -364,11 -356,10 +362,10 @@@ OOO_64BIT_ARCHS = $(filter alpha amd64
OOO_JAVA_ARCHS = $(OOO_ARCHS)
$(eval $(call gen_no_archs,OOO_JAVA_ARCHS))
- # gcj does not work on ppc, so no need to build -gcj for it
- OOO_GCJ_ARCHS = $(filter-out powerpc powerpcspe ppc64, $(OOO_JAVA_ARCHS))
+ OOO_GCJ_ARCHS = $(filter-out $(OOO_OPENJDK_ARCHS), $(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_GCJ_ARCHS))
- OOO_GCJ_JDK_ARCHS := hppa ia64 kfreebsd-i386 kfreebsd-amd64
+ OOO_GCJ_JDK_ARCHS := hppa kfreebsd-i386 kfreebsd-amd64
OOO_OPENJDK_ARCHS := $(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_OPENJDK_ARCHS))
@@@ -379,7 -370,7 +376,7 @@@ $(eval $(call gen_no_archs,OOO_BASE_ARC
OOO_REPORTDESIGN_ARCHS := $(filter-out armel,$(OOO_JAVA_ARCHS))
$(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
-ifneq (,$(findstring $(ARCH),$(OOO_NO_BASE_ARCHS)))
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
PACKAGE_BASE=n
ENABLE_SDBC_POSTGRESQL=n
ENABLE_MYSQLNATIVE=n
@@@ -392,7 -383,7 +389,7 @@@
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin -Nlibreoffice$(VER)-report-builder
endif
-ifeq (,$(findstring $(ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
+ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ENABLE_MINIMIZER=n
ENABLE_PDFIMPORT=n
ENABLE_PRESENTER_CONSOLE=n
@@@ -400,24 -391,28 +397,28 @@@
ENABLE_MYSQLNATIVE=n
endif
-ifeq (,$(filter $(ARCH),$(OOO_JAVA_ARCHS)))
+ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
ENABLE_REPORTDESIGN=n
ENABLE_MEDIAWIKI=n
endif
-ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_JDK_ARCHS)))
- ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_OPENJDK_ARCHS)))
+ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_GCJ_JDK_ARCHS)))
+ ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_OPENJDK_ARCHS)))
ENABLE_REPORTDESIGN=n
SYSTEM_STUFF := $(filter-out jfreereport, $(SYSTEM_STUFF))
endif
endif
-ifneq (,$(filter $(ARCH),$(OOO_GCJ_ARCHS)))
++ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
+ BUILD_JARS_NATIVE=y
+ endif
+
ifeq "$(ENABLE_MONO)" "y"
# mono
# ppc fails (#412967), arm(el), too
OOO_MONO_ARCHS = $(filter amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386, $(OOO_ARCHS))
-ifeq (,$(filter $(ARCH),$(OOO_MONO_ARCHS)))
+ifeq (,$(filter $(DEB_HOST_ARCH),$(OOO_MONO_ARCHS)))
ENABLE_MONO=n
endif
else
@@@ -431,7 -426,7 +432,7 @@@ OOO_NPSOPLUGIN_ARCHS
endif
# builds long and is for legacy filters. probably not needed on {arm,mips}{,el}
-ifneq (,$(filter arm% mips% m68k, $(ARCH)))
+ifneq (,$(filter arm% mips% m68k, $(DEB_HOST_ARCH)))
BUILD_BINFILTERS=n
endif
OOO_BINFILTER_ARCHS:=$(filter-out arm% mips% m68k, $(OOO_ARCHS))
@@@ -440,7 -435,7 +441,7 @@@
# Distro-specific overrides
# Debian
-ifeq "$(DIST)" "Debian"
+ifeq "$(DEB_VENDOR)" "Debian"
# we don't need to build all languages and the thesaurus on the buildds;
# they do binary-only builds anyway
ifeq ($(ON_BUILDD),y)
@@@ -451,7 -446,7 +452,7 @@@ endi
# Debian Squeeze
ifeq "$(SQUEEZE_BACKPORT)" "y"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libtextcat graphite, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libwpd libwpg libwps mythes mdds libexttextcat graphite libvisio, $(SYSTEM_STUFF))
JUNIT_MIN_VER=
PARALLEL_BUILD=n
endif
@@@ -462,14 -457,14 +463,14 @@@ CC_PREFIX:=$(shell gcc -dumpmachine)
ifeq "$(GCC_VERSION)" ""
ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
- ifeq ($(ARCH),$(findstring $(ARCH),$(OOO_GCJ_ARCHS)))
+ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_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)))
+ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_GCJ_JDK_ARCHS)))
# sanity check. amd64 is in kfreebsd-amd64; same for i386 and mips
- ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_OPENJDK_ARCHS)))
+ ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_OPENJDK_ARCHS)))
GCC_VERSION := $(GCJ_JDK_VERSION)
else
GCC_VERSION := $(SYSTEM_GCC_VERSION)
@@@ -507,24 -502,23 +508,24 @@@ ifneq "$(PACKAGE_SDK)" "y
CONFIGURE_FLAGS += --disable-odk
endif
-ifeq "$(ENABLE_MINIMIZER)" "y"
- CONFIGURE_FLAGS += --enable-ext-presenter-minimizer
+ifneq "$(ENABLE_MINIMIZER)" "y"
+ CONFIGURE_FLAGS += --disable-ext-presenter-minimizer
endif
-ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- CONFIGURE_FLAGS += --enable-ext-presenter-console
+ifneq "$(ENABLE_PRESENTER_CONSOLE)" "y"
+ CONFIGURE_FLAGS += --disable-ext-presenter-console
endif
ifeq "$(ENABLE_PDFIMPORT)" "y"
- CONFIGURE_FLAGS += --enable-ext-pdfimport
- BUILD_DEPS += , libpoppler-dev (>= 0.8.0)
+ BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-cpp-dev
+else
+ CONFIGURE_FLAGS += --disable-ext-pdfimport
endif
# fails their tests
-ifeq "$(ARCH)" "armel"
+ifeq "$(DEB_HOST_ARCH)" "armel"
ENABLE_GRAPHITE=n
SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
endif
-ifeq "$(ARCH)" "sparc"
+ifeq "$(DEB_HOST_ARCH)" "sparc"
ENABLE_GRAPHITE=n
SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
endif
@@@ -538,8 -532,11 +539,8 @@@ els
endif
-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
+ifneq (,$(filter libexttextcat, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libtextcat-dev (>= 3.0.1)
TEXTCAT_DATA_RECOMMENDS := libtextcat-data (>= 2.2-9)
endif
@@@ -554,17 -551,6 +555,17 @@@ ifneq (,$(filter openssl, $(SYSTEM_STUF
DBG_DBG_SUGGESTS += , libssl$(shell readlink /usr/lib/libssl.so | cut -d"." -f3,4,5)-dbg
endif
+ifneq "$(ENABLE_RSVG)" "y"
+ ifeq "$(SYSTEM_LIBRSVG)" "y"
+ BUILD_DEPS += , librsvg2-dev
+ CONFIGURE_FLAGS += --enable-librsvg=auto
+ else
+ CONFIGURE_FLAGS += --enable-librsvg=internal
+ endif
+else
+ CONFIGURE_FLAGS += --enable-librsvg=no
+endif
+
BUILD_DEPS += , libdb-dev
DBG_DBG_SUGGESTS += , $(shell dpkg -s libdb-dev | grep Depends | awk '{ print $$2 }' | sed -e s/dev/dbg/)
@@@ -574,10 -560,19 +575,19 @@@ ifneq "$(BUILD_DBG_PACKAGE)" "y
else
ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
SMALL_SYMBOLS = n
- # reduces -dbg size from 760M to ~320M
USE_XZ_COMPRESS = y
else
- ifneq (,$(findstring i386,$(ARCH)))
++ ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
+ SMALL_SYMBOLS = n
+ USE_XZ_COMPRESS = y
+ else
- ifneq (,$(findstring amd64,$(ARCH)))
++ ifneq (,$(findstring amd64,$(DEB_HOST_ARCH)))
+ SMALL_SYMBOLS = n
+ USE_XZ_COMPRESS = y
+ else
SMALL_SYMBOLS = y
+ endif
+ endif
endif
DBG_DBG_SUGGESTS+= , libc6.1-dbg [alpha ia64], libc0.1-dbg [kfreebsd-i386 kfreebsd-amd64], libc0.3-dbg [hurd-i386], libc6-dbg [!ia64 !alpha !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libatk1.0-dbg, libglib2.0-0-dbg, libgnomevfs2-0-dbg, libstdc++6-$(SYSTEM_GCC_VERSION)-dbg, libx11-6-dbg, libxext6-dbg, libxaw7-dbg, libxml2-dbg, libgtk2.0-0-dbg, libxau6-dbg, libice6-dbg, libsm6-dbg, libxinerama1-dbg, libfontconfig1-dbg
ifeq "$(USE_LIBCURL4)" "y"
@@@ -600,18 -595,25 +610,18 @@@ ifeq (noopt,$(findstring noopt,$(DEB_BU
ARCH_FLAGS += -O0
endif
-ifeq "$(USE_XZ_COMPRESS)" "y"
- # used only for -dbg yet, so disabled and done manually
- # in binary-arch
- #BUILDDEB_OPTIONS = -- -Zxz
- BUILD_DEPS += , dpkg-dev (>= 1.15.6)
-else
- BUILD_DEPS += , dpkg-dev (>= 1.15.1)
-endif
-
# Build python depends from current python version
PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]")
PYMINOR:=$(shell python -c "import sys; print sys.version_info[1]")
PYMINORPLUS1:=$(shell python -c "import sys; print sys.version_info[1]+1")
PYTHON_SITE:=debian/python-uno/$(shell python -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
+PY3MAJOR:=$(shell python3 -c "import sys; print sys.version_info[0]")
+PY3MINOR:=$(shell python3 -c "import sys; print sys.version_info[1]")
+PY3MINORPLUS1:=$(shell python3 -c "import sys; print sys.version_info[1]+1")
+PYTHON3_SITE:=debian/python3-uno/$(shell python3 -c 'from distutils import sysconfig; print(sysconfig.get_python_lib())')
ifeq "$(BUILD_PYUNO)" "y"
- ifeq ($(PYTHON_HELPER),dh_python2)
- BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
- else ifeq ($(PYTHON_HELPER),dh_pycentral)
+ ifeq ($(PYTHON_HELPER),dh_pycentral)
BUILD_DEPS += , python-central (>= 0.5)
else ifeq ($(PYTHON_HELPER),dh_pysupport)
ifeq "$(PYMAJOR).$(PYMINOR)" "2.6"
@@@ -621,10 -623,7 +631,10 @@@
endif
endif
DBG_DBG_SUGGESTS+= , python-dbg
- BUILD_DEPS += , $(PYTHON)-dev
+ BUILD_DEPS += , $(PYTHON)-dev (>= 2.6)
+ ifeq "$(ENABLE_PYTHON3)" "y"
+ BUILD_DEPS += $(PYTHON3)-dev
+ endif
else
BUILD_DEPS += , python
endif
@@@ -634,6 -633,9 +644,6 @@@
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
STAMP_NATIVE_JARS = $(STAMP_DIR)/native-jars
- ifeq "$(NEW_DPKG_SHLIBDEPS)" "n"
- BUILD_DEPS += , dpkg-dev (>= 1.13.19)
- endif
JAVA_GCJ_DEPENDS = libgcj-common (>= 1:4.1.1-14)
endif
endif
@@@ -721,21 -723,26 +731,26 @@@ ifeq "$(ENABLE_JAVA)" "y
endif
ifeq "$(JDK)" "openjdk"
ifeq "$(SQUEEZE_BACKPORT)" "y"
- BUILD_DEPS += , openjdk-6-jdk [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
- JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+ BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
+ JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk
else
- BUILD_DEPS += , openjdk-6-jdk (>= 6b23~pre8-2) [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
- JAVA_HOME=/usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH)
+ ifeq "$(JAVA_MAINVER)" "6"
+ BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk (>= 6b23~pre8-2) [$(filter-out ia64,$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))])
+ BUILD_DEPS += , openjdk-7-jdk [ia64]
- ifeq "$(ARCH)" "ia64"
++ ifeq "$(DEB_HOST_ARCH)" "ia64"
+ JAVA_MAINVER=7
+ endif
+ else
+ BUILD_DEPS += , openjdk-$(JAVA_MAINVER)-jdk [$(filter-out $(OOO_GCJ_JDK_ARCHS),$(OOO_JAVA_ARCHS))]
+ endif
- JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk-$(ARCH)
++ JAVA_HOME=/usr/lib/jvm/java-$(JAVA_MAINVER)-openjdk-$(DEB_HOST_ARCH)
endif
CONFIGURE_FLAGS += --with-java-target-version=1.5
endif
TEST_JAVA_HOME=$(JAVA_HOME)
- ifeq "$(BUILD_JARS_NATIVE)" "y"
- 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)" ""
+ ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
BUILD_DEPS += , gcj-jdk [$(OOO_GCJ_JDK_ARCHS)]
- endif
+ BUILD_DEPS += , gcj-native-helper [$(OOO_GCJ_ARCHS)], libgcj-common (>= 1:4.4.1) [$(OOO_GCJ_ARCHS)]
endif
ifeq "$(ENABLE_MEDIAWIKI)" "y"
BUILD_DEPS += , ant (>= 1.7.0)$(OOO_NO_JAVA_ARCHS), ant-optional (>= 1.7.0)$(OOO_NO_JAVA_ARCHS)
@@@ -753,10 -760,14 +768,14 @@@ endi
# ifneq (,$(GCJ_JAWT_DEPENDS))
# JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
# endif
- ifneq (,$(filter $(ARCH), $(OOO_OPENJDK_ARCHS)))
- ifneq "$(ARCH)" "ia64"
+ ifneq (,$(filter $(DEB_HOST_ARCH), $(OOO_OPENJDK_ARCHS)))
- JAVA_RUNTIME_DEPENDS += | openjdk-6-jre
++ ifneq "$(DEB_HOST_ARCH)" "ia64"
+ JAVA_RUNTIME_DEPENDS += | openjdk-6-jre | openjdk-7-jre
+ else
+ JAVA_RUNTIME_DEPENDS += | openjdk-7-jre
+ endif
endif
- ifneq (,$(filter $(ARCH), amd64 i386))
+ ifneq (,$(filter $(DEB_HOST_ARCH), amd64 i386))
JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
endif
JAVA_RUNTIME_DEPENDS += | java5-runtime
@@@ -772,7 -783,7 +791,7 @@@ export JAVA_HOM
BUILD_DEPS += , libsaxonb-java$(OOO_NO_JAVA_ARCHS)
endif
ifeq "$(PACKAGE_SDK)" "y"
- ifeq "$(DIST)" "Debian"
+ ifeq "$(DEB_VENDOR)" "Debian"
BUILD_DEPS += , gcc-mingw32$(OOO_NO_JAVA_ARCHS), mingw32-runtime$(OOO_NO_JAVA_ARCHS)
CONFIGURE_FLAGS += --enable-build-unowinreg
CONFIGURE_FLAGS += --with-mingw=i586-mingw32msvc-g++
@@@ -795,10 -806,10 +814,10 @@@ export MINGWSTRIP = i586-mingw32msvc-st
ifeq "$(ENABLE_REPORTDESIGN)" "y"
# report-builder
ifneq (,$(filter jfreereport, $(SYSTEM_STUFF)))
- REPORT_BUILDER_BUILD_DEPS += , libbase-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libsac-java$(OOO_NO_REPORTDESIGN_ARCHS), libxml-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libflute-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libpentaho-reporting-flow-engine-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), liblayout-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libloader-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libformula-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), librepository-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libfonts-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS), libserializer-java-openoffice.org$(OOO_NO_REPORTDESIGN_ARCHS)
- REPORT_BUILDER_JAR_DEPENDS := , libbase-java-openoffice.org, libsac-java, libxml-java-openoffice.org, libflute-java-openoffice.org, libpentaho-reporting-flow-engine-java-openoffice.org, liblayout-java-openoffice.org, libloader-java-openoffice.org, libformula-java-openoffice.org, librepository-java-openoffice.org, libfonts-java-openoffice.org, libserializer-java-openoffice.org
+ REPORT_BUILDER_BUILD_DEPS += , libbase-java$(OOO_NO_REPORTDESIGN_ARCHS), libsac-java$(OOO_NO_REPORTDESIGN_ARCHS), libxml-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libflute-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libpentaho-reporting-flow-engine-java (>= 0.9.4)$(OOO_NO_REPORTDESIGN_ARCHS), liblayout-java (>= 0.2.10)$(OOO_NO_REPORTDESIGN_ARCHS), libloader-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libformula-java (>= 1.1.7)$(OOO_NO_REPORTDESIGN_ARCHS), librepository-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libfonts-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS), libserializer-java (>= 1.1.6)$(OOO_NO_REPORTDESIGN_ARCHS)
+ REPORT_BUILDER_JAR_DEPENDS := , libbase-java, libsac-java, libxml-java (>= 1.1.6), libflute-java (>= 1.1.6), libpentaho-reporting-flow-engine-java (>= 0.9.4), liblayout-java (>= 0.2.10), libloader-java (>= 1.1.6), libformula-java (>= 1.1.7), librepository-java (>= 1.1.6), libfonts-java (>= 1.1.6), libserializer-java (>= 1.1.6)
BUILD_DEPS += $(REPORT_BUILDER_BUILD_DEPS)
- CONFIGURE_FLAGS += --with-libbase-jar=/usr/share/java/openoffice/libbase.jar --with-libxml-jar=/usr/share/java/openoffice/libxml.jar --with-flute-jar=/usr/share/java/openoffice/flute.jar --with-jfreereport-jar=/usr/share/java/openoffice/flow-engine.jar --with-liblayout-jar=/usr/share/java/openoffice/liblayout.jar --with-libloader-jar=/usr/share/java/openoffice/libloader.jar --with-libformula-jar=/usr/share/java/openoffice/libformula.jar --with-librepository-jar=/usr/share/java/openoffice/librepository.jar --with-libfonts-jar=/usr/share/java/openoffice/libfonts.jar --with-libserializer-jar=/usr/share/java/openoffice/libserializer.jar
+ CONFIGURE_FLAGS += --with-libbase-jar=/usr/share/java/libbase.jar --with-libxml-jar=/usr/share/java/libxml.jar --with-flute-jar=/usr/share/java/flute.jar --with-jfreereport-jar=/usr/share/java/flow-engine.jar --with-liblayout-jar=/usr/share/java/liblayout.jar --with-libloader-jar=/usr/share/java/libloader.jar --with-libformula-jar=/usr/share/java/libformula.jar --with-librepository-jar=/usr/share/java/librepository.jar --with-libfonts-jar=/usr/share/java/libfonts.jar --with-libserializer-jar=/usr/share/java/libserializer.jar
endif
ifneq (,$(filter apache-commons, $(SYSTEM_STUFF)))
REPORT_BUILDER_BUILD_DEPS += , libcommons-logging-java$(OOO_NO_JAVA_ARCHS)
@@@ -807,8 -818,7 +826,8 @@@
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-ext-report-builder
+ else
+ CONFIGURE_FLAGS += --disable-ext-report-builder
endif
OOO_OFFICEBEAN_DEP = libreoffice$(VER)-officebean
BUILD_DEPS += , javahelper $(JAVAHELPER_MIN_VERSION)
@@@ -836,7 -846,7 +855,7 @@@ ifneq "$(MOZILLA)" "
endif
endif
endif
-ifneq (,$(findstring $(ARCH),$(OOO_MOZILLA_ARCHS)))
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_MOZILLA_ARCHS)))
CONFIGURE_FLAGS += --with-system-mozilla=$(MOZILLA)
else
CONFIGURE_FLAGS += --disable-mozilla --without-system-mozilla
@@@ -941,9 -951,6 +960,9 @@@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y
ifneq (,$(filter libwpg, $(SYSTEM_STUFF)))
BUILD_DEPS += , libwpg-dev (>= 0.2.0)
endif
+ ifneq (,$(filter libvisio, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libvisio-dev
+ endif
endif
CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
@@@ -1006,15 -1013,6 +1025,15 @@@ ifeq "$(BUILD_GTK)" "n
DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-gtk -Nlibreoffice$(VER)-gnome
CONFIGURE_FLAGS+= --with-images="$(IMAGES)"
endif
+ifeq "$(BUILD_GTK3)" "y"
+ BUILD_DEPS += , libgtk-3-dev
+ CONFIGURE_FLAGS+= --enable-gtk3
+ ifneq (cairo,$(findstring cairo,$(SYSTEM_STUFF)))
+ $(error GTK3 build fails without system-cairo!!)
+ endif
+else
+ DEBHELPER_OPTIONS+= -Nlibreoffice$(VER)-gtk3
+endif
ifeq "$(ENABLE_EVO2)" "n"
CONFIGURE_FLAGS += --disable-evolution2
@@@ -1063,13 -1061,13 +1082,13 @@@ ifeq "$(ENABLE_JAVA)" "y
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
BUILD_DEPS += , libhsqldb-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS)
BASE_HSQLDB_DEPENDS = libhsqldb-java $(HSQLDB_MINVER), libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)
- JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj
+ JAVA_GCJ_DEPENDS += , libhsqldb-java-gcj [$(OOO_GCJ_ARCHS)]
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_BSH)" "y"
ifneq (,$(filter beanshell, $(SYSTEM_STUFF)))
BUILD_DEPS += , bsh (>= 2.0b4)$(OOO_NO_JAVA_ARCHS)
BSH_DEPENDS = bsh (>= 2.0b4)
- JAVA_GCJ_DEPENDS += , bsh-gcj
+ JAVA_GCJ_DEPENDS += , bsh-gcj [$(OOO_GCJ_ARCHS)]
endif
CONFIGURE_FLAGS += --enable-ext-scripting-beanshell
else
@@@ -1158,9 -1156,6 +1177,9 @@@ ifeq "$(ENABLE_GCONF)" "y
else
CONFIGURE_FLAGS += --disable-gconf
endif
+ifneq (,$(filter gettext, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , gettext
+endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
BUILD_DEPS_INDEP += , fontforge
@@@ -1267,7 -1262,7 +1286,7 @@@ clean-debdir
# Clean compilation results, but leave solver (about 600Mb in addition to instsetoo)
clean-objectdirs: clean-instsetoo
dh_testdir
- find $(SOURCE_TREE) -maxdepth 2 -name $(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT) -type d -exec rm -rf {} \;
+ find $(SOURCE_TREE) -maxdepth 2 -name $(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT) -type d -exec rm -rf {} \;
clean:
dh_testroot
@@@ -1381,7 -1376,7 +1400,7 @@@ debian/control: $(wildcard debian/contr
chmod 755 $(OOO_BUILD_TREE)/bin/openoffice-xlate-lang
sed -e "s#libreofficeVER#libreoffice$(VER)#g" \
-e "s#libreofficeVER#libreoffice$(VER)#g" \
- -e "s#%$(DIST)=\([^%]*\)%#, \1#g#" \
+ -e "s#%$(DEB_VENDOR)=\([^%]*\)%#, \1#g#" \
-e "s#%[A-Za-z]*=[^%]*%##g#" \
-e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
-e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
@@@ -1400,7 -1395,7 +1419,7 @@@ ifeq "$(ENABLE_LDAP)" "y
endif
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
- [ "$$LNUM" = en-US -a "$(PKGSOURCE)" = "libreoffice$(VER)-l10n" ] && continue; \
+ [ "$$LNUM" = en-US -a "$(DEB_SOURCE)" = "libreoffice$(VER)-l10n" ] && continue; \
LNAME=`$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -l $$LNUM | perl -e 'print ucfirst(<STDIN>);'`; \
LCODE=`$(OOO_BUILD_TREE)/bin/openoffice-xlate-lang -i $$LNUM | tr A-Z a-z`; \
CCODE=`echo $$LCODE | sed 's/-.*//'`; \
@@@ -1480,10 -1475,8 +1499,8 @@@ endi
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.ure.in
ifeq "$(ENABLE_JAVA)" "y"
- ifeq "$(BUILD_JARS_NATIVE)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.gcj.in
- endif
endif
ifneq "$(OOO_MONO_ARCHS)" ""
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
@@@ -1768,15 -1761,6 +1785,15 @@@ els
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
+ifeq "$(BUILD_PYUNO)" "y"
+ ifeq "$(ENABLE_PYTHON3)" "y"
+ cd $(SOURCE_TREE)/pyuno; \
+ . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
+ PATH=$(BUILD_PATH) PYTHON=$(PYTHON3) PYTHON_CFLAGS=$(shell pkg-config --cflags python-3.2mu.pc) PYTHON_LIBS=$(shell pkg-config --cflags python-3.2mu.pc) \
+ ../solenv/bin/build.pl # NO DELIVER!
+ endif
+endif
+
# apparently setting this here globally doesn't work, so hack around.
# If we don't do this we get loads of harmless, but log-bloating
# warnings
@@@ -1787,7 -1771,7 +1804,7 @@@
# DPKG is only set on with-EPM build what we don't do and the menu stuff
# is only built wenn DPKG is set.. Same with PKGFORMAT.
cd $(SOURCE_TREE)/sysui; \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
PATH=$(BUILD_PATH) DPKG="dpkg" PKGFORMAT="deb" NO_PKG_MANGLE=go-away \
../solenv/bin/build.pl && ../solenv/bin/deliver.pl
@@@ -1807,9 -1791,9 +1824,9 @@@ endi
test:
# some test library needed for the tests...
- if [ ! -f $(SOURCE_TREE)/test/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/lib/libtest.so ]; then \
+ if [ ! -f $(SOURCE_TREE)/test/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/libtest.so ]; then \
cd $(SOURCE_TREE)/test && \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
export PATH=$(BUILD_PATH); \
../solenv/bin/build.pl; \
../solenv/bin/deliver.pl; \
@@@ -1817,19 -1801,19 +1834,19 @@@
ifeq "$(RUN_SMOKETEST)" "y"
# sigh. the new smoketest needs a archive/install/en-US/OOo_*_install_*.tar.gz
# build it.
- if [ ! -d $(SOURCE_TREE)/instsetoo_native/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/OpenOffice/archive/install/en-US ]; then \
+ if [ ! -d $(SOURCE_TREE)/instsetoo_native/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/OpenOffice/archive/install/en-US ]; then \
cd $(SOURCE_TREE)/instsetoo_native/util && \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
export PATH=$(BUILD_PATH); \
EPM=yes PKGFORMAT=archive WITH_LANG="en-US" dmake openoffice; \
fi
# smoketest
-ifeq "$(ARCH)" "armel"
+ifeq "$(DEB_HOST_ARCH)" "armel"
cd $(SOURCE_TREE)/smoketestoo_native && \
patch -p1 < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
cd $(SOURCE_TREE)/smoketestoo_native && \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
export PATH=$(BUILD_PATH); \
export TMPDIR=$(CURDIR)/debian/smoketest; \
export JAVA_HOME=$(TEST_JAVA_HOME); \
@@@ -1839,7 -1823,7 +1856,7 @@@
# doesn't get cleaned up.. (at least the dirs, the contents are gone)
cd $(CURDIR)/debian/smoketest && \
find . -noleaf -maxdepth 1 ! -name "patches" ! -name "." -exec rm -rf {} \;
-ifeq "$(ARCH)" "armel"
+ifeq "$(DEB_HOST_ARCH)" "armel"
cd $(SOURCE_TREE)/smoketestoo_native && \
patch -p1 -R < $(CURDIR)/debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff
endif
@@@ -1847,7 -1831,7 +1864,7 @@@ endi
ifeq "$(RUN_SUBSEQUENT_TESTS)" "y"
cd $(SOURCE_TREE) && \
export PATH=$(BUILD_PATH); \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ . $(CURDIR)/$(SOURCE_TREE)/Env.Host.sh; \
chmod 755 solenv/bin/subsequenttests && \
solenv/bin/subsequenttests
endif
@@@ -1870,7 -1854,7 +1887,7 @@@ $(STAMP_DIR)/install: $(STAMP_DIR)/buil
# /usr/lib/libfakeroot anymore, causiong loads of ERROR:'s from
# ld.so. Set LD_PRELOAD to the full path here manually.
cd $(SOURCE_TREE)/; \
- . $(CURDIR)/$(SOURCE_TREE)/*Env*.sh; \
+ . $(CURDIR)/$(SOURCE_TREE)/Env.Host.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 \
@@@ -2068,7 -2052,7 +2085,7 @@@ endi
#
# Generate maintainer scripts
maintscripts: $(STAMP_DIR)/maintscripts
-$(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*Env*.sh) $(wildcard debian/*.preinst.in) $(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard debian/*.postrm.in) debian/scripts/vars.$(ARCH) debian/control
+$(STAMP_DIR)/maintscripts: $(wildcard debian/shell-lib*.sh) $(wildcard debian/*.preinst.in) $(wildcard debian/*.postinst.in) $(wildcard debian/*.prerm.in) $(wildcard debian/*.postrm.in) debian/scripts/vars.$(DEB_HOST_ARCH) debian/control
dh_testdir
rm -f debian/*.{pre,post}{inst,rm}
@@@ -2080,7 -2064,8 +2097,7 @@@
if [ -e $$MAINTSCRIPT.in ]; then \
sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' < $$MAINTSCRIPT.in | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' > $$MAINTSCRIPT; \
if echo $(ARCH_DEP_PACKAGES) | grep -q $$PKG; then \
- grep LIBSUFFIX debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
- grep PLATFORMID debian/scripts/vars.$(ARCH) >> $$MAINTSCRIPT; \
+ grep PLATFORMID debian/scripts/vars.$(DEB_HOST_ARCH) >> $$MAINTSCRIPT; \
fi; \
echo "" >> $$MAINTSCRIPT; \
if egrep -q "(add|remove|validate|sync)_extension" $$MAINTSCRIPT.in; then \
@@@ -2149,7 -2134,7 +2166,7 @@@ $(STAMP_DIR)/langpacks: $(STAMP_DIR)/in
> $$TMP && \
debian/scripts/cleandupes --base=libreoffice$(VER) --prefix=debian < $$TMP && rm -f $$TMP
-ifeq "$(DIST)" "Debian"
+ifeq "$(DEB_VENDOR)" "Debian"
# install Debian presentation template
otps=`cd debian/templates; echo *.otp`; \
for iso in $(LANGPACKISOS); do \
@@@ -2184,6 -2169,7 +2201,7 @@@ endi
native-jars: $(STAMP_NATIVE_JARS)
$(STAMP_NATIVE_JARS): $(STAMP_DIR)/install
+ ifeq "$(BUILD_JARS_NATIVE)" "y"
rm -rf debian/tmp/native-jars
mkdir -p debian/tmp/native-jars/gcj
cp -a \
@@@ -2224,6 -2210,7 +2242,7 @@@ endi
| xargs -r -0 \
gcj-dbtool -m debian/tmp/native-jars/tmp.db debian/tmp/native-jars/tmp.db || exit 1
rm -f debian/tmp/native-jars/gcj/*.db
+ endif
touch $@
# Install files generated by setup into arch-dependent package directories
@@@ -2304,7 -2291,7 +2323,7 @@@ ifeq "$(ENABLE_KDEAB)" "y
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 \
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/kab1.component \
$(PKGDIR)-kab/$(OODIR)/registered-components/kab1.component
endif
@@@ -2313,16 -2300,11 +2332,16 @@@
mkdir -p -m755 $(PKGDIR)-gnome/$(OODIR)/program
mv $(PKGDIR)-core/$(OODIR)/program/gnome-open-url.bin $(PKGDIR)-gnome/$(OODIR)/program || exit 1
ifeq "$(BUILD_GTK)" "y"
- for f in fps_gnome.uno.so libvclplug_gtk*.so; do \
+ for f in fps_gnome.uno.so libvclplug_gtklo.so; 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
+ifeq "$(BUILD_GTK3)" "y"
+ for f in libvclplug_gtk3lo.so; do \
+ mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
+ done
+endif
# split out gtk stuff
rm -rf $(PKGDIR)-gtk
@@@ -2350,14 -2332,14 +2369,14 @@@ 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 \
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.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 \
+ install -m644 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$UPD/$$OUTPATH$$PROEXT)/xml/$$i.component \
$(PKGDIR)-filter-binfilter/$(OODIR)/registered-components/$$i.component; \
done
endif
@@@ -2447,7 -2429,7 +2466,7 @@@ endi
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`" ;\
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
for p in writer calc impress draw math base; do \
mkdir -p -m755 $(PKGDIR)-$$p/usr/share/applications ;\
sed -e 's,Exec=$${UNIXBASISROOTNAME} \(.*\) %U,Exec=libreoffice$(VER) \1 %U,' \
@@@ -2530,31 -2512,11 +2549,31 @@@ 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_PYTHON3)" "y"
+ install -d $(PYTHON3_SITE)
+ cp $(PYTHON_SITE)/uno.py \
+ $(PYTHON3_SITE)
+ cp $(PYTHON_SITE)/unohelper.py \
+ $(PYTHON3_SITE)
+ cat debian/python-uno/$(OODIR)/program/pythonloader.unorc \
+ sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY3MAJOR).$(PY3MINOR)/" \
+ > debian/python3-uno/$(OODIR)/program/pythonloader.unorc
+ for i in pyuno.so pythonloader.uno.so libpyuno.so; do \
+ install -m644 $(SOURCE_TREE)/pyuno/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/$$i \
+ debian/python3-uno/$(OODIR)/$$i; \
+ done
+ endif
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
+ rm -f debian/python-uno/$(OOBRANDDIR)/share/extensions/script-provider-for-python/registration/LICENSE
+ ifeq "$(ENABLE_PYTHON3)" "y"
+ mkdir -p debian/python3-uno/$(OOBRANDDIR)/share/extensions
+ mv debian/tmp/$(OOBRANDDIR)/share/extensions/script-provider-for-python \
+ debian/python3-uno/$(OOBRANDDIR)/share/extensions
- rm -f $debian/python3-uno/$(OOBRANDDIR)/share/extensions/script-provider-for-python/registration/LICENSE
++ rm -f debian/python3-uno/$(OOBRANDDIR)/share/extensions/script-provider-for-python/registration/LICENSE
+ endif
endif
mkdir -p debian/python-uno/usr/share/doc/python-uno
@@@ -2565,16 -2527,6 +2584,16 @@@
done
cd debian/python-uno/usr/share/doc/python-uno && \
find . -type d -name "CVS" | xargs -r rm -rf
+ ifeq "$(ENABLE_PYTHON3)" "y"
+ mkdir -p debian/python3-uno/usr/share/doc/python3-uno
+ cp -r $(SOURCE_TREE)/pyuno/demo \
+ debian/python3-uno/usr/share/doc/python3-uno; \
+ for i in $(SOURCE_TREE)/pyuno/doc/*; do \
+ cp $$i debian/python3-uno/usr/share/doc/python3-uno; \
+ done
+ cd debian/python3-uno/usr/share/doc/python3-uno && \
+ find . -type d -name "CVS" | xargs -r rm -rf
+ endif
endif
ifeq "$(ENABLE_MONO)" "y"
@@@ -2641,7 -2593,7 +2660,7 @@@ ifeq "$(PACKAGE_SDK)" "y
# 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 \
+ install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$UPD/$$OUTPATH$$PROEXT)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
( \
echo '#! /bin/sh'; \
@@@ -2676,7 -2628,7 +2695,7 @@@ endi
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(BUILD_JARS_NATIVE)" "y"
- ifneq "$(PKGSOURCE)" "libreoffice$(VER)-l10n"
+ ifneq "$(DEB_SOURCE)" "libreoffice$(VER)-l10n"
rm -rf $(PKGDIR)-gcj/usr/lib/gcj
mkdir -p $(PKGDIR)-gcj/usr/lib/gcj/$(OODIRNAME)
cp -p debian/tmp/native-jars/gcj/* $(PKGDIR)-gcj/usr/lib/gcj/$(OODIRNAME)
@@@ -2698,7 -2650,7 +2717,7 @@@ ifeq "$(PACKAGE_SDK)" "y
ifeq "$(ENABLE_JAVA)" "y"
# install the UNO Java sources for e.g. eclipse
mkdir -p $(CURDIR)/$(PKGDIR)-dev/usr/share/java
- cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$UPD)/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin && \
+ cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$UPD)/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin && \
for i in juh jurt jut ridl unoloader; do \
cp $${i}_src.zip \
$(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
@@@ -2752,7 -2704,7 +2771,7 @@@ ifeq "$(ENABLE_SDBC_POSTGRESQL)" "y
rm -rf $(PKGDIR)-sdbc-postgresql
mkdir -p $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g)
cd $(PKGDIR)-sdbc-postgresql/$(OOBRANDDIR)/share/extensions/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g) && \
- unzip $(CURDIR)/$(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).oxt
+ unzip $(CURDIR)/$(SOURCE_TREE)/connectivity/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/lib/postgresql-sdbc-$(shell grep ^PQ_SDBC_M $(SOURCE_TREE)/connectivity/source/drivers/postgresql/makefile.mk | cut -d"=" -f2 | xargs | sed -e s/\ /\./g).oxt
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
@@@ -2801,7 -2753,8 +2820,7 @@@ endi
for PKG in $(ARCH_DEP_PACKAGES); do \
LINKS=debian/$$PKG.links ; \
if [ -e $$LINKS.in ]; then \
- sed -e "s/\@LIBSUFFIX\@/$(LIBSUFFIX)/g" \
- -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
+ sed -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
< $$LINKS.in > $$LINKS ; \
fi; \
done
@@@ -2830,7 -2783,7 +2849,7 @@@ endi
rm -f $(PKGDIR)-common/$(OODIR)/program/oo_product.bmp
# Extract and install icons
- cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract libreoffice$(OOVER)-debian-menus_*_all.deb . && cd usr/share/icons && \
+ cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract libreoffice$(OOVER)-debian-menus_*_all.deb . && cd usr/share/icons && \
rm -rf gnome locolor && \
for d in `find -type d`; do \
install -d -m755 $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$d || exit 1 ;\
@@@ -2841,7 -2794,7 +2860,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`" ;\
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-common/usr/share/applications ;\
sed -e 's,Exec=$${UNIXBASISROOTNAME} %U,Exec=libreoffice$(VER) %U,' \
-e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=libreoffice,' \
@@@ -2859,7 -2812,7 +2878,7 @@@ endi
# install .applications, .keys, .mime and openoffice.org.xml for
# shared-mime-info
mkdir -p $(PKGDIR)-common/usr/share/application-registry && \
- cat $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/openoffice.applications \
+ cat $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/openoffice.applications \
| sed -e s/OFFICENAME/ooffice/g \
| sed -e s/\%PRODUCTNAME/LibreOffice/g \
> $(PKGDIR)-common/usr/share/application-registry/openoffice.applications
@@@ -2868,10 -2821,10 +2887,10 @@@
install -m644 $(SOURCE_TREE)/sysui/desktop/mimetypes/openoffice.mime \
$(PKGDIR)-common/usr/share/mime-info && \
rm -f $(PKGDIR)-common/usr/share/mime-info/openoffice.keys; \
- for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/*.keys; do \
+ for i in $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/*.keys; do \
cat $$i >> $(PKGDIR)-common/usr/share/mime-info/openoffice.keys; \
done
- install -m644 $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/openoffice.org.xml \
+ install -m644 $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice/openoffice.org.xml \
$(PKGDIR)-common/usr/share/mime/packages
mkdir -p $(PKGDIR)-common/usr/share/applications
@@@ -2903,7 -2856,7 +2922,7 @@@ ifeq "$(PACKAGE_SDK)" "y
# fix links
cd $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev/docs/java/ref && \
for i in `find . -type f | xargs`; do \
- perl -pi -e 's,file:$(CURDIR)/$(OOO_BUILD_TREE)/build/$(TAG)/odk/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/bin/odkcommon/docs/common/ref/,,g' $$i; \
+ perl -pi -e 's,file:$(CURDIR)/$(OOO_BUILD_TREE)/build/$(TAG)/odk/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/bin/odkcommon/docs/common/ref/,,g' $$i; \
done
endif
endif
@@@ -2941,7 -2894,7 +2960,7 @@@ ifeq "$(ENABLE_JAVA)" "y
done
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`" ;\
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/desktopshare >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-filter-mobiledev/usr/share/applications ;\
sed -e 's,Exec=$${UNIXBASISROOTNAME} \(.*\) %U,Exec=libreoffice$(VER) \1 %U,' \
-e 's,Icon=$${WITHOUTDOTUNIXPRODUCTNAME},Icon=libreoffice,' \
@@@ -2982,7 -2935,7 +3001,7 @@@ endi
ln -s /$(shell echo $(OODIR) | sed -e s/usr/var/)/share/config/javasettingsunopkginstall.xml \
$(PKGDIR)-common/$(OODIR)/share/config/javasettingsunopkginstall.xml
# set PYTHONPATH in unopkg
- perl -pi -e 's,export PATH,export PATH\n\nexport PYTHONPATH=\"/$(OOBASISDIR)/program\"\n\n,' \
+ perl -pi -e 's,unset XENVIRONMENT,unset XENVIRONMENT\n\nexport PYTHONPATH=\"/$(OOBASISDIR)/program\"\n\n,' \
$(PKGDIR)-common/$(OOBRANDDIR)/program/unopkg
# install DicOOo; we need to do this manually; the
@@@ -3114,7 -3067,7 +3133,7 @@@ endi
mkdir -p $(OODIR)/share/dtd && \
cd $(OODIR)/share/dtd && ln -s /$(shell echo $(OODIR) | sed -e s/libreoffice/openoffice/)/share/dtd/officedocument
-ifeq "$(DIST)" "Debian"
+ifeq "$(DEB_VENDOR)" "Debian"
# install Debian presentation template
mkdir -p $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt
install -m644 debian/templates/*.otp $(PKGDIR)-common/$(OODIR)/share/template/en-US/presnt/
@@@ -3210,14 -3163,20 +3229,15 @@@ endi
for PKG in $(ARCH_INDEP_PACKAGES); do \
LINKS=debian/$$PKG.links ; \
if [ -e $$LINKS.in ]; then \
- sed -e "s/\@LIBSUFFIX\@/$(LIBSUFFIX)/g" \
- -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
+ sed -e "s#\@OOBASISDIR\@#$(OOBASISDIR)#g" \
+ -e "s/@ICONVERSION@/$(shell echo $(OOVER) | sed -e "s/\.//g")/" \
< $$LINKS.in > $$LINKS ; \
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`" ;\
+ dirname="`cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/libreoffice >/dev/null; pwd`" ;\
mkdir -p -m755 $(PKGDIR)-common/usr/share/mimelnk/application ;\
sed -e 's,Comment=Extension,Comment=LibreOffice $(VER) Extension,' \
-e 's,Icon=openofficeorg[0123456789]-extension,Icon=application-vnd.openofficeorg.extension.png,' \
@@@ -3374,12 -3333,6 +3394,12 @@@ ifneq (,$(filter redland, $(SYSTEM_STUF
# which quickly can get outdated
perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/$(shell dpkg -S /usr/lib/`objdump -p $(PKGDIR)-core/$(OOBASISDIR)/program/libunordf*.so | grep NEEDED | grep librdf | awk '{ print $$2 }'` | cut -d: -f1).shlibs | awk '{ print $$3,$$4,$$5 }')/' $(PKGDIR)-core.substvars
endif
+ifeq "$(ENABLE_LIBRSVG)" "y"
+ ifeq "$(SYSTEM_LIBRSVG)" "y"
+ # dlopen()'ed only for some weird reason (even when --with-librsvg=internal!)
+ perl -pi -e 's/(shlibs.*$$)/$$1, $(shell cat /var/lib/dpkg/info/librsvg*.shlibs | awk '{ print $$3,$$4,$$5 }')/' $(PKGDIR)-core.substvars
+ endif
+endif
# don't make uno-libs3 depend on ure...
perl -pi -e 's/, ure \(.*\)$$//' debian/uno-libs3.substvars
# .. and prevent ure to depend on itself..
@@@ -3442,7 -3395,7 +3462,7 @@@ ifeq "$(ENABLE_JAVA)" "y
perl -pi -e "s/java-gcj-compat/java-gcj-compat (>= 1.0.77-4)/" \
debian/libreoffice$(VER)-officebean/DEBIAN/control
endif
-ifneq (,$(findstring $(ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
+ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ifeq "$(ENABLE_PDFIMPORT)" "y"
dh_gencontrol -plibreoffice$(VER)-pdfimport -- \
-v$(shell grep "<version" $(SOURCE_TREE)/sdext/source/pdfimport/config/description.xml | perl -pi -e 's,<version.*value=\"(.*)\" />,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
@@@ -3462,7 -3415,7 +3482,7 @@@ ifeq "$(PACKAGE_BASE)" "y
endif
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; s/\s+$$//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
endif
endif
@@@ -3471,8 -3424,8 +3491,8 @@@
-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)
+ dh_builddeb -plibreoffice$(VER)-dbg $(DEBHELPER_OPTIONS) $(filter-out -Zbzip2,$(BUILDDEB_OPTIONS)) -Zxz
else
dh_builddeb -s $(DEBHELPER_OPTIONS) $(BUILDDEB_OPTIONS)
endif
@@@ -3481,12 -3434,12 +3501,12 @@@
binary-indep: $(GSI_EXPORT_STAMP) $(STAMP_DIR)/binary-indep
$(STAMP_DIR)/binary-indep: $(STAMP_DIR)/install-indep debian/control $(STAMP_DIR)/maintscripts $(STAMP_DIR)/langpacks
-ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_JAVA_ARCHS)))
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo "For uploads with binary-all packages, please use arches where Java is enabled!!!!!"
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
endif
-ifneq ($(ARCH),$(findstring $(ARCH),$(OOO_MONO_ARCHS)))
+ifneq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),$(OOO_MONO_ARCHS)))
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo "For uploads with binary-all packages, please use arches where Mono is enabled!!!!!"
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@@@ -3617,7 -3570,7 +3637,7 @@@ ifeq "$(ENABLE_REPORTDESIGN)" "y
-V'base-version=$(BASE_VERSION)' \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
- -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportbuilder/$(shell . $(SOURCE_TREE)/*Env*.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
+ -v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportbuilder/$(shell . $(SOURCE_TREE)/Env.Host.sh; echo $$OUTPATH$$PROEXT)/misc/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
dh_gencontrol -popenoffice.org-dtd-officedocument1.0 -- \
-v$(shell echo `echo $(BINARY_VERSION) | cut -d: -f1` + 1 | bc):1.0+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
@@@ -3632,7 -3585,7 +3652,7 @@@ binary: binary-arch binary-inde
get-ooo-build:
if echo $(OOO_BUILD_VERSION) | egrep -q "\."; then \
wget http://download.go-oo.org/$(MWS)/ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
- mv ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz ../libreoffice_$(UPSTREAM_VERSION).orig-ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
+ mv ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz ../libreoffice_$(DEB_VERSION_UPSTREAM).orig-ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
tar xfvz ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
mv ooo-build-$(OOO_BUILD_TARBALL_VERSION) $(OOO_BUILD_TREE); \
else \
@@@ -3646,7 -3599,7 +3666,7 @@@
tar xfvz ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
mv ooo-build-$(OOO_BUILD_TARBALL_VERSION) $(OOO_BUILD_TREE) && \
rm ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz archive/ooo-build-$(OOO_BUILD_TARBALL_VERSION).tar.gz && \
- tar cfvz $(CURDIR)/../libreoffice_$(UPSTREAM_VERSION).orig-ooo-build-$(OOO_BUILD_VERSION).tar.gz $(OOO_BUILD_TREE) && \
+ tar cfvz $(CURDIR)/../libreoffice_$(DEB_VERSION_UPSTREAM).orig-ooo-build-$(OOO_BUILD_VERSION).tar.gz $(OOO_BUILD_TREE) && \
rm -rf $$TMPD; \
fi
@@@ -3670,8 -3623,8 +3690,8 @@@ get-orig-source
TMPD=`mktemp -d`; \
fi && \
cd $$TMPD && \
- mkdir -p libreoffice-$(UPSTREAM_VERSION) && \
- cd libreoffice-$(UPSTREAM_VERSION) && \
+ mkdir -p libreoffice-$(DEB_VERSION_UPSTREAM) && \
+ cd libreoffice-$(DEB_VERSION_UPSTREAM) && \
cp -ra $(CURDIR)/$(OOO_BUILD_TREE) $(OOO_BUILD_TREE); \
cd $(OOO_BUILD_TREE) && \
./configure --with-tag=$(TAG) --with-distro=$(PATCHSET) \
@@@ -3682,7 -3635,7 +3702,7 @@@
mv src/$$i ../ext-sources-$(OOO_BUILD_TREE); \
done && \
cd .. && \
- tar cfvz $(CURDIR)/../libreoffice_$(UPSTREAM_VERSION).orig-ext-sources-$(OOO_BUILD_TREE).tar.gz ext-sources-$(OOO_BUILD_TREE) && \
+ tar cfvz $(CURDIR)/../libreoffice_$(DEB_VERSION_UPSTREAM).orig-ext-sources-$(OOO_BUILD_TREE).tar.gz ext-sources-$(OOO_BUILD_TREE) && \
rm -rf ext-sources-$(OOO_BUILD_TREE) && \
cd $(OOO_BUILD_TREE) && \
./bin/ooo-pack-sources --force --no-lo-build . && \
@@@ -3696,9 -3649,9 +3716,9 @@@
tar cfvj ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys.tar.bz2.dfsg ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys && \
ln -sf ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys.tar.bz2.dfsg ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys.tar.bz2 && \
rm -rf ooo-build-$(OOO_BUILD_TARBALL_VERSION)-libs-extern-sys && \
- cd $$TMPD/libreoffice-$(UPSTREAM_VERSION) && tar cfvz libreoffice_$(UPSTREAM_VERSION).orig-archive-$(OOO_BUILD_VERSION).tar.gz archive-$(OOO_BUILD_VERSION) && \
- rm -rf libreoffice-$(UPSTREAM_VERSION) && \
- mv libreoffice_$(UPSTREAM_VERSION).orig-archive-$(OOO_BUILD_VERSION).tar.gz $(CURDIR)/.. && \
+ cd $$TMPD/libreoffice-$(DEB_VERSION_UPSTREAM) && tar cfvz libreoffice_$(DEB_VERSION_UPSTREAM).orig-archive-$(OOO_BUILD_VERSION).tar.gz archive-$(OOO_BUILD_VERSION) && \
+ rm -rf libreoffice-$(DEB_VERSION_UPSTREAM) && \
+ mv libreoffice_$(DEB_VERSION_UPSTREAM).orig-archive-$(OOO_BUILD_VERSION).tar.gz $(CURDIR)/.. && \
rm -rf $$TMPD
if test -n "$$TMP"; then \
TMPD=`mktemp -d -p $$TMP`; \
@@@ -3710,8 -3663,8 +3730,8 @@@
$(CURDIR)/debian/rules get-ext-sources && \
zip -d $$TARFILE_LOCATION/*liblayout.zip liblayout/resource/rfc1345.txt && \
rm $$TARFILE_LOCATION/JLanguageTool* && \
- tar cfvz libreoffice_$(UPSTREAM_VERSION).orig-$$TARFILE_LOCATION.tar.gz $$TARFILE_LOCATION && \
- mv libreoffice_$(UPSTREAM_VERSION).orig-$$TARFILE_LOCATION.tar.gz $(CURDIR)/.. && \
+ tar cfvz libreoffice_$(DEB_VERSION_UPSTREAM).orig-$$TARFILE_LOCATION.tar.gz $$TARFILE_LOCATION && \
+ mv libreoffice_$(DEB_VERSION_UPSTREAM).orig-$$TARFILE_LOCATION.tar.gz $(CURDIR)/.. && \
rm -rf $$TMPD
# get ooo-build
if test -n "$$TMP"; then \
@@@ -3720,7 -3673,7 +3740,7 @@@
TMPD=`mktemp -d`; \
fi && \
if [ ! -d $(OOO_BUILD_TREE) ]; then ./debian/rules get-ooo-build; fi
- tar cfvz ../libreoffice_$(UPSTREAM_VERSION).orig-$(OOO_BUILD_TREE).tar.gz $(OOO_BUILD_TREE)
+ tar cfvz ../libreoffice_$(DEB_VERSION_UPSTREAM).orig-$(OOO_BUILD_TREE).tar.gz $(OOO_BUILD_TREE)
# Download the latest sources needed for ooo-build. Note that is
# might download more than actually needed here....
--
LibreOffice packaging repository
Reply to: