[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.4_rc1-1-111-g59f7494
The following commit has been merged in the debian-experimental-3.7 branch:
commit 19c4c92342de4929f36496173eea9588a9c3c97f
Merge: 8bc3d561d8a7faf290bdad9cf5c4e0d753c8ebc9 d1333e1f51ce2a24b394e304baebc25c04d9c45f
Author: Rene Engelhard <rene@debian.org>
Date: Fri Nov 16 22:31:38 2012 +0100
Merge remote-tracking branch 'origin/debian-experimental-3.6' into debian-experimental-3.7
diff --combined changelog
index 6dba38e,5417ebc..7a9e79c
--- a/changelog
+++ b/changelog
@@@ -1,29 -1,3 +1,29 @@@
+libreoffice (1:4.0.0~alpha0~git20121116-1) UNRELEASED; urgency=low
+
+ * new upstream snapshot
+ - contains new driver for mozab (mork). Automatically enabled thus
+ this closes: #321099
+
+ * 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:
+ - disable langpacks for now; translations not yet updated causing
+ weird stuff
+ - add new conditionals for new dependencies: liblangtag, liborcus,
+ libmspub, (u)cpp; remove them for gone saxon, librsvg
+ - enable sdrmeote on all archs; b-d on libbluetooth-dev on where we
+ enable bluetooth (!kfreebsd-*)
+ - use gstreamer1.0
+ - temporarily disable python3-uno as the new python-based wizards
+ (in comon!) don't work with it...
+ * debian/uno-libs3.symbols: update
+ * debian/control*.in, debian/rules, debian/scripts/gid2pkgdirs.sh: binfilter
+ is gone. yay.
+
+ -- Rene Engelhard <rene@debian.org> Tue, 06 Nov 2012 20:43:46 +0100
+
libreoffice (1:3.6.4~rc1-1) experimental; urgency=low
* new upstream release candidate
@@@ -37,6 -11,7 +37,7 @@@
* debian/rules:
- mention CVE-2012-4233 in 1:3.6.1~rc2-1's changelog
- re-enable mozilla plugin
+ - actually make python version-switching work
* debian/control.in:
- recommend fonts-liberation instead of ttf-liberation
(closes: #691949)
@@@ -45,7 -20,7 +46,7 @@@
* debian/libreoffice-{core,gtk3}.bug-script.in:
- find out whether we have Experimental features enabled
- -- Rene Engelhard <rene@debian.org> Wed, 14 Nov 2012 11:01:51 +0100
+ -- Rene Engelhard <rene@debian.org> Fri, 16 Nov 2012 22:20:37 +0100
libreoffice (1:3.6.3~rc2-1) experimental; urgency=low
@@@ -61,6 -36,8 +62,8 @@@
* debian/rules:
- fix upstream README(_en-US) install for binary-indep packages
- fix typo in finding gcj dir detection, thanks Rico Tzschichholz
+ - don't add version from librsvg*.shlibs (as for libebook) as we
+ dlopen() it anyway.
-- Rene Engelhard <rene@debian.org> Fri, 26 Oct 2012 15:47:02 +0200
diff --combined rules
index b843b20,ec10caf..bd3b05a
--- 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)
@@@ -34,7 -34,6 +34,7 @@@ include /usr/share/dpkg/architecture.m
include /usr/share/dpkg/vendor.mk
DISTREL := $(shell lsb_release -cs)
SHELL:=/bin/bash
+export gb_SHELL:=$(SHELL)
SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
@@@ -70,11 -69,11 +70,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.4.1
+lo_sources_ver=4.0.0.0.alpha
# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.6.4.1 libreoffice-3.6.4.1
-GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-3-6-4
+# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
+#GIT_TAG=libreoffice-$(lo_sources_ver)
+#GIT_BRANCH=libreoffice-3-6-2
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@@ -99,7 -98,6 +99,7 @@@ BUILD_PYUNO=
ENABLE_PYTHON3=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
@@@ -123,7 -121,8 +123,7 @@@ ifeq "$(ENABLE_PYTHON3)" "y
endif
endif
PACKAGE_TTF_OPENSYMBOL=y
-BUILD_BINFILTERS=y
-BUILD_ONLY_EN_US=n
+BUILD_ONLY_EN_US=y
ENABLE_HELP=y
ENABLE_JAVA=y
ifeq "$(ENABLE_JAVA)" "y"
@@@ -158,7 -157,6 +158,7 @@@ ICU_MINVER= (>= 4.0
SYSTEM_STUFF += libwpd libwpg libwps
SYSTEM_STUFF += libvisio
SYSTEM_STUFF += libcdr
+SYSTEM_STUFF += libmspub
#SYSTEM_STUFF += xmlsec
BUILD_CAIROCANVAS=y
SYSTEM_STUFF += cairo
@@@ -186,25 -184,17 +186,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
@@@ -273,7 -263,7 +273,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
@@@ -313,21 -303,11 +313,21 @@@ SYSTEM_STUFF += libpn
SYSTEM_STUFF += nss
SYSTEM_STUFF += clucene
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
+SYSTEM_STUFF += liblangtag
+SYSTEM_STUFF += orcus
+USE_UCPP=n
+ifeq "$(USE_UCPP)" "y"
+ SYSTEM_STUFF += ucpp
+endif
# Default flags to pass to configure
CONFIGURE_FLAGS= \
@@@ -482,6 -462,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,7 -479,7 +493,7 @@@ endi
# Debian Squeeze
ifeq "$(WHEEZY_BACKPORT)" "y"
BUGS=mailto:debian-backports@lists.debian.org
- SYSTEM_STUFF := $(filter-out libcmis libcdr clucene, $(SYSTEM_STUFF))
+ SYSTEM_STUFF := $(filter-out libcmis libcdr clucene libmspub mdds liblangtag orcus, $(SYSTEM_STUFF))
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@@ -600,6 -586,17 +600,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/)
@@@ -618,13 -615,12 +618,13 @@@ endi
ifeq "$(ENABLE_SYMBOLS)" "y"
# Small symbols?
ifeq "$(SMALL_SYMBOLS)" "y"
- CONFIGURE_FLAGS += --enable-symbols=SMALL
- CFLAGS := $(shell echo $(CFLAGS) | sed -e "s/-g/-g1/")
- CXXFLAGS := $(shell echo $(CXXFLAGS) | sed -e "s/-g/-g1/")
+ CFLAGS := -g1
+ CXXFLAGS := -g1
export CFLAGS CXXFLAGS
else
- CONFIGURE_FLAGS += --enable-symbols
+ CFLAGS := -g
+ CXXFLAGS := -g
+export CFLAGS CXXFLAGS
endif
endif
ifeq (debug,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@@ -632,15 -628,14 +632,14 @@@
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())')
+ 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"
BUILD_DEPS += , python (>= 2.6.6-3+squeeze4)
@@@ -800,6 -795,10 +799,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,7 -849,7 +849,7 @@@ 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
@@@ -862,15 -861,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)
@@@ -914,11 -904,7 +913,11 @@@ ifneq (,$(filter boost, $(SYSTEM_STUFF)
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)))
@@@ -951,11 -937,8 +950,11 @@@ ifeq "$(USE_EXTERNAL_CXXLIBS)" "y
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)
@@@ -964,19 -947,6 +963,19 @@@ 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
+
+ifneq (,$(filter liblangtag, $(SYSTEM_STUFF)))
+ BUILD_DEPS += , liblangtag-dev (>= 0.3)
+endif
+
ifneq (,$(filter icu, $(SYSTEM_STUFF)))
BUILD_DEPS += , libicu-dev $(ICU_MINVER)
endif
@@@ -1063,6 -1033,11 +1062,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
@@@ -1085,12 -1060,12 +1084,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
@@@ -1115,25 -1090,14 +1114,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)))
@@@ -1191,13 -1155,11 +1190,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
@@@ -1215,6 -1177,16 +1214,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
@@@ -1272,9 -1244,10 +1271,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)/py3uno
rm -f configure aclocal.m4 autogen.lastrun
rm -f build_error.log
@@@ -1305,6 -1278,16 +1304,6 @@@ debian/control: $(wildcard debian/contr
-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`; \
@@@ -1453,14 -1436,14 +1452,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 -1452,7 +1468,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
@@@ -1522,9 -1506,8 +1521,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"
@@@ -1587,24 -1570,27 +1586,24 @@@ $(STAMP_DIR)/build-arch
# somehow...
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ./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
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
+ rm -rf $(SOURCE_TREE)/py3uno
+ cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/py3uno
+ $(MAKE) py3uno.clean
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
+ cd py3uno && \
+ patch -p1 < $(CURDIR)/debian/patches/pyuno-copy-for-python3.diff
+ make cmd cmd='cd py3uno; export PYTHON=$(PYTHON3); export PYTHON_CFLAGS="$(shell pkg-config --cflags python$(PY3MAJOR))"; export PYTHON_LIBS="$(shell pkg-config --libs python$(PY3MAJOR))"; $(MAKE)'
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
+ cd py3uno && \
+ patch -p1 < $(CURDIR)/debian/patches/pyuno-copy-for-python3.diff
+ make cmd cmd='cd py3uno; export PYTHON=$(PYTHON3); export PYTHON_CFLAGS="$(shell pkg-config --cflags python-$(PY3MAJOR).$(PY3MINOR))"; export PYTHON_LIBS="$(shell pkg-config --libs python-$(PY3MAJOR).$(PY3MINOR))"; $(MAKE)'
endif
endif
endif
@@@ -1658,7 -1644,7 +1657,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 gb_FULLDEPS= gb_Deliver_HARDLINK=T && \
rm -rf $$t
ifneq (,$(findstring $(DEB_HOST_ARCH),$(OOO_NO_BASE_ARCHS)))
@@@ -1776,16 -1762,23 +1775,16 @@@ 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
-endif
-
dh_installdirs -A
dh_install -A --sourcedir=debian/tmp/pkg --fail-missing
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
@@@ -1995,6 -1988,9 +1994,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).
@@@ -2202,14 -2198,10 +2201,14 @@@ ifeq "$(BUILD_PYUNO)" "y
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 \
+ for i in py3uno.so libpy3uno.so; do \
+ install -m644 $(SOURCE_TREE)/workdir/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/LinkTarget/Library/$$i \
debian/python3-uno/$(OODIR)/program/$$i; \
+ ln -s $$i debian/python3-uno/$(OODIR)/program/`echo $$i | sed -e s/3//`; \
done
+ install -m644 $(SOURCE_TREE)/workdir/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/LinkTarget/Library/python3loader.uno.so \
+ debian/python3-uno/$(OODIR)/program/python3loader.uno.so
+ ln -s python3loader.uno.so debian/python3-uno/$(OODIR)/program/pythonloader.uno.so
cp debian/python-uno/$(OODIR)/program/pythonloader.py \
debian/python3-uno/$(OODIR)/program
cp debian/python-uno/$(OODIR)/share/registry/pyuno.xcd \
@@@ -2286,7 -2278,7 +2285,7 @@@ ifeq "$(PACKAGE_SDK)" "y
# install gsicheck into -dev
mkdir -p $(PKGDIR)-dev/$(OODIR)/program
- install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/gsicheck \
+ install -m755 $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/gsicheck \
$(PKGDIR)-dev/$(OODIR)/program/gsicheck.bin
( \
echo '#! /bin/sh'; \
@@@ -2322,7 -2314,7 +2321,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; \
@@@ -2375,9 -2367,9 +2374,9 @@@ endi
#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
@@@ -2531,6 -2523,12 +2530,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*
@@@ -2756,17 -2754,9 +2755,17 @@@ 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
+
+ifeq "$(PACKAGE_LIBRELOGO)" "y"
+ rm -rf $(PKGDIR)-librelogo
+ mkdir -p $(PKGDIR)-librelogo/$(OODIR)/share/extensions/librelogo
+ cd $(PKGDIR)-librelogo/$(OODIR)/share/extensions/librelogo && \
+ unzip $(CURDIR)/solver/$(shell . $(SOURCE_TREE)/bin/get_config_variables OUTPATH PROEXT; echo $$OUTPATH$$PROEXT)/bin/librelogo.oxt
+endif
+
touch $@
binary-arch: $(STAMP_DIR)/binary-arch
@@@ -2782,7 -2772,7 +2781,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; \
@@@ -2832,8 -2822,8 +2831,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 && \
@@@ -2866,6 -2856,12 +2865,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..
@@@ -2915,12 -2911,13 +2914,12 @@@ endi
-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"
@@@ -2943,7 -2940,7 +2942,7 @@@ endi
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
@@@ -3004,9 -3001,9 +3003,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
@@@ -3051,6 -3048,7 +3050,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"
@@@ -3070,10 -3068,6 +3069,10 @@@ ifeq "$(ENABLE_REPORTDESIGN)" "y
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep "<version" $(SOURCE_TREE)/reportbuilder/util/description.xml | perl -pi -e 's,<version value=\"(.*)\"/>,\1,; s/^\s+//')+LibO`echo $(BINARY_VERSION) | cut -d: -f2`
endif
+ifeq "$(PACKAGE_LIBRELOGO)" "y"
+ dh_gencontrol -plibreoffice$(VER)-librelogo -- \
+ -v$(shell grep "<version" $(SOURCE_TREE)/librelogo/source/description.xml | perl -pi -e 's,<version value=\"(.*)\" />,\1,; s/^\s+//; 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`
dh_md5sums -i
@@@ -3128,7 -3122,7 +3127,7 @@@ $(call get_orig_tarball,-%)
$(call pack_gittarball,$*,$@,libreoffice-$(DEB_VERSION_UPSTREAM)/$*)
# Get upstream external sources
-$(call get_orig_tarball,-src): binfilter/no_localization dictionaries/en/README.txt helpcontent2/makefile.pmk translations/makefile.mk .gitignore
+$(call get_orig_tarball,-src): dictionaries/en/README.txt helpcontent2/makefile.pmk translations/makefile.mk .gitignore
dh_testdir
rm -rf $(TARFIILE_LOCATION)
mkdir -p $(TARFILE_LOCATION)
@@@ -3140,6 -3134,9 +3139,6 @@@
.gitignore: $(call get_orig_tarball)
$(call unpack_gittarball,,$<,--strip-components=1)
-binfilter/no_localization: $(call get_orig_tarball,-binfilter)
- $(call unpack_gittarball,binfilter,$<,)
-
dictionaries/en/README.txt: $(call get_orig_tarball,-dictionaries)
$(call unpack_gittarball,dictionaries,$<,)
--
LibreOffice packaging repository
Reply to: