The following commit has been merged in the debian-experimental-4.0 branch:
commit f30a60a597c5ad3a5be08cdbad6d654066dc700d
Merge: 496c44538d0b07937d2ada2e24bcd57ad153dfb3
931f0114b2d3867dfefccc5661eb712dae8ed368
Author: Rene Engelhard <[email protected]>
Date: Thu Jan 24 21:00:46 2013 +0100
Merge remote-tracking branch 'origin/debian-experimental-3.6' into
debian-experimental-4.0
diff --combined changelog
index 32d0f41,8969e0c..bc7fa75
--- a/changelog
+++ b/changelog
@@@ -1,41 -1,10 +1,41 @@@
+libreoffice (1:4.0.0~rc2-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
+ - contains new driver for mozab (mork). Automatically enabled thus
+ this closes: #321099
+ - now has a basic(!) gnumeric import in experimental mode
+ (closes: #595708)
+ - supports IFERROR (closes: #662398)
+
+ * debian/control.in:
+ - make -impress suggest bluez (for impress remote control)
+ - make libreoffice depend on / -common recommend python-uno for the
+ new python-based wizards
+ * debian/rules:
+ - add new conditionals for new dependencies: liblangtag, liborcus,
+ libmspub, (u)cpp; remove them for gone saxon, librsvg, db
+ - enable sdrmeote on all archs; b-d on libbluetooth-dev on where we
+ enable bluetooth (!kfreebsd-*)
+ - use gstreamer1.0
+ - use --disable-dependency-tracking instead of gb_FULLDEPS= and
+ --enable-hardlink-deliver instead of gb_Deliver_HARDLINK=T
+ - python3 is default now; reverse logic (use python3 per default and
+ and build python2 in a extra step)
+ - add option to build with --enable-mergelibs, not yet enabled.
+ - remove stlport hacks for i386 - not used/needed anymore upstream
+ * debian/uno-libs3.symbols: update
+ * debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
+ is gone. yay.
+
+ -- Rene Engelhard <[email protected]> Sat, 22 Dec 2012 18:03:18 +0100
+
libreoffice (1:3.6.5~rc2-2) UNRELEASED; urgency=low
* debian/rules:
- stop using lsb_release -cs, parse dpkg-parsechangelog instead.
avoids the base-files issue.
- * debian/libreoffice-common.triggers.in:
- - fix: s/activate/interest/
+ * debian/libreoffice-common.triggers.in, debian/rules:
+ - fix trigger to actually be in effect
-- Rene Engelhard <[email protected]> Tue, 22 Jan 2013 00:29:09 +0100
diff --combined rules
index 1b9c35c,a7c7ca3..810fbcc
--- a/rules
+++ b/rules
@@@ -21,9 -21,9 +21,9 @@@ CURDIR ?= $(realpath $(dir $(firstword
BASE_VERSION:=$(shell echo $(DEB_VERSION) | cut -d:
-f1):$(DEB_VERSION_UPSTREAM)
BINARY_VERSION=$(DEB_VERSION)
#HELP_L10N_VIRTUAL_VERSION:=$(shell echo $(DEB_VERSION_UPSTREAM) | cut -d:
-f2 | tr [~] [\\-])
-HELP_L10N_VIRTUAL_VERSION:=3.6
-#VER:=3
-OOVER:=3.6
+HELP_L10N_VIRTUAL_VERSION:=4.0
+#VER:=4
+OOVER:=4.0
NEXT_OOVER:=$(shell echo "$(OOVER) + 0.1" | bc)
ARCH_INDEP_PACKAGES := $(shell dh_listpackages -i)
@@@ -33,7 -33,6 +33,7 @@@ PACKAGES := $(ARCH_INDEP_PACKAGES) $(AR
include /usr/share/dpkg/architecture.mk
include /usr/share/dpkg/vendor.mk
SHELL:=/bin/bash
+export gb_SHELL:=$(SHELL)
SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n
'/^gcc/s/.*\(.\..\)\..$$/\1/p')
@@@ -69,11 -68,11 +69,11 @@@ USE_SOURCE_TARBALLS=
USE_GIT_TARBALLS=n
ifeq "$(USE_GIT_TARBALLS)" "y"
GIT_BASEURL:=git://anongit.freedesktop.org/libreoffice
-lo_sources_ver=3.6.5.2
+lo_sources_ver=4.0.0.2
# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.6.5.2 libreoffice-3.6.5.2
-GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-3-6-5
+# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
+GIT_TAG=libreoffice-$(lo_sources_ver)-buildfix1
+GIT_BRANCH=libreoffice-4-0-0
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@@ -91,10 -90,9 +91,10 @@@ BUILD_DEPS
SYSTEM_STUFF = dicts
BUILD_PYUNO=y
-ENABLE_PYTHON3=y
+ENABLE_PYTHON2=y
ifeq "$(BUILD_PYUNO)" "y"
ENABLE_SCRIPT_PROVIDER_PYTHON=y
+ PACKAGE_LIBRELOGO=y
endif
# 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
@@@ -103,22 -101,24 +103,22 @@@
# note we are NOT working with python < 2.6 anymore!
PYTHON_VERSION=current
ifeq "$(PYTHON_VERSION)" "current"
- PYTHON=python (>= 2.6)
-export PYTHON=python
+ PYTHON=python3
+export PYTHON=python3
else
PYTHON=python$(PYTHON_VERSION)
export PYTHON=python$(PYTHON_VERSION)
endif
-ifeq "$(ENABLE_PYTHON3)" "y"
- PYTHON3_VERSION=current
- ifeq "$(PYTHON3_VERSION)" "current"
- PYTHON3=python3
+ifeq "$(ENABLE_PYTHON2)" "y"
+ PYTHON2_VERSION=current
+ ifeq "$(PYTHON2_VERSION)" "current"
+ PYTHON2=python
else
- PYTHON3=python$(PYTHON3_VERSION)
+ PYTHON2=python$(PYTHON2_VERSION)
endif
endif
PACKAGE_TTF_OPENSYMBOL=y
-BUILD_BINFILTERS=y
BUILD_ONLY_EN_US=n
-ENABLE_HELP=y
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
JDK=default
@@@ -148,11 -148,10 +148,11 @@@ USE_EXTERNAL_CXXLIBS=
#SYSTEM_STUFF += sablot
SYSTEM_STUFF += mythes
SYSTEM_STUFF += icu
-ICU_MINVER= (>= 4.0)
+ICU_MINVER= (>= 4.6)
SYSTEM_STUFF += libwpd libwpg libwps
SYSTEM_STUFF += libvisio
SYSTEM_STUFF += libcdr
+SYSTEM_STUFF += libmspub
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@@ -180,25 -179,17 +180,25 @@@ ifeq "$(ENABLE_JAVA)" "y
SYSTEM_STUFF += hsqldb
HSQLDB_MINVER= (>> 1.8.0.10)
HSQLDB_TOONEWVER=1.8.1
- # disabled because system-saxon breaks all kinds exports using XSLT
transforms
- # (e.g. M$ Word/Excel 2003 XML, Mediawiki, XHTML, UOF, ...)
- # It does *NOT* fail with _plain_ saxon 9.0.0.8 built with OOos build.xml
- # for UOF, but still for e.g. M$.
- #SYSTEM_STUFF += saxon
endif
SYSTEM_STUFF += lpsolve
USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
USE_DBUS=y
+ifeq "$(USE_DBUS)" "y"
+ ifneq (,$(findstring kfreebsd,$(DEB_HOST_ARCH)))
+ ENABLE_BLUETOOTH=n
+ else
+ ENABLE_BLUETOOTH=y
+ SYSTEM_STUFF += bluez
+ endif
+endif
USE_GSTREAMER=y
+ifneq "$(WHEEZY_BACKPORT)" "y"
+ GSTREAMER_VERSION=1.0
+else
+ GSTREAMER_VERSION=0.10
+endif
SYSTEM_STUFF += neon
NEON_SECTYPE=gnutls
NEONSONR=27
@@@ -253,6 -244,8 +253,6 @@@ els
endif
ENABLE_SDBC_POSTGRESQL=y
ENABLE_MINIMIZER=y
-ENABLE_PRESENTER_CONSOLE=y
-ENABLE_PDFIMPORT=y
BUILD_GTK=y
#ifeq "$(DEB_DISTRIBUTION)" "experimental"
BUILD_GTK3=y
@@@ -265,7 -258,7 +265,7 @@@ ENABLE_RANDR=
ifeq "$(BUILD_GTK)" "y"
PACKAGE_NSPLUGIN=y
ifeq "$(PACKAGE_NSPLUGIN)" "y"
- SYSTEM_STUFF += mozilla-headers
+ SYSTEM_STUFF += npapi-headers
endif
endif
PACKAGE_BASE=y
@@@ -299,41 -292,22 +299,41 @@@ SYSTEM_STUFF += cur
SYSTEM_STUFF += sane
SYSTEM_STUFF += xextensions-headers
SYSTEM_STUFF += mesa-headers
-SYSTEM_STUFF += db
SYSTEM_STUFF += poppler
SYSTEM_STUFF += libpng
SYSTEM_STUFF += nss
SYSTEM_STUFF += clucene
+ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
+ ENABLE_HELP=y
+else
+ ifeq (,$(filter armel armhf,$(DEB_HOST_ARCH)))
+ ENABLE_HELP=n
+ else
+ ENABLE_HELP=y
+ endif
+endif
SYSTEM_STUFF += lcms2
+SYSTEM_STUFF += openldap
PACKAGE_UNOWINREG_DLL=y
ifeq "$(DEB_VENDOR)" "Debian"
BUILD_UNOWINREG_DLL=y
endif
FAKEROOT_LIBDIR=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
+# upstream says: "it's 'highly experimental'", I wouldn't enable it for
+# distros"
+ENABLE_TELEPATHY=n
+ENABLE_LIBLANGTAG=y
+SYSTEM_STUFF += liblangtag
+SYSTEM_STUFF += orcus
+USE_UCPP=n
+ifeq "$(USE_UCPP)" "y"
+ SYSTEM_STUFF += ucpp
+endif
+ENABLE_MERGELIBS=n
# Default flags to pass to configure
CONFIGURE_FLAGS= \
--with-vendor='$(OOO_VENDOR)' \
- --with-install-dirname=$(OODIRNAME) \
--prefix=/usr --mandir=/usr/share/man \
--docdir=/usr/share/doc/libreoffice \
--enable-lockdown \
@@@ -341,14 -315,9 +341,14 @@@
--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
--disable-online-update \
--disable-fetch-external \
- --enable-release-build \
--without-fonts \
- --without-myspell-dicts
+ --without-myspell-dicts \
+ --disable-dependency-tracking \
+ --enable-hardlink-deliver
+
+ifeq "$(shell echo $(DEB_VERSION_UPSTREAM) | grep -E '(alpha|beta)'; echo
$$?)" "1"
+CONFIGURE_FLAGS += --enable-release-build
+endif
ifneq ($(ON_BUILDD),y)
CONFIGURE_FLAGS += --enable-verbose
@@@ -368,6 -337,13 +368,6 @@@ ende
PLATFORMID := $(shell grep PLATFORMID debian/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 "$(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))
@@@ -401,11 -377,7 +401,11 @@@ ifneq ($(DEB_HOST_ARCH),$(findstring $(
PACKAGE_UNOWINREG_DLL=n
endif
-OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
+ifeq (,$(filter clucene, $(SYSTEM_STUFF)))
+ OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(filter-out armel armhf,$(OOO_ARCHS))
+else
+ OOO_ARCH_DEP_EXTENSIONS_ARCHS := $(OOO_ARCHS)
+endif
OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_EXTENSIONS_ARCHS)
OOO_BASE_ARCHS := $(OOO_JAVA_ARCHS)
@@@ -431,10 -403,13 +431,10 @@@ endi
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_ARCH_DEP_EXTENSIONS_ARCHS)))
ENABLE_MINIMIZER=n
ENABLE_MYSQLNATIVE=n
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-mysql-connector
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-report-builder-bin
-Nlibreoffice$(VER)-report-builder
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-pdfimport
-Nlibreoffice$(VER)-presentation-minimizer
- DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-presenter-console
+ DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-presentation-minimizer
endif
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_EXTENSIONS_ARCHS)))
ENABLE_MEDIAWIKI=n
@@@ -482,6 -457,12 +482,6 @@@ OOO_NSPLUGIN_ARCHS
endif
$(eval $(call gen_no_archs,OOO_NSPLUGIN_ARCHS))
-# builds long and is for legacy filters. probably not needed on
{arm,mips}{,el}
-ifneq (,$(filter arm% mips% m68k, $(DEB_HOST_ARCH)))
- BUILD_BINFILTERS=n
-endif
-OOO_BINFILTER_ARCHS:=$(filter-out arm% mips% m68k, $(OOO_ARCHS))
-
#############
# Distro-specific overrides
@@@ -493,10 -474,7 +493,10 @@@ endi
# Debian WHeezy
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"wheezy-backports"
BUGS=mailto:[email protected]
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub mdds
liblangtag orcus, $(SYSTEM_STUFF))
+endif
+ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')"
"UNRELEASED"
+ BUGS=mailto:[email protected]
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@@ -512,7 -490,7 +512,7 @@@ ifneq "$(GCC_VERSION)" "
endif
endif
- BUILDDEB_OPTIONS = -- -Zxz
+BUILDDEB_OPTIONS ?= -- -Zxz
ifneq "$(OOO_OGLTRANS_ARCHS)" ""
ifneq (,$(findstring mesa-headers,$(SYSTEM_STUFF)))
@@@ -537,18 -515,19 +537,18 @@@ endi
ifneq "$(ENABLE_MINIMIZER)" "y"
CONFIGURE_FLAGS += --disable-ext-presenter-minimizer
endif
-ifneq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- CONFIGURE_FLAGS += --disable-ext-presenter-console
-endif
-ifeq "$(ENABLE_PDFIMPORT)" "y"
BUILD_DEPS += , libpoppler-dev (>= 0.8.0), libpoppler-private-dev,
libpoppler-cpp-dev
-else
- CONFIGURE_FLAGS += --disable-ext-pdfimport
-endif
# fails their tests
ifeq "$(DEB_HOST_ARCH)" "armel"
ENABLE_GRAPHITE=n
SYSTEM_STUFF := $(filter-out graphite, $(SYSTEM_STUFF))
+ENABLE_LIBLANGTAG=n
+SYSTEM_STUFF := $(filter-out liblangtag, $(SYSTEM_STUFF))
+endif
+ifeq "$(DEB_HOST_ARCH)" "armhf"
+ENABLE_LIBLANGTAG=n
+SYSTEM_STUFF := $(filter-out liblangtag, $(SYSTEM_STUFF))
endif
ifeq "$(DEB_HOST_ARCH)" "sparc"
ENABLE_GRAPHITE=n
@@@ -602,6 -581,22 +602,6 @@@ ifneq (,$(filter openssl, $(SYSTEM_STUF
DBG_DBG_SUGGESTS += , libssl$(shell readlink
/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/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
-
-ifneq (,$(findstring db,$(SYSTEM_STUFF)))
- BUILD_DEPS += , libdb-dev
- DBG_DBG_SUGGESTS += , $(shell dpkg -s libdb-dev | grep Depends | awk '{
print $$2 }' | sed -e s/dev/dbg/)
-endif
-
ifeq "$(BUILD_DBG_PACKAGE)" "y"
ifneq (,$(findstring i386,$(DEB_HOST_ARCH)))
SMALL_SYMBOLS = n
@@@ -628,27 -623,21 +628,27 @@@ ifeq (debug,$(findstring debug,$(DEB_BU
endif
-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())')
+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/python3-uno/$(shell $(PYTHON) -c 'from distutils import
sysconfig; print(sysconfig.get_python_lib())')
+PY2MAJOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[0]")
+PY2MINOR:=$(shell $(PYTHON2) -c "import sys; print sys.version_info[1]")
+PY2MINORPLUS1:=$(shell $(PYTHON2) -c "import sys; print
sys.version_info[1]+1")
+PYTHON2_SITE:=debian/python-uno/$(shell $(PYTHON2) -c 'from distutils import
sysconfig; print(sysconfig.get_python_lib())')
+
+ifeq "$(PYTHON_VERSION)" "current"
+ PYTHON_VERSION_CONTROL := $(PYMAJOR).$(PYMINOR)
+else
+ PYTHON_VERSION_CONTROL := $(PYTHON_VERSION)
+endif
ifeq "$(BUILD_PYUNO)" "y"
BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
DBG_DBG_SUGGESTS+= , python-dbg
- BUILD_DEPS += , $(PYTHON)-dev (>= 2.6)
- ifeq "$(ENABLE_PYTHON3)" "y"
- BUILD_DEPS += , $(PYTHON3)-dev
+ BUILD_DEPS += , $(PYTHON)-dev (>= 3.3)
+ ifeq "$(ENABLE_PYTHON2)" "y"
+ BUILD_DEPS += , $(PYTHON2)-dev (>= 2.6)
endif
else
BUILD_DEPS += , python
@@@ -733,6 -722,7 +733,6 @@@ ifneq "$(BUILD_ONLY_EN_US)" "y
endif
ifeq "$(ENABLE_JAVA)" "y"
- CONFIGURE_FLAGS += --with-java-target-version=1.5
ifeq "$(JDK)" "default"
JAVA_HOME=/usr/lib/jvm/default-java
BUILD_DEPS += , default-jdk$(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))
@@@ -800,6 -790,10 +800,6 @@@ export JAVA_HOM
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , libreoffice$(VER)-java-common
JAVA_COMMON_DEPENDS_VERSION:= (>= $(BASE_VERSION)~)
- ifneq (,$(filter saxon, $(SYSTEM_STUFF)))
- CONFIGURE_FLAGS += --with-system-saxon
--with-saxon-jar=/usr/share/java/saxonb.jar
- BUILD_DEPS += , libsaxonb-java$(OOO_NO_JAVA_ARCHS)
- endif
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(PACKAGE_UNOWINREG_DLL)" "y"
ifeq "$(BUILD_UNOWINREG_DLL)" "y"
@@@ -850,9 -844,10 +850,9 @@@ ifneq (,$(filter nss, $(SYSTEM_STUFF))
BUILD_DEPS+= , libnss3-dev (>= 3.12.3)
DBG_DBG_SUGGESTS+= , libnss3-1d-dbg
endif
-ifneq (,$(filter mozilla-headers, $(SYSTEM_STUFF)))
+ifneq (,$(filter npapi-headers, $(SYSTEM_STUFF)))
BUILD_DEPS+= , xulrunner-dev$(OOO_NO_NSPLUGIN_ARCHS)
endif
- CONFIGURE_FLAGS += --disable-build-mozilla --disable-mozilla
ifeq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NSPLUGIN_ARCHS)))
PACKAGE_NSPLUGIN=n
CONFIGURE_FLAGS += --disable-nsplugin
@@@ -861,15 -856,6 +861,15 @@@ endi
ifeq "$(USE_SYSTEM_DMAKE)" "y"
BUILD_DEPS += , dmake (>= 1:4.11)
endif
+ifeq "$(USE_UCPP)" "y"
+ ifneq (,$(filter ucpp, $(SYSTEM_STUFF)))
+ IDLC_CPP_DEPENDS := ucpp
+ BUILD_DEPS += , $(UCPP_DEPENDS)
+ endif
+else
+ IDLC_CPP_DEPENDS := cpp
+ CONFIGURE_FLAGS += --with-idlc-cpp=cpp
+endif
ifneq (,$(filter hunspell, $(SYSTEM_STUFF)))
BUILD_DEPS += , libhunspell-dev $(HUNSPELL_MIN_VER)
@@@ -885,6 -871,12 +885,6 @@@ ifneq (,$(filter altlinuxhyph, $(SYSTEM
endif
CONFIGURE_FLAGS += --with-external-hyph-dir=$(HYPH_DIR)
-ifneq "$(OOO_STLPORT_ARCHS)" ""
- LIBSTLPORT_MINVER= (>= 4.6.2-3)
- BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER)
[$(OOO_STLPORT_ARCHS)]
- CONFIGURE_FLAGS += --without-stlport
-endif
-
ifneq (,$(filter boost, $(SYSTEM_STUFF)))
ifeq "$(BOOST_VERSION)" "1.34"
ifeq "$(SYSTEM_GCC_VERSION)" "4.4"
@@@ -907,11 -899,7 +907,11 @@@
endif
ifneq (,$(filter mdds, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libmdds-dev (>= 0.5.0)
+ BUILD_DEPS += , libmdds-dev (>= 0.6.0)
+endif
+
+ifneq (,$(filter orcus, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , liborcus-dev
endif
ifneq (,$(filter vigra, $(SYSTEM_STUFF)))
@@@ -920,12 -908,6 +920,12 @@@ endi
ifneq (,$(filter clucene, $(SYSTEM_STUFF)))
BUILD_DEPS += , libclucene-dev (>= 2.3.3.4-2)
+else
+ ifneq (,$(findstring arm,$(DEB_HOST_ARCH)))
+ # FIXME. If you really want this, comment this out then help stuff will
+ # be disabled on arm*
+ $(error internal clucene makes HelpIndexer segfault on ARM!)
+ endif
endif
ifeq "$(USE_EXTERNAL_CXXLIBS)" "y"
@@@ -950,11 -932,8 +950,11 @@@
ifneq (,$(filter libcdr, $(SYSTEM_STUFF)))
BUILD_DEPS += , libcdr-dev
endif
+ ifneq (,$(filter libmspub, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libmspub-dev
+ endif
ifneq (,$(filter libcmis, $(SYSTEM_STUFF)))
- BUILD_DEPS += , libcmis-dev (>= 0.2.1)
+ BUILD_DEPS += , libcmis-dev (>= 0.3.0)
endif
endif
CONFIGURE_FLAGS += --with-external-thes-dir=$(THES_DIR)
@@@ -963,23 -942,6 +963,23 @@@ ifneq (,$(filter lcms2, $(SYSTEM_STUFF)
BUILD_DEPS += , liblcms2-dev
endif
+ifneq (,$(filter openldap, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libldap2-dev
+endif
+
+ifeq ($(ENABLE_TELEPATHY),y)
+ BUILD_DEPS += , libtelepathy-glib-dev (>= 0.18)
+ CONFIGURE_FLAGS += --enable-telepathy
+endif
+
+ifeq ($(ENABLE_LIBLANGTAG),y)
+ ifneq (,$(filter liblangtag, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , liblangtag-dev (>= 0.4) [!armel !armhf]
+ endif
+else
+ CONFIGURE_FLAGS += --disable-liblangtag
+endif
+
ifneq (,$(filter icu, $(SYSTEM_STUFF)))
BUILD_DEPS += , libicu-dev $(ICU_MINVER)
endif
@@@ -1066,6 -1028,11 +1066,6 @@@ els
CONFIGURE_FLAGS += --disable-randr
endif
-ifeq "$(BUILD_BINFILTERS)" "y"
- CONFIGURE_FLAGS+= --enable-binfilter
- OOO_BINFILTER_DEP = libreoffice$(VER)-filter-binfilter
-endif
-
ifneq "$(BUILD_PYUNO)" "y"
DEBHELPER_OPTIONS+= -Npython-uno -Npython3-uno
-Nlibreoffice-script-provider-python
CONFIGURE_FLAGS += --disable-python
@@@ -1088,12 -1055,12 +1088,12 @@@ ifeq "$(ENABLE_JAVA)" "y
BSH_DEPENDS = bsh (>= 2.0b4)
JAVA_GCJ_DEPENDS += , bsh-gcj [$(OOO_GCJ_ARCHS)]
endif
- CONFIGURE_FLAGS += --enable-ext-scripting-beanshell
+ CONFIGURE_FLAGS += --enable-scripting-beanshell
else
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-script-provider-bsh
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_JS)" "y"
- CONFIGURE_FLAGS += --enable-ext-scripting-javascript
+ CONFIGURE_FLAGS += --enable-scripting-javascript
else
DEBHELPER_OPTIONS += -Nlibreoffice$(VER)-script-provider-js
endif
@@@ -1118,25 -1085,14 +1118,25 @@@ endi
ifeq "$(USE_DBUS)" "y"
BUILD_DEPS += , libdbus-glib-1-dev (>= 0.70)
CONFIGURE_FLAGS += --enable-dbus
+ ifeq "$(ENABLE_BLUETOOTH)" "y"
+ ifneq (,$(filter bluez, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386]
+ endif
+ else
+ CONFIGURE_FLAGS += --disable-sdremote-bluetooth
+ endif
endif
ifeq "$(USE_GSTREAMER)" "y"
- BUILD_DEPS += , libgstreamer-plugins-base0.10-dev
- GSTREAMER_PLUGINS_SUGGESTS += , gstreamer0.10-plugins-base,
gstreamer0.10-plugins-good, gstreamer0.10-plugins-ugly,
gstreamer0.10-plugins-bad, gstreamer0.10-ffmpeg
- DBG_DBG_SUGGESTS+= , libgstreamer0.10-0-dbg
+ ifeq "$(GSTREAMER_VERSION)" "1.0"
+ BUILD_DEPS += , libgstreamer$(GSTREAMER_VERSION)-dev
+ CONFIGURE_FLAGS += --enable-gstreamer --disable-gstreamer-0-10
+ endif
+ BUILD_DEPS += , libgstreamer-plugins-base$(GSTREAMER_VERSION)-dev
+ GSTREAMER_PLUGINS_SUGGESTS += ,
gstreamer$(GSTREAMER_VERSION)-plugins-base,
gstreamer$(GSTREAMER_VERSION)-plugins-good,
gstreamer$(GSTREAMER_VERSION)-plugins-ugly,
gstreamer$(GSTREAMER_VERSION)-plugins-bad, gstreamer$(GSTREAMER_VERSION)-ffmpeg
+ DBG_DBG_SUGGESTS+= , libgstreamer$(GSTREAMER_VERSION)-0-dbg
else
- CONFIGURE_FLAGS += --disable-gstreamer
+ CONFIGURE_FLAGS += --disable-gstreamer-0-10
endif
ifneq (,$(filter neon, $(SYSTEM_STUFF)))
@@@ -1180,10 -1136,6 +1180,10 @@@ ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y
BUILD_DEPS_INDEP += , fontforge
endif
+ifeq ($(ENABLE_MERGELIBS),y)
+ CONFIGURE_FLAGS += --enable-mergelibs
+endif
+
# Use compiler cache? Include ccache in DEB_BUILD_OPTIONS for much faster
rebuild times
# A complete build uses about 9G of compiler cache.
ifneq (ccache,$(findstring ccache,$(DEB_BUILD_OPTIONS)))
@@@ -1198,13 -1150,11 +1198,13 @@@ AVAIL_CPUS := $(shell getconf _NPROCESS
ifeq "$(PARALLEL_BUILD)" "y"
# http://bugs.debian.org/622644
BUILD_DEPS += , make (>= 3.81-8.2)
+ # we need to specify it only if it differs, otherwise configure autodetects
+ # it.
ifneq "$(NUM_CPUS)" "$(AVAIL_CPUS)"
- CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
+ CONFIGURE_FLAGS += --with-parallelism=$(NUM_CPUS)
endif
else
- CONFIGURE_FLAGS += --with-num-cpus=1
+ CONFIGURE_FLAGS += --without-parallelism
endif
@@@ -1222,6 -1172,16 +1222,6 @@@ endi
BUILD_PATH := $(CURDIR)/debian/usr/bin:$(BUILD_PATH)
BUILD_LD_LIBRARY_PATH := $(BUILD_LD_LIBRARY_PATH):$(GCJ_JAWT_DIR)
-ifeq "$(ENABLE_LDAP)" "y"
- ifeq "$(USE_OPENLDAP)" "y"
- BUILD_DEPS += , libldap2-dev
- LDAP_LIB := $(shell echo libldap-`grep LDAP_VENDOR_VERSION_M
/usr/include/ldap_features.h | cut -d: -f2 | awk '{ print $$3 }' | xargs | sed
-e "s/ /\./"`-`grep LDAP_VENDOR_VERSION_MAJOR /usr/include/ldap_features.h |
cut -d: -f2 | awk '{ print $$3 }'`)
- CONFIGURE_FLAGS += --with-openldap
- endif
-else
- CONFIGURE_FLAGS += --disable-ldap
-endif
-
# Because of the stampdir magic, when you actually want to run a rule
# over, you would have to remove the stamp manually. Now, just do
# 'debian/rules <target> <target> ... FORCE=1', and the stamp files
@@@ -1279,9 -1239,10 +1279,9 @@@ clean
fi
find $(SOURCE_TREE)/solenv/gdb -name "*.pyc" -exec rm {} \;
rm -rf */*.pro.obsolete
- rm -f solenv/bin/concat-deps
rm -rf $(SOURCE_TREE)/file-lists
- rm -rf $(SOURCE_TREE)/pyuno-py3
+ rm -rf $(SOURCE_TREE)/py2uno
rm -f configure aclocal.m4 autogen.lastrun
rm -f build_error.log
@@@ -1308,11 -1269,20 +1308,11 @@@ debian/control: $(wildcard debian/contr
-e "s#%[A-Za-z]*=[^%]*%##g#" \
-e "s#%BUILD_DEPS%#$(strip $(BUILD_DEPS))#g" \
-e "s#%BUILD_DEPS_INDEP%#$(strip $(BUILD_DEPS_INDEP))#g" \
- -e "s#@PYTHON_VERSION@#$(PYTHON_VERSION)#g" \
+ -e "s#@PYTHON_VERSION_CONTROL@#$(PYTHON_VERSION_CONTROL)#g" \
+ -e "s#@PYTHON2_VERSION@#$(PYTHON2_VERSION)#g" \
-e "s#@BUGS@#$(BUGS)#g" \
< debian/control.in > debian/control
-ifeq "$(ENABLE_LDAP)" "y"
- # build-depends might not be satified when running debian/rules
control. prevent bad subsitition with
- # nothing (libldap--)
- if [ ! -f /usr/include/ldap_features.h ]; then \
- echo "/usr/include/ldap_features.h not found. Is libldap2-dev
installed?"; \
- echo 'Needed for properly setting $$(LDAP_LIB). Stopping,'; \
- exit 1; \
- fi
-endif
-
for LNUM in $(filter-out en-US,$(LANGPACKISOS)) ; do \
LNAME=`$(SOURCE_TREE)/bin/lo-xlate-lang -l $$LNUM | perl -e 'print
ucfirst(<STDIN>);'`; \
LCODE=`$(SOURCE_TREE)/bin/lo-xlate-lang -i $$LNUM | tr A-Z a-z`; \
@@@ -1424,6 -1394,14 +1424,6 @@@ ifeq "$(ENABLE_MINIMIZER)" "y
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.minimizer.in
endif
-ifeq "$(ENABLE_PRESENTER_CONSOLE)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
- >> debian/control < debian/control.presenter.in
-endif
-ifeq "$(ENABLE_PDFIMPORT)" "y"
- sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
- >> debian/control < debian/control.pdfimport.in
-endif
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
>> debian/control < debian/control.fonts.in
@@@ -1453,14 -1431,14 +1453,14 @@@ 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
endif
+ifeq "$(PACKAGE_LIBRELOGO)" "y"
+ sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
+ >> debian/control < debian/control.librelogo.in
+endif
perl -pi -e "s,%OOO_ARCHS%,$(OOO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_BASE_ARCHS%,$(OOO_BASE_ARCHS),g" debian/control
@@@ -1469,6 -1447,8 +1469,6 @@@
perl -pi -e "s,%OOO_GCJ_ARCHS%,$(OOO_GCJ_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NSPLUGIN_ARCHS%,$(OOO_NSPLUGIN_ARCHS),g"
debian/control
perl -pi -e "s,%OOO_OGLTRANS_ARCHS%,$(OOO_OGLTRANS_ARCHS),g"
debian/control
- perl -pi -e "s,%OOO_BINFILTER_ARCHS%,$(OOO_BINFILTER_ARCHS),g"
debian/control
- perl -pi -e "s,%OOO_STLPORT_ARCHS%,$(OOO_STLPORT_ARCHS),g"
debian/control
perl -pi -e "s,%OOO_GCJ_JDK_ARCHS%,$(OOO_GCJ_JDK_ARCHS),g"
debian/control
perl -pi -e
"s,%OOO_ARCH_DEP_EXTENSIONS_ARCHS%,$(OOO_ARCH_DEP_EXTENSIONS_ARCHS),g"
debian/control
perl -pi -e "s,%OOO_REPORTDESIGN_ARCHS%,$(OOO_REPORTDESIGN_ARCHS),g"
debian/control
@@@ -1518,9 -1498,8 +1518,9 @@@ ifeq "$(BUILD_KDE)" "y
perl -pi -e 's/GConf backend$$/GConf backend\n *
libreoffice$(VER)-kde: KDE UI Plugin and KDE File Picker support/'
debian/control
endif
-ifeq "$(ENABLE_LDAP)" "y"
- perl -pi -e 's/paperconf$$/paperconf\n * $(LDAP_LIB): LDAP client
library; needed for LibreOffice getting its\n profiles from LDAP/'
debian/control
+ifeq "$(USE_DBUS)" "y"
+ perl -pi -e 's/paperconf$$/paperconf\n * bluez: Bluetooth support for
Impress (slideshow remote control/' debian/control
+ perl -pi -e 's/Description: office productivity suite --
presentation/Suggests: bluez\nDescription: office productivity suite --
presentation/' debian/control
endif
ifneq "$(DICT_DIR)" "/usr/share/hunspell"
@@@ -1566,16 -1545,6 +1566,16 @@@ ifneq "$(PACKAGE_UNOWINREG_DLL)" "y
fi
endif
endif
+
+ifeq "$(BUILD_PYUNO)" "y"
+ ifeq "$(ENABLE_PYTHON2)" "y"
+ rm -rf $(SOURCE_TREE)/py2uno
+ cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/py2uno
+ cd py2uno && \
+ patch -p1 < $(CURDIR)/debian/patches/pyuno-copy-for-python2.diff
+ endif
+endif
+
touch $@
build:
@@@ -1591,19 -1560,30 +1591,19 @@@ $(STAMP_DIR)/build-arch
# FIXME: Theoretically this should call ./configure instead of
# it exists but that causes the configure flags NOT to be hnoured
# somehow...
- PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./autogen.sh $(CONFIGURE_FLAGS) \
+ PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) \
+ PYTHON=$(PYTHON) PYTHON_CFLAGS="$(shell pkg-config --cflags
python-$(PYMAJOR).$(PYMINOR))" PYTHON_LIBS="$(shell pkg-config --libs
python-$(PYMAJOR).$(PYMINOR))" \
+ ./autogen.sh $(CONFIGURE_FLAGS) \
--without-help --without-doxygen --disable-ext-wiki-publisher \
- --disable-ext-report-builder --disable-ext-scripting-javascript
\
- --disable-ext-scripting-beanshell
+ --disable-ext-report-builder --disable-scripting-javascript \
+ --disable-scripting-beanshell
- 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 gb_FULLDEPS=
gb_Deliver_HARDLINK=T
+ 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
ifeq "$(BUILD_PYUNO)" "y"
- ifeq "$(ENABLE_PYTHON3)" "y"
- # FIXME: won't work when pyuno is migrated to gbuild as all is directly
in solver
- # then...
- rm -rf $(SOURCE_TREE)/pyuno-py3
- cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/pyuno-py3
- ifeq "$(PYTHON3_VERSION)" "current"
- . $(SOURCE_TREE)/config_host.mk.source; \
- cd pyuno-py3 && \
- rm -rf $$OUTPATH$$PROEXT; \
- PYTHON=$(PYTHON3) PYTHON_CFLAGS="$(shell pkg-config --cflags
python$(PY3MAJOR))" PYTHON_LIBS="$(shell pkg-config --libs python$(PY3MAJOR))"
../solenv/bin/build.pl
- else
- . $(SOURCE_TREE)/config_host.mk.source; \
- cd pyuno-py3 && \
- rm -rf $$OUTPATH$$PROEXT; \
- PYTHON=$(PYTHON3) PYTHON_CFLAGS="$(shell pkg-config --cflags
python-$(PY3MAJOR).$(PY3MINOR))" PYTHON_LIBS="$(shell pkg-config --libs
python-$(PY3MAJOR).$(PY3MINOR))" ../solenv/bin/build.pl
- endif
+ ifeq "$(ENABLE_PYTHON2)" "y"
+ $(MAKE) py2uno.clean
+ make cmd cmd='cd py2uno; export PYTHON=$(PYTHON2); export
PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PY2MAJOR).$(PY2MINOR))";
export PYTHON_LIBS="$(shell pkg-config --libs python-$(PY2MAJOR).$(PY2MINOR))";
$(MAKE)'
endif
endif
@@@ -1614,8 -1594,10 +1614,8 @@@ endi
ifneq "$(BUILD_ISOS)" "en-US"
# build some extensions again with all languages; as it contains
language-specific help
# and/or descriptions...
- $(MAKE) translations.clean
$(MAKE) sdext.clean
$(MAKE) mysqlc.clean
- make cmd cmd="cd translations; export WITH_LANG='$(LANGPACKISOS)';
export WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
make cmd cmd="cd sdext; export WITH_LANG='$(LANGPACKISOS)'; export
WITH_LANG_LIST='$(LANGPACKISOS)'; $(MAKE)"
make cmd cmd="cd mysqlc; export WITH_LANG='$(LANGPACKISOS)'; export
WITH_LANG_LIST='$(LANGPACKISOS)'; ../solenv/bin/build.pl &&
../solenv/bin/deliver.pl"
endif
@@@ -1626,18 -1608,14 +1626,18 @@@ build-indep: $(STAMP_DIR)/prepare $(STA
$(STAMP_DIR)/build-indep:
dh_testdir
- $(MAKE) scripting.clean
$(MAKE) odk.clean
$(MAKE) scp2.clean
+ # FIXME: those are arch-indep but somehow fail in the second run
+ # with all languages - handle it like the ones in binary-arch. The
+ # rebuild automatically will be done, though.
+ $(MAKE) swext.clean
+ $(MAKE) reportbuilder.clean
rm -f config.status autogen.lastrun
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH)
./autogen.sh $(CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_LANG)
- 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 gb_FULLDEPS=
gb_Deliver_HARDLINK=T
+ 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
touch $@
@@@ -1658,7 -1636,7 +1658,7 @@@ endi
export HOME=$$t; \
export SAL_USE_VCLPLUGIN="svp"; \
if [ -x /usr/bin/gdb ]; then ulimit -c unlimited; fi && \
- $(MAKE) -k check gb_FULLDEPS= gb_Deliver_HARDLINK=T && \
+ CHECK_PARALLELISM=1 $(MAKE) -k check && \
rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
@@@ -1779,8 -1757,10 +1779,8 @@@ ifneq "$(ENABLE_HELP)" "n
done
endif
-ifneq "$(BUILD_BINFILTERS)" "y"
- # somewhow there's a libreoffice-filter-binfilter here even when
binfilter disabled.
- # go sure.
- rm -rf
debian/tmp/pkg/libreoffice-filter-binfilter/usr/share/applications
+ifneq "$(PACKAGE_LIBRELOGO)" "y"
+ rm -rf debian/tmp/pkg/libreoffice-librelogo
endif
dh_installdirs -A
@@@ -1789,10 -1769,11 +1789,10 @@@
rm -rf debian/tmp/pkg
# move desktop files to their correct packages
- for i in base calc draw impress math writer binfilter; do \
- if [ "$$i" = "binfilter" ]; then j=filter-binfilter; else
j=$$i; fi; \
- mkdir -p $(PKGDIR)-$$j/$(OODIR)/share/xdg; \
+ for i in base calc draw impress math writer; do \
+ mkdir -p $(PKGDIR)-$$i/$(OODIR)/share/xdg; \
mv $(PKGDIR)-common/$(OODIR)/share/xdg/$$i.desktop \
- $(PKGDIR)-$$j/$(OODIR)/share/xdg; \
+ $(PKGDIR)-$$i/$(OODIR)/share/xdg; \
done
# move help to /usr/share
@@@ -1831,11 -1812,7 +1831,11 @@@ ifeq "$(ENABLE_JAVA)" "y
$(PKGDIR)-base/$(shell echo $(OODIR) | sed -e
s/lib/share/)/program/classes; \
ln -s $(shell echo /$(OODIR) | sed -e
s/lib/share/)/program/classes/sdbc_hsqldb.jar \
$(PKGDIR)-base/$(OODIR)/program/classes/sdbc_hsqldb.jar
-
+ ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
+ # fix the classpath (file:// breaks javahelper)
+ jh_classpath --classpath="/usr/share/java/hsqldb.jar .." \
+ $(PKGDIR)-base/$(shell echo /$(OODIR) | sed -e
s/lib/share/)/program/classes/sdbc_hsqldb.jar
+ endif
ifeq (,$(filter hsqldb, $(SYSTEM_STUFF)))
# we need this in -base. Otherwise we get unwanted package differences
# in the unstable version and backports which might use internal hsqldb
@@@ -1882,22 -1859,6 +1882,22 @@@ ifeq "$(ENABLE_EVO2)" "y
$(PKGDIR)-evolution/$(OODIR)/presets/database
endif
+ # FIXME: Should have been done in gid2pkgdirs.sh but somehow the
installer
+ # doesn't create the gid_Module_Pdfimport file and so that doesn't work.
+ # Do it manually here.
+ rm -rf $(PKGDIR)-pdfimport
+ mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/program
+ mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/share/registry
+ mkdir -p $(PKGDIR)-pdfimport/$(OODIR)/share/xpdfimport
+ for i in program/xpdfimport share/xpdfimport
share/registry/pdfimport.xcd; do \
+ mv $(PKGDIR)-common/$(OODIR)/$$i \
+ $(PKGDIR)-pdfimport/$(OODIR)/$$i; \
+ done
+ for i in program/xpdfimport program/pdfimport.uno.so; do \
+ mv $(PKGDIR)-core/$(OODIR)/$$i \
+ $(PKGDIR)-pdfimport/$(OODIR)/$$i; \
+ done
+
find debian/tmp ! -perm -200 | xargs -r chmod u+w
touch $@
@@@ -1920,7 -1881,7 +1920,7 @@@ $(STAMP_DIR)/maintscripts: $(wildcard d
grep PLATFORMID debian/vars.$(DEB_HOST_ARCH) >> $$MAINTSCRIPT; \
fi; \
echo "" >> $$MAINTSCRIPT; \
- if egrep -q "validate_extension" $$MAINTSCRIPT.in; then \
+ if egrep -q "(validate_extension|sync_extension)"
$$MAINTSCRIPT.in; then \
cat debian/shell-lib-extensions.sh >> $$MAINTSCRIPT; \
fi; \
sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' < $$MAINTSCRIPT.in | sed -e
'/^#INCLUDE_SHELL_LIB#$$/d' >> $$MAINTSCRIPT; \
@@@ -2022,6 -1983,9 +2022,6 @@@ ifeq "$(PACKAGE_BASE)" "y
endif
: # remove problematic ones
rm -f debian/tmp/native-jars/ridl.jar
-ifneq "$(USE_SYSTEM_SAXON)" "y"
- rm -f debian/tmp/native-jars/saxon9.jar
-endif
: # compile the others
# the Debian i386 buildd, although having much ram still OOMs without
# this (at unoil.jar).
@@@ -2208,46 -2172,51 +2208,46 @@@ endi
ifeq "$(BUILD_PYUNO)" "y"
# PyUNO packaging
install -d $(PYTHON_SITE)
- mv debian/python-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
- mv debian/python-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
- touch debian/python-uno/$(OODIR)/program/pythonloader.unorc
- chmod u+w debian/python-uno/$(OODIR)/program/pythonloader.unorc
+ mv debian/python3-uno/$(OODIR)/program/uno.py $(PYTHON_SITE)
+ mv debian/python3-uno/$(OODIR)/program/unohelper.py $(PYTHON_SITE)
+ touch debian/python3-uno/$(OODIR)/program/pythonloader.unorc
+ chmod u+w debian/python3-uno/$(OODIR)/program/pythonloader.unorc
( echo '[Bootstrap]'; \
echo 'PYTHONHOME=file:///usr/lib/python$(PYMAJOR).$(PYMINOR)' ;\
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)
+ ) > debian/python3-uno/$(OODIR)/program/pythonloader.unorc
+ chmod u-w debian/python3-uno/$(OODIR)/program/pythonloader.unorc
+ ifeq "$(ENABLE_PYTHON2)" "y"
+ install -d $(PYTHON2_SITE)
cp $(PYTHON_SITE)/uno.py \
- $(PYTHON3_SITE)
+ $(PYTHON2_SITE)
cp $(PYTHON_SITE)/unohelper.py \
- $(PYTHON3_SITE)
- mkdir -p debian/python3-uno/$(OODIR)/program
- mkdir -p debian/python3-uno/$(OODIR)/share/registry
- mkdir -p debian/python3-uno/$(OODIR)/share/Scripts
- 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-py3/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/lib/$$i \
- debian/python3-uno/$(OODIR)/program/$$i; \
+ $(PYTHON2_SITE)
+ mkdir -p debian/python-uno/$(OODIR)/program
+ mkdir -p debian/python-uno/$(OODIR)/share/registry
+ mkdir -p debian/python-uno/$(OODIR)/share/Scripts
+ cat debian/python3-uno/$(OODIR)/program/pythonloader.unorc \
+ | sed -e "s/$(PYMAJOR).$(PYMINOR)/$(PY2MAJOR).$(PY2MINOR)/" \
+ > debian/python-uno/$(OODIR)/program/pythonloader.unorc
+ for i in py2uno.so libpy2uno.so; do \
+ install -m644 $(SOURCE_TREE)/workdir/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/LinkTarget/Library/$$i \
+ debian/python-uno/$(OODIR)/program/$$i; \
+ ln -s $$i debian/python-uno/$(OODIR)/program/`echo $$i
| sed -e s/2//`; \
done
- cp debian/python-uno/$(OODIR)/program/pythonloader.py \
- debian/python3-uno/$(OODIR)/program
- cp debian/python-uno/$(OODIR)/share/registry/pyuno.xcd \
- debian/python3-uno/$(OODIR)/share/registry
- cp -r debian/python-uno/$(OODIR)/share/Scripts/python \
- debian/python3-uno/$(OODIR)/share/Scripts
+ install -m644 $(SOURCE_TREE)/workdir/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/LinkTarget/Library/python2loader.uno.so \
+ debian/python-uno/$(OODIR)/program/python2loader.uno.so
+ ln -s python2loader.uno.so
debian/python-uno/$(OODIR)/program/pythonloader.uno.so
+ cp debian/python3-uno/$(OODIR)/program/pythonloader.py \
+ debian/python-uno/$(OODIR)/program
+ cp debian/python3-uno/$(OODIR)/share/registry/pyuno.xcd \
+ debian/python-uno/$(OODIR)/share/registry
+ cp -r debian/python3-uno/$(OODIR)/share/Scripts/python \
+ debian/python-uno/$(OODIR)/share/Scripts
endif
ifeq "$(ENABLE_SCRIPT_PROVIDER_PYTHON)" "y"
rm -f
debian/libreoffice$(VER)-script-provider-python/$(OODIR)/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 \
- debian/python-uno/usr/share/doc/python-uno; \
- for i in $(SOURCE_TREE)/pyuno/doc/*; do \
- cp $$i debian/python-uno/usr/share/doc/python-uno; \
- 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; \
@@@ -2256,15 -2225,6 +2256,15 @@@
done
cd debian/python3-uno/usr/share/doc/python3-uno && \
find . -type d -name "CVS" | xargs -r rm -rf
+ ifeq "$(ENABLE_PYTHON2)" "y"
+ mkdir -p debian/python-uno/usr/share/doc/python-uno
+ cp -r $(SOURCE_TREE)/pyuno/demo \
+ debian/python-uno/usr/share/doc/python-uno; \
+ for i in $(SOURCE_TREE)/pyuno/doc/*; do \
+ cp $$i debian/python-uno/usr/share/doc/python-uno; \
+ done
+ cd debian/python-uno/usr/share/doc/python-uno && \
+ find . -type d -name "CVS" | xargs -r rm -rf
endif
endif
@@@ -2311,10 -2271,28 +2311,10 @@@ ifeq "$(PACKAGE_SDK)" "y
cd $(PKGDIR)-dev/$(OOSDKDIR) && \
rm docs
# fix permissions
find $(PKGDIR)-dev/usr/share/idl/$(OODIRNAME) -type f -exec chmod 644
{} \;
- rm -f $(PKGDIR)-dev//usr/share/doc/libreoffice/sdk/readme/LICENSE.gz
-endif
-
-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
+ rm -f $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk/readme/LICENSE.gz
endif
ifeq "$(ENABLE_JAVA)" "y"
@@@ -2332,7 -2310,7 +2332,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)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/pck && \
+ cd $(SOURCE_TREE)/solver/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/pck && \
for i in juh jurt jut ridl unoloader; do \
cp $${i}_src.zip \
$(CURDIR)/$(PKGDIR)-dev/usr/share/java; \
@@@ -2378,6 -2356,10 +2378,6 @@@ ifeq "$(ENABLE_MYSQLNATIVE)" "y
rm -f
$(PKGDIR)-mysql-connector/$(OODIR)/share/extensions/mysql-connector-ooo/registration/LICENSE
endif
-ifeq "$(ENABLE_PDFIMPORT)" "y"
- rm -f
$(PKGDIR)-pdfimport/$(OODIR)/share/extensions/pdfimport/registration/LICENSE
-endif
-
ifeq "$(ENABLE_MEDIAWIKI)" "y"
rm -f
$(PKGDIR)-wiki-publisher/$(OODIR)/share/extensions/wiki-publisher/registration/LICENSE
endif
@@@ -2385,19 -2367,11 +2385,19 @@@
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengal \
+# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/bin/gengal \
# $(PKGDIR)-dev/$(OODIR)/program/gengal
-# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengal.bin \
+# install -m755 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/bin/gengal.bin \
# $(PKGDIR)-dev/$(OODIR)/program/gengal.bin
#endif
+ifeq "$(PACKAGE_SDK)" "y"
+ # move ui-previewer into -dev
+ mkdir -p $(PKGDIR)-dev/$(OODIR)/program
+ mv $(PKGDIR)-core/$(OODIR)/program/ui-previewer \
+ $(PKGDIR)-dev/$(OODIR)/program
+else
+ rm -f $(PKGDIR)-core/$(OODIR)/program/ui-previewer
+endif
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
@@@ -2516,8 -2490,7 +2516,8 @@@ endi
done
chmod 644 $(PKGDIR)-common/$(OODIR)/LICENSE.odt
chmod 644 $(PKGDIR)-common/$(OODIR)/CREDITS.odt
-
+ # FIXME. Do we really need this (ALV2 mandating it) or can this go?
+ chmod 644 $(PKGDIR)-common/$(OODIR)/NOTICE
rm -rf $(PKGDIR)-common/$(OODIR)/LICENSE
# move uno_packages/cache to /var and create symlink for for
@@@ -2550,6 -2523,12 +2550,6 @@@ endi
cd $(PKGDIR)-common/usr/share/icons/hicolor/32x32/apps && \
for x in *.png; do convert $$x `basename $$x .png`.xpm; done
-ifeq "$(ENABLE_JAVA)" "y"
- ifneq (,$(filter saxon, $(SYSTEM_STUFF)))
- ln -sf /usr/share/java/saxonb.jar \
- $(PKGDIR)-java-common/$(OODIR)/program/classes/saxon9.jar
- endif
-endif
# remove extra license files
rm -rf $(PKGDIR)-common/$(OODIR)/licenses
rm -f $(PKGDIR)-common/$(OODIR)/share/readme/LICENSE*
@@@ -2775,10 -2754,9 +2775,10 @@@ endi
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-# install -m644 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gengalrc \
+# install -m644 $(SOURCE_TREE)/svx/$(shell .
$(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo
$$OUTPATH$$PROEXT)/bin/gengalrc \
# $(PKGDIR)-common/$(OODIR)/program/gengalrc
#endif
+
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
@@@ -2794,7 -2772,7 +2794,7 @@@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/
dh_installdocs -s -A
for p in $(ARCH_DEP_PACKAGES); do \
mkdir -p debian/$$p/usr/share/doc/$$p; \
- cat readlicense_oo/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo
$$OUTPATH$$PROEXT)/misc/UNX/README_en-US \
+ cat solver/$(shell . $(SOURCE_TREE)/bin/get_config_variables
OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
| sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
| sed -e 's/$${PRODUCTVERSION}/3.6/g' \
> debian/$$p/usr/share/doc/$$p/README; \
@@@ -2817,17 -2795,9 +2817,17 @@@ ifeq "$(ENABLE_JAVA)" "y
dh_nativejava -plibreoffice$(VER)-gcj -o
endif
endif
- dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
-ifeq "$(ENABLE_PYTHON3)" "y"
dh_python3 -ppython3-uno --no-guessing-deps
+ # adds a python3 (>= 3.2.3-3~)
+ifeq "$(PYTHON_VERSION)" "current"
+ sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR) (>= 3.3~)/g' \
+ debian/python3-uno.substvars
+else
+ sed -i -e 's/python$(PYMAJOR) (>= .*)/python$(PYMAJOR).$(PYMINOR)/g' \
+ debian/python3-uno.substvars
+endif
+ifeq "$(ENABLE_PYTHON2)" "y"
+ dh_python2 -ppython-uno --no-guessing-versions --no-guessing-deps
endif
dh_lintian -s
dh_bugfiles -s -A
@@@ -2851,9 -2821,9 +2851,9 @@@ ifeq "$(BUILD_DBG_PACKAGE)" "y
$(PKGDIR)-dbg/usr/share/libreoffice/gdb
# FIXME: or better ure-dbg (ure/lib?). Then again ure-link is a link
which is in -common
# anyways...
- mkdir -p debian/uno-libs3-dbg/usr/share/gdb/auto-load/$(OODIR)/ure/
- mv $(CURDIR)/debian/tmp//usr/share/gdb/auto-load/$(OODIR)/ure/lib \
- debian/uno-libs3-dbg/usr/share/gdb/auto-load/$(OODIR)/ure
+ mkdir -p debian/uno-libs3-dbg/usr/share/gdb/auto-load/$(OODIR)/ure-link/
+ mv $(CURDIR)/debian/tmp//usr/share/gdb/auto-load/$(OODIR)/ure-link/lib \
+ debian/uno-libs3-dbg/usr/share/gdb/auto-load/$(OODIR)/ure-link
mkdir -p debian/uno-libs3-dbg/usr/share/libreoffice/gdb/libreoffice
mv $(PKGDIR)-dbg/usr/share/libreoffice/gdb/libreoffice/cppu.py \
debian/uno-libs3-dbg/usr/share/libreoffice/gdb/libreoffice
@@@ -2865,8 -2835,8 +2865,8 @@@ els
endif
dh_icons -s
dh_compress -s -X.py -X.mk -X.sxd
- dh_makeshlibs -puno-libs3 -V"uno-libs3 (>= $(shell grep
UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{
print $$2 }' | cut -d. -f1-3)~), ure" -- -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 }' | cut
-d. -f1-3)~)" -- -v`echo $(BINARY_VERSION) | cut -d: -f2`
+ dh_makeshlibs -puno-libs3 -V"uno-libs3 (>= $(shell grep
UREPACKAGEVERSION $(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{
print $$2 }' | cut -d. -f1-3)~), ure" -- -c0 -d -V -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 }' | cut
-d. -f1-3)~)" -- -d -V -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 && \
@@@ -2899,6 -2869,12 +2899,6 @@@ 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/$(OODIR)/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 }')/'
$(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..
@@@ -2910,6 -2886,9 +2910,6 @@@ 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_JAVA)" "y"
for p in $(ARCH_DEP_PACKAGES); do \
if [ "$$p" = "libreoffice$(VER)-presentation-console" ]; then
continue; fi; \
@@@ -2932,6 -2911,8 +2932,6 @@@ endi
# -l $(PKGDIR)-core/$(OPENOFFICEDIR)/program
dh_gencontrol -s $(DEBHELPER_OPTIONS) -Nure -Nure-dbg -Nuno-libs3
-Nuno-libs3-dbg \
-Nlibreoffice$(VER)-presentation-minimizer \
- -Nlibreoffice$(VER)-presenter-console \
- -Nlibreoffice$(VER)-pdfimport \
-Nlibreoffice$(VER)-mysql-connector -- \
-V"ure:Version=$(shell grep UREPACKAGEVERSION
$(SOURCE_TREE)/instsetoo_native/util/openoffice.lst | awk '{ print $$2 }')" \
-V'base-version=$(BASE_VERSION)' \
@@@ -2943,12 -2924,13 +2943,12 @@@
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
- -V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
-V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \
-V'lpsolve-dep=$(LPSOLVE_DEP)' \
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
-V'libebook-dep=$(shell debian/scripts/get_libebook_dep.sh)' \
- -V'libldap-suggests=$(LDAP_LIB)' \
+ -V'idlc-cpp-depends=$(IDLC_CPP_DEPENDS)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
ifeq "$(ENABLE_JAVA)" "y"
@@@ -2956,14 -2938,22 +2956,14 @@@
debian/libreoffice$(VER)-officebean/DEBIAN/control
endif
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/description.xml | perl -pi -e
's,<version.*value=\"(.*)\" />,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) |
cut -d: -f2`
-endif
ifeq "$(ENABLE_MINIMIZER)" "y"
dh_gencontrol -plibreoffice$(VER)-presentation-minimizer -- \
-v$(shell grep "<version"
$(SOURCE_TREE)/sdext/source/minimizer/description.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(PACKAGE_BASE)" "y"
ifeq "$(ENABLE_MYSQLNATIVE)" "y"
dh_gencontrol -plibreoffice$(VER)-mysql-connector -- \
- -v$(shell grep "<version" $(SOURCE_TREE)/mysqlc/$(shell .
$(SOURCE_TREE)/config_host.mk.source; 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)/bin/get_config_variables OUTPATH PROEXT; 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
@@@ -3024,9 -3014,9 +3024,9 @@@ endi
dh_installdocs -i -A
for p in $(ARCH_INDEP_PACKAGES); do \
mkdir -p debian/$$p/usr/share/doc/$$p; \
- cat readlicense_oo/$(shell .
$(SOURCE_TREE)/config_host.mk.source; echo
$$OUTPATH$$PROEXT)/misc/UNX/README_en-US \
+ cat solver/$(shell . $(SOURCE_TREE)/bin/get_config_variables
OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
| sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
- | sed -e 's/$${PRODUCTVERSION}/3.6/g' \
+ | sed -s 's/$${PRODUCTVERSION}/3.6/g' \
> debian/$$p/usr/share/doc/$$p/README; \
done
dh_installman -i
@@@ -3036,10 -3026,7 +3036,10 @@@
ln -sf libreoffice.1.gz $$i.gz; \
fi; \
done
- dh_installchangelogs -i -k
+ dh_installchangelogs -i -Nlibreoffice$(VER)-librelogo -k
+ifeq "$(PACKAGE_LIBRELOGO)" "y"
+ dh_installchangelogs -plibreoffice$(VER)-librelogo -k
librelogo/source/ChangeLog
+endif
dh_installmime -i
dh_lintian -i
dh_bugfiles -i -A
@@@ -3074,6 -3061,7 +3074,6 @@@ endi
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'textcat-data-recommends=$(TEXTCAT_DATA_RECOMMENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
- -V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
-v$(BINARY_VERSION)
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
@@@ -3141,24 -3129,27 +3141,24 @@@ $(call get_orig_tarball)
$(call pack_gittarball,core,$@,)
$(call get_orig_tarball,-helpcontent2):
- $(call
pack_gittarball,help,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/helpcontent2)
+ $(call pack_gittarball,help,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/)
$(call get_orig_tarball,-%):
- $(call pack_gittarball,$*,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/$*)
+ $(call pack_gittarball,$*,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/)
# Get upstream external sources
-$(call get_orig_tarball,-src): binfilter/no_localization
helpcontent2/makefile.pmk translations/makefile.mk .gitignore
+$(call get_orig_tarball,-src): helpcontent2/makefile.pmk
translations/makefile.mk .gitignore
dh_testdir
rm -rf $(TARFIILE_LOCATION)
mkdir -p $(TARFILE_LOCATION)
- ./autogen.sh
- ./download
+ ./autogen.sh --with-all-tarballs
+ $(MAKE) download
tar cvJf $@ -C $(TARFILE_LOCATION) --transform 's,./,,' .
# using flag files for unpacking
.gitignore: $(call get_orig_tarball)
$(call unpack_gittarball,,$<,--strip-components=1)
-binfilter/no_localization: $(call get_orig_tarball,-binfilter)
- $(call unpack_gittarball,binfilter,$<,)
-
translations/makefile.mk: $(call get_orig_tarball,-translations)
$(call unpack_gittarball,translations,$<,)
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
