[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-6.0
Rene Engelhard
rene at moszumanska.debian.org
Thu Dec 14 22:49:24 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.
commit 9913588be2e184680132d2a8b6dd396002e92d27
Merge: cbdff9d d6e75f8
Author: Rene Engelhard <rene at debian.org>
Date: Thu Dec 14 23:49:15 2017 +0100
Merge remote-tracking branch 'origin/debian-experimental-5.4' into debian-experimental-6.0
changelog | 15 ++++++++++++
control.in | 4 ++--
copyright | 13 +++++++++++
rules | 79 ++++++++++++++++++++++++++++----------------------------------
4 files changed, 65 insertions(+), 46 deletions(-)
diff --cc changelog
index 42b3e02,158af86..4838b4c
--- a/changelog
+++ b/changelog
@@@ -39,45 -31,39 +39,60 @@@ libreoffice (1:6.0.0~beta2-1) experimen
- change BRAND_BASE_DIR in fundamentalrc so that we don't get
/usr/lib/libreoffice/program/../program/xpdfimport calls. We know
the path and the apparmor profile doesn't allow this
++<<<<<<< HEAD
+ * debian/libreoffice-common.bug-script.in: run aa-status
++=======
+ - stop passing --disable-report-builder to build-archs configure since
+ even though it's built the report builder doesn't work then. Move
+ from Build-Depends-Indep: to Build-Depends: again (closes: #875688);
+ * debian/rules, debian/control.in:
+ s/REPORTDESIGN/REPORTBUILDER/ while we're at it
++>>>>>>> origin/debian-experimental-5.4
* debian/control.in: add gnupg to Suggests
+ * debian/copyright:
+ - mention sysui/desktop/apparmor/* copyright/license
+ - mention icon_themes/elementary*/* copyright/license
[ intrigeri ]
* debian/README.Debian: document how to debug and customize the included
AppArmor profiles
++<<<<<<< HEAD
+ -- Rene Engelhard <rene at debian.org> Sat, 09 Dec 2017 00:22:29 +0100
++=======
+ -- Rene Engelhard <rene at debian.org> Tue, 12 Dec 2017 19:10:51 +0100
++>>>>>>> origin/debian-experimental-5.4
-libreoffice (1:5.4.3-4) unstable; urgency=medium
+libreoffice (1:6.0.0~beta1-2) experimental; urgency=medium
- * debian/control.in: remove openjdk conflicts ...
- * debian/rules: ... and make them Depends in JAVA_RUNTIME_DEPENDS for the
- Java-using packages. Also allow openjdk-9 everywhere
- This doesn't prevent usage of the "broken" JDK but otherwise we "break"
- jodconverter/natbraille in testing... And linux 4.14.2-1 is also supposed to
- fix the regression finally...
- This also closes: #882436
+ * debian/libreoffice-common.{triggers,postinst}.in,
+ debian/shell-lib-lool.sh: add trigger updating LOOLs systemplate
+ * debian/libreoffice-common.triggers.in: switch to interest-noawait triggers
+
+ * merge from Ubuntu:
+ - debian/patches/fix-includes-in-aarch64-bridge.patch: add from master
+
+ -- Rene Engelhard <rene at debian.org> Mon, 04 Dec 2017 19:01:27 +0100
- -- Rene Engelhard <rene at debian.org> Sat, 02 Dec 2017 01:01:41 +0100
+libreoffice (1:6.0.0~beta1-1) experimental; urgency=medium
-libreoffice (1:5.4.3-3) unstable; urgency=medium
+ * New upstream beta release
- * debian/patches/icu-60.diff: backport icu 60 support patch from master
+ * debian/patches/ww8export-HAVE_MORE_FONTS.diff: move ...
+ * debian/patches/disable-tests-somehow-needing-more-fonts.diff: ... here
+ and patch also ooxmlexport4
* debian/rules:
+ - use (dh_)dwz and (if enabled) install the multifile file into
+ uno-libs3-dbgsym.
+ Thanks Matthias Klose for the hint.
+ Make *-dbgsym depend on uno-libs3-dbgsym which should contain the above
+ file and is recommended anyway because of the gdb helpers.
+ - be consequent and enable the junit tests on arm64 now that
+ those work.
+ - stop passing --disable-database-connectivity for no-Base archs
+ (closes: #874274)
+ - explicitly use and depend on openjdk 9 on i386 now that #876069 is fixed.
- replace some manual dpkg-parsechangelog calls with
$(DEB_VERSION) and $(DEB_DISTRIBUTION) and fix logic for
--disable-dependency-tracking
diff --cc rules
index 1130ce8,769323a..1279172
--- a/rules
+++ b/rules
@@@ -378,8 -376,11 +377,8 @@@ PARALLEL_BUILD=
ENABLE_LDAP=y
USE_OPENLDAP=y
SYSTEM_STUFF += epoxy
-ENABLE_GLTF=y
-SYSTEM_STUFF += libgltf
-LIBGLTF_MINVER=0.1.0
ifeq "$(ENABLE_JAVA)" "y"
- ENABLE_REPORTDESIGN=y
+ ENABLE_REPORTBUILDER=y
SYSTEM_STUFF += jfreereport
ENABLE_MEDIAWIKI=y
SYSTEM_STUFF += apache-commons
@@@ -621,10 -622,14 +620,10 @@@ OOO_EXTENSIONS_ARCHS := $(OOO_ARCH_DEP_
OOO_BASE_ARCHS := $(OOO_JAVA_ARCHS)
$(eval $(call gen_no_archs,OOO_BASE_ARCHS))
- OOO_REPORTDESIGN_ARCHS := $(OOO_BASE_ARCHS)
- $(eval $(call gen_no_archs,OOO_REPORTDESIGN_ARCHS))
+ OOO_REPORTBUILDER_ARCHS := $(OOO_BASE_ARCHS)
+ $(eval $(call gen_no_archs,OOO_REPORTBUILDER_ARCHS))
OOO_FIREBIRD_ARCHS := $(OOO_LE_ARCHS)
$(eval $(call gen_no_archs,OOO_FIREBIRD_ARCHS))
-# enable COLLADA (if any) only on i386/amd64 for now, rapidjson does seem
-# to have alignment problems on other archs (e.g. arm*)
-OOO_COLLADA_ARCHS=amd64 i386
-$(eval $(call gen_no_archs,OOO_COLLADA_ARCHS))
# chromium only available here.
OOO_GDRIVE_ARCHS=amd64 arm64 armhf i386
@@@ -1968,10 -1969,12 +1963,10 @@@ $(STAMP_DIR)/build-arch
CLANGDIR=$(CLANGDIR) \
MARIADBCONFIG=$(MARIADBCONFIG) \
FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
- OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
- COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) --without-junit --without-cppunit \
- --without-doxygen --without-javadoc --disable-ext-wiki-publisher \
- --disable-report-builder --disable-scripting-javascript \
- --disable-scripting-beanshell \
+ --disable-ext-wiki-publisher \
+ --disable-scripting-javascript --disable-scripting-beanshell \
+ --without-doxygen --without-javadoc \
--with-galleries=no --with-theme="$(DEFAULT_IMAGE)"
PATH=$(BUILD_PATH) LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) ARCH_FLAGS=$(ARCH_FLAGS) TMP=`mktemp -q -d` $(MAKE) build-non-l10n-only
@@@ -2035,10 -2040,12 +2030,10 @@@ endi
CLANGDIR=$(CLANGDIR) \
MARIADBCONFIG=$(MARIADBCONFIG) \
FIREBIRD_CFLAGS=$(FIREBIRD_CFLAGS) FIREBIRD_LIBS=$(FIREBIRD_LIBS) \
- OPENCOLLADA_CFLAGS=$(OPENCOLLADA_CFLAGS) OPENCOLLADA_LIBS=$(OPENCOLLADA_LIBS) \
- COLLADA2GLTF_CFLAGS=$(COLLADA2GLTF_CFLAGS) COLLADA2GLTF_LIBS=$(COLLADA2GLTF_LIBS) \
./autogen.sh $(CONFIGURE_FLAGS) \
- --without-doxygen --without-javadoc --disable-ext-wiki-publisher \
- --disable-report-builder --disable-scripting-javascript \
- --disable-scripting-beanshell \
+ --disable-ext-wiki-publisher \
+ --disable-scripting-javascript --disable-scripting-beanshell \
+ --without-doxygen --without-javadoc \
--with-galleries=no --with-theme="$(DEFAULT_IMAGE)"
# generate the needed en_US.UTF-8. Upstream doesn't want to support
@@@ -3210,21 -3223,14 +3205,17 @@@ endi
ln -s /usr/share/doc/libreoffice-common/examples/$$i $(PKGDIR)-common/$(OODIR)/share/registry/$$i; \
done
++<<<<<<< HEAD
++=======
+ # this only works with --without-fonts. Otherwise we get all stuff here,
+ # not only the Symbol->OpenSymbol part... But we don't support --with-fonts
+ # build here right now anyway.
++>>>>>>> origin/debian-experimental-5.4
ifeq "$(PACKAGE_TTF_OPENSYMBOL)" "y"
- # generate fontconfig file. Upstream creates a fc_local.conf in
- # postprocess but it might also contain other font stuff, so do it
- # manually
- mkdir -p debian/fonts-opensymbol/usr/share/fontconfig/conf.avail
- mkdir -p debian/fonts-opensymbol/etc/fonts.d/
- ( \
- echo "<?xml version="1.0"?>"; \
- echo "<!DOCTYPE fontconfig SYSTEM "fonts.dtd">"; \
- echo "<fontconfig>"; \
- ) > debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
- cat $(SOURCE_TREE)/extras/source/truetype/symbol/fc_local.snippet >> debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
- echo "</fontconfig>" >> debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
- cd debian/fonts-opensymbol/etc/fonts.d/ && \
- ln -s /usr/share/fontconfig/conf.avail/30_opensymbol.conf
+ mv $(PKGDIR)-common/$(OODIR)/share/truetype/fc_local.conf \
+ debian/fonts-opensymbol/usr/share/fontconfig/conf.avail/30_opensymbol.conf
+ else
+ rm -f $(PKGDIR)-common/$(OODIR)/share/truetype/fc_local.conf
endif
# register technical.dic
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list