[SCM] LibreOffice packaging repository branch, debian-experimental-3.7, updated. libreoffice_3.6.3_rc2-1-76-g744ca1b
The following commit has been merged in the debian-experimental-3.7 branch:
commit 744ca1bf63fcb090e94b14f10ca56ca99a0a2873
Merge: edcc3f770541306c97ef905461f1378604568ccd 3ca6b5dad35c384785d18af0d18217e33e1045a1
Author: Rene Engelhard <rene@debian.org>
Date: Wed Oct 31 10:59:04 2012 +0100
Merge remote-tracking branch 'origin/debian-experimental-3.6' into debian-experimental-3.7
diff --combined changelog
index 4a0497b,fd0f222..aa06259
--- a/changelog
+++ b/changelog
@@@ -1,25 -1,14 +1,34 @@@
-libreoffice (1:3.6.3~rc2-2) UNRELEASED; urgency=low
+libreoffice (1:3.7.0~alpha0~git20121030-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)
+ * debian/rules:
+ - disable langpacks for now; translations not yet updated causing
+ weird stuff
+ - add new conditionals for new dependencies: liblangtag, liborcus,
+ libmspub, (u)cpp
+ - enable sdrmeote on all archs; b-d on libbluetooth-dev on where we
+ enable bluetooth (!kfreebsd-*)
+ - use gstreamer1.0
+ * debian/uno-libs3.symbols: update
+
+ -- Rene Engelhard <rene@debian.org> Tue, 30 Oct 2012 22:24:12 +0100
+
+libreoffice (1:3.6.3~rc1-2) UNRELEASED; urgency=low
+ * merge from Ubuntu:
+ - fix quoting of PYTHON_{CFLAGS,LIBS} (Matthias Klose)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 28 Oct 2012 14:33:55 +0100
+
+ libreoffice (1:3.6.3~rc2-1) experimental; urgency=low
+
+ * new upstream release candidate
+
* debian/patches/soffice-bashisms.diff: fix bashism in soffice for
valgrinding (closes: #690717)
* debian/patches/he-lucida-sans-unicode.diff: Update default Hebrew font
@@@ -31,7 -20,7 +40,7 @@@
- fix upstream README(_en-US) install for binary-indep packages
- fix typo in finding gcj dir detection, thanks Rico Tzschichholz
- -- Rene Engelhard <rene@debian.org> Mon, 22 Oct 2012 19:36:19 +0200
+ -- Rene Engelhard <rene@debian.org> Fri, 26 Oct 2012 15:47:02 +0200
libreoffice (1:3.6.3~rc1-1) experimental; urgency=low
diff --combined rules
index 58a6724,f7d21d6..dde10ae
--- 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
+HELP_L10N_VIRTUAL_VERSION:=3.7
#VER:=3
-OOVER:=3.6
+OOVER:=3.7
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.3.2
+lo_sources_ver=3.7.0.0.alpha
# NOT in proper libreoffice-3-6 branch
-# use ./g checkout -b tag-libreoffice-3.6.3.2 libreoffice-3.6.3.2
-GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-3-6-3
+# 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)
@@@ -123,7 -122,7 +123,7 @@@ ifeq "$(ENABLE_PYTHON3)" "y
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,21 -184,17 +186,21 @@@ 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
+GSTREAMER_VERSION=1.0
SYSTEM_STUFF += neon
NEON_SECTYPE=gnutls
NEONSONR=27
@@@ -309,21 -303,11 +309,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= \
@@@ -495,7 -479,7 +495,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))
@@@ -631,13 -615,12 +631,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)))
@@@ -813,6 -796,10 +813,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"
@@@ -875,15 -862,6 +875,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)
@@@ -927,11 -905,7 +927,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)))
@@@ -964,11 -938,8 +964,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)
@@@ -977,19 -948,6 +977,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
@@@ -1103,12 -1061,12 +1103,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
@@@ -1133,23 -1091,14 +1133,23 @@@ 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
+ 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)))
@@@ -1208,10 -1157,10 +1208,10 @@@ ifeq "$(PARALLEL_BUILD)" "y
# http://bugs.debian.org/622644
BUILD_DEPS += , make (>= 3.81-8.2)
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 += --with-parallelism=1
endif
@@@ -1229,6 -1178,16 +1229,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
@@@ -1289,7 -1248,7 +1289,7 @@@ clean
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
@@@ -1320,6 -1279,16 +1320,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`; \
@@@ -1538,9 -1507,8 +1538,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"
@@@ -1603,18 -1571,21 +1603,18 @@@ $(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
- . $(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
+ rm -rf $(SOURCE_TREE)/py3uno
+ cp -ra $(SOURCE_TREE)/pyuno $(SOURCE_TREE)/py3uno
+ 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)"
++ 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)"
endif
endif
@@@ -1646,7 -1617,7 +1646,7 @@@ $(STAMP_DIR)/build-indep
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) -d build gb_FULLDEPS= gb_Deliver_HARDLINK=T
touch $@
@@@ -2011,6 -1982,9 +2011,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).
@@@ -2218,14 -2192,10 +2218,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)/config_host.mk.source; 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)/config_host.mk.source; 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 \
@@@ -2546,6 -2516,12 +2546,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*
@@@ -2788,7 -2764,8 +2788,12 @@@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/
dh_installdocs -s -A
for p in $(ARCH_DEP_PACKAGES); do \
++<<<<<<< HEAD
+ cat solver/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
++=======
+ 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 \
++>>>>>>> origin/debian-experimental-3.6
| sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
| sed -e 's/$${PRODUCTVERSION}/3.6/g' \
> debian/$$p/usr/share/doc/$$p/README; \
@@@ -2933,7 -2910,7 +2938,7 @@@ endi
-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"
@@@ -3016,9 -2993,10 +3021,16 @@@ ifeq "$(PACKAGE_SDK)" "y
endif
dh_installdocs -i -A
for p in $(ARCH_INDEP_PACKAGES); do \
++<<<<<<< HEAD
+ cat solver/$(shell . $(SOURCE_TREE)/config_host.mk.source; echo $$OUTPATH$$PROEXT)/bin/osl/README_en-US \
+ | sed -e "s/$${PRODUCTNAME}/LibreOffice/g" \
+ | sed -s "s/$${PRODUCTVERSION}/3.6/g" \
++=======
+ 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 \
+ | sed -e 's/$${PRODUCTNAME}/LibreOffice/g' \
+ | sed -e 's/$${PRODUCTVERSION}/3.6/g' \
++>>>>>>> origin/debian-experimental-3.6
> debian/$$p/usr/share/doc/$$p/README; \
done
dh_installman -i
--
LibreOffice packaging repository
Reply to: