summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-04 13:29:06 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-04 14:23:39 +0000
commit7f4879a384dbdcdfff3ee1351c90dfae9f82c804 (patch)
treee3d6c4a79efc33f2b50bb78fa5d85404da9ffdf7
parentMerging upstream version 1:6.0.5. (diff)
downloadlibreoffice-7f4879a384dbdcdfff3ee1351c90dfae9f82c804.zip
libreoffice-7f4879a384dbdcdfff3ee1351c90dfae9f82c804.tar.xz
Merging debian version 1:6.0.5-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/205144198c6b88593fa927a877ca11075ca5632a.diff18
-rw-r--r--debian/changelog39
-rw-r--r--debian/control1
-rw-r--r--debian/libreoffice-kde.NEWS4
-rw-r--r--debian/patches/apparmor-fixes.diff1
-rw-r--r--debian/patches/series2
-rwxr-xr-xdebian/rules55
7 files changed, 79 insertions, 41 deletions
diff --git a/debian/205144198c6b88593fa927a877ca11075ca5632a.diff b/debian/205144198c6b88593fa927a877ca11075ca5632a.diff
deleted file mode 100644
index e40caff..0000000
--- a/debian/205144198c6b88593fa927a877ca11075ca5632a.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/tests/patches/disable-db-tests.diff b/tests/patches/disable-db-tests.diff
-index 404dea7..7f4f6c4 100644
---- a/tests/patches/disable-db-tests.diff
-+++ b/tests/patches/disable-db-tests.diff
-@@ -62,11 +62,10 @@ diff -urN smoketest-old/data/Test_DB.xml smoketest/data/Test_DB.xml
- oDBConnection.Dispose()
- --- a/dbaccess/Module_dbaccess.mk-old 2012-04-27 23:27:39.194936746 +0200
- +++ b/dbaccess/Module_dbaccess.mk 2012-04-27 23:27:47.102975960 +0200
--@@ -31,50 +31,6 @@
-- AllLangMoTarget_dba \
-+@@ -31,49 +31,6 @@
- ))
-
---ifneq ($(OS),IOS)
-+ ifneq ($(OS),IOS)
- -ifeq ($(ENABLE_FIREBIRD_SDBC),TRUE)
- -$(eval $(call gb_Module_add_check_targets,dbaccess,\
- - CppunitTest_dbaccess_firebird_test \
diff --git a/debian/changelog b/debian/changelog
index d4e9e14..d548ed9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,42 @@
+libreoffice (1:6.0.5-1) unstable; urgency=medium
+
+ * New upstream release
+
+ * debian/rules:
+ - fix i386 conditional for not adding a (not fullfillable on stretch
+ even with backports) default-jdk (>= 2:1.9) build-dep
+ - don't enable dwz on stretch-backports, the needed debhelper conflicts
+ against the (needed via libgpgmepp-dev) stable qt5-qmake :/
+ - remove USE_DWZ_MULTIFILE conditional (which was disabled),
+ default since debhelper 11.3
+
+ -- Rene Engelhard <rene@debian.org> Wed, 20 Jun 2018 04:54:34 +0000
+
+libreoffice (1:6.0.5~rc1-2) unstable; urgency=medium
+
+ * debian/rules:
+ - stop special-casing i386 to explicitely use openjdk (9), use default-java
+ again and and appropriate versioned build-depends
+
+ -- Rene Engelhard <rene@debian.org> Sat, 02 Jun 2018 12:14:04 +0200
+
+libreoffice (1:6.0.5~rc1-1) unstable; urgency=medium
+
+ * New upstream release candidate
+ - fixes crash on typing any character with IME in Wayland
+ (closes: #898632)
+ - allows rk on .gnupg/random_seed to fix hang on gpg encryption
+ (closes: #899380)
+
+ * debian/rules:
+ - optimize the build-indep build a bit more
+ + remove build-indep dependency on build-arch to not run the full
+ testsuite on -A (build-indep) builds.
+ Only run the odk "check" (SDK files) and build-example tests
+ + build without --enable-symbols on build-indep builds
+
+ -- Rene Engelhard <rene@debian.org> Thu, 31 May 2018 09:13:33 +0000
+
libreoffice (1:6.0.4-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 0e45803..cc28a4e 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
default-jdk (>= 1:1.6) [!hppa !mips64 !s390 !sparc],
default-jdk (>= 2:1.7-52.1) [kfreebsd-any],
default-jdk (>= 2:1.8-55) [sparc64],
+ default-jdk (>= 2:1.9) [i386],
default-libmysqlclient-dev,
dh-apparmor,
dh-python,
diff --git a/debian/libreoffice-kde.NEWS b/debian/libreoffice-kde.NEWS
index 03b1dd9..d6b1ec2 100644
--- a/debian/libreoffice-kde.NEWS
+++ b/debian/libreoffice-kde.NEWS
@@ -7,7 +7,7 @@ libreoffice (1:4.2.4~rc2-1) experimental; urgency=low
check for a Qt function - without that one the KDE File Picker is completey
flaky and will crash often (see e.g. #743221 and #742675).
- This effectively means the the KDE File Picker is still built and included
- in this package but de-facto disabled until Qt is fixed.
+ This effectively means the KDE File Picker is still built and included in
+ this package but de-facto disabled until Qt is fixed.
-- Rene Engelhard <rene@debian.org> Thu, 01 May 2014 12:42:05 +0200
diff --git a/debian/patches/apparmor-fixes.diff b/debian/patches/apparmor-fixes.diff
index e3c66a1..f77d5c6 100644
--- a/debian/patches/apparmor-fixes.diff
+++ b/debian/patches/apparmor-fixes.diff
@@ -38,3 +38,4 @@ index 4ee34d01c941..4392c757ed26 100644
/dev/null rw,
INSTDIR-program/uri-encode rmpux,
/usr/share/libreoffice/share/config/* r,
+
diff --git a/debian/patches/series b/debian/patches/series
index 13ab56b..bd2e8bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,8 +33,8 @@ disable-unused-test-programs.diff
sal-fix-kfreebsd-build.diff
apparmor-usrmerge.diff
revert-bd260a59cfdd050db3aa9a641ef0fa09efcedf5b.diff
-apparmor-complain.diff
apparmor-fixes.diff
+apparmor-complain.diff
appstream-ignore-startcenter.diff
bridges-exceptions-updates.diff
disable-java-in-odk-build-examples-on-zero-vm.diff
diff --git a/debian/rules b/debian/rules
index 8d3fe9f..a0d67a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,6 @@ include /usr/share/dpkg/architecture.mk
include /usr/share/dpkg/vendor.mk
DEB_VENDOR=Debian
SHELL:=/bin/bash
-export gb_SHELL:=$(SHELL)
#SYSTEM_GCC_VERSION = $(shell gcc --version | sed -n '/^gcc/s/.*\(.\..\)\..$$/\1/p')
#FIXME
@@ -75,7 +74,7 @@ lo_sources_ver=$(shell grep AC_INIT $(SOURCE_TREE)/configure.ac | grep documentf
# NOT in proper libreoffice-3-6 branch
# use ./g checkout -b tag-libreoffice-3.6.2.1 libreoffice-3.6.2.1
GIT_TAG=libreoffice-$(lo_sources_ver)
-GIT_BRANCH=libreoffice-6-0-4
+GIT_BRANCH=libreoffice-6-0-5
endif
ifeq "$(USE_SOURCE_TARBALLS)" "y"
lo_sources_ver=$(shell cat $(CURDIR)/sources.ver | cut -d= -f2)
@@ -213,7 +212,6 @@ BUILD_DBGSYM_PACKAGES=y
ifeq "$(DEB_HOST_ARCH)" "amd64"
USE_DWZ=y
DWZ_ARGS:=-L 100000000
-USE_DWZ_MULTIFILE=n
endif
endif
SYSTEM_STUFF += xmlsec
@@ -225,8 +223,10 @@ ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
BUILD_TEST_PACKAGE=y
endif
+ifneq ($(MAKECMDGOALS),build-indep)
ENABLE_SYMBOLS=y
SMALL_SYMBOLS=y
+endif
ifeq "$(ENABLE_JAVA)" "y"
SYSTEM_STUFF += beanshell
@@ -636,11 +636,6 @@ DH_STRIP_DBG_OPTION_URE += --no-automatic-dbgsym
DH_STRIP_DBG_OPTION_UNO_LIBS3 += --no-automatic-dbgsym
endif
-ifeq "$(USE_DWZ_MULTIFILE)" "y"
-DWZ_ARGS += -m debian/$(UNO_LIBS_DBG_ROOT)/usr/lib/debug/.dwz/$(DEB_SOURCE)-$(DEB_VERSION).$(DEB_HOST_ARCH) \
- -M /usr/lib/debug/.dwz/$(DEB_SOURCE)-$(DEB_VERSION).$(DEB_HOST_ARCH)
-endif
-
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
CC_PREFIX:=$(shell gcc -dumpmachine)-
@@ -809,10 +804,12 @@ ifeq (noopt,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CONFIGURE_FLAGS += --disable-optimized
endif
+ifeq "$(ENABLE_PYTHON)" "y"
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())')
+endif
BUILD_DEPS += , $(PYTHON)
ifeq "$(ENABLE_PYTHON)" "y"
@@ -925,7 +922,16 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(JDK)" "default"
BUILD_DEPS += , java-common (>= 0.49)
JAVA_HOME=/usr/lib/jvm/default-java
- BUILD_DEPS += , default-jdk (>= 1:1.6) $(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))
+ ifneq "$(STRETCH_BACKPORT)" "y"
+ BUILD_DEPS += , default-jdk (>= 1:1.6) $(shell echo "$(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))" | sed -e "s/\]/ !i386]/")
+ else
+ BUILD_DEPS += , default-jdk (>= 1:1.6) $(shell echo "$(filter-out !ia64,$(OOO_NO_JAVA_ARCHS))")
+ endif
+ ifneq "$(STRETCH_BACKPORT)" "y"
+ ifeq (i386,$(findstring i386,$(OOO_JAVA_ARCHS)))
+ BUILD_DEPS += , default-jdk (>= 2:1.9) [i386]
+ endif
+ endif
ifneq (,$(findstring ia64,$(OOO_JAVA_ARCHS)))
BUILD_DEPS += , default-jdk (>= 1:1.7-48) [ia64]
endif
@@ -957,6 +963,10 @@ ifeq "$(ENABLE_JAVA)" "y"
else
BUILD_DEPS += , ant (>= 1.6.5)$(OOO_NO_JAVA_ARCHS)
endif
+ # force Java with #876069 (9) and #882436 (8) fixed on i386
+ ifeq "$(DEB_HOST_ARCH)" "i386"
+ JAVA_RUNTIME_DEPENDS := openjdk-8-jre (>= 8u151-b12-2~) | openjdk-9-jre (>= 9.0.1+11-1~)
+ else
JAVA_RUNTIME_DEPENDS = default-jre
ifneq (,$(filter $(DEB_HOST_ARCH), $(OOO_OPENJDK_ARCHS)))
ifneq "$(DEB_HOST_ARCH)" "ia64"
@@ -971,6 +981,7 @@ ifeq "$(ENABLE_JAVA)" "y"
JAVA_RUNTIME_DEPENDS += | java6-runtime
# Suns Java "packages"
JAVA_RUNTIME_DEPENDS += | jre
+ endif
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
JAVA_COMMON_DEPENDS= , libreoffice-java-common
@@ -1331,6 +1342,10 @@ else
CONFIGURE_FLAGS += --enable-python=system
endif
+ifneq "$(PACKAGE_LIBRELOGO)" "y"
+ DEBHELPER_OPTIONS+= -Nlibreoffice-librelogo
+endif
+
ifeq "$(ENABLE_JAVA)" "y"
ifneq (,$(filter hsqldb, $(SYSTEM_STUFF)))
BUILD_DEPS += , libhsqldb1.8.0-java $(HSQLDB_MINVER)$(OOO_NO_JAVA_ARCHS), libarchive-zip-perl$(OOO_NO_JAVA_ARCHS)
@@ -1910,14 +1925,14 @@ endif
touch $@
-build-indep: $(STAMP_DIR)/prepare $(STAMP_DIR)/build-arch $(STAMP_DIR)/build-indep
+build-indep: $(STAMP_DIR)/prepare $(STAMP_DIR)/build-indep
$(STAMP_DIR)/build-indep:
dh_testdir
ifeq "$(PACKAGE_SDK)" "y"
- $(MAKE) odk.clean
+ if [ -f Makefile ]; then $(MAKE) odk.clean; fi
endif
- $(MAKE) scp2.clean
+ if [ -f Makefile ]; then $(MAKE) scp2.clean; fi
rm -f config.status autogen.lastrun
@@ -1998,7 +2013,12 @@ ifneq (nocheck,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
# since the gb_SUPPRESS_CHECK stuff in build this isn't checked.
# probably should, so do it here manually.
$(IGNORE_MAKE_CHECK_FAILURES)cd odk && \
- $(MAKE) check
+ $(MAKE) CustomTarget_odk/check
+ ifeq ($(MAKECMDGOALS),build-indep)
+ # was already checked in check
+ $(IGNORE_MAKE_CHECK_FAILURES)cd odk && \
+ $(MAKE) CustomTarget_odk/build-examples
+ endif
endif
endif
@@ -3218,8 +3238,10 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
done
dh_installchangelogs -a -XChangeLog -k
dh_installmime -a
+ifeq "$(ENABLE_PYTHON)" "y"
dh_python3 -ppython3-uno --no-ext-rename --no-guessing-deps
dh_python3 -ppython3-uno --no-ext-rename --no-guessing-deps $(OODIR)/program
+endif
dh_lintian -a
dh_bugfiles -a -A
dh_link -a
@@ -3227,14 +3249,7 @@ ifeq "$(BUILD_DBGSYM_PACKAGES)" "y"
rm -rf debian/$(UNO_LIBS_DBG_ROOT) debian/$(URE_DBG_ROOT) debian/$(CORE_DBG_ROOT) \
debian/$(WRITER_DBG_ROOT)
ifeq "$(USE_DWZ)" "y"
- ifeq "$(USE_DWZ_MULTIFILE)" "y"
- mkdir -p debian/$(UNO_LIBS_DBG_ROOT)/usr/lib/debug/.dwz
- # dh_dwz goes over each package. and -m overwrites the file. so we only
- # get the base-core one... Run dwz manually on what dh_dwz would do.
- dwz $(DWZ_ARGS) `dh_dwz -a -v --no-act | sed -e "s,^.*dwz -q -- ,," | xargs`
- else
dh_dwz -a -- $(DWZ_ARGS)
- endif
endif
dh_strip -a -Nure -Nuno-libs3 $(DH_STRIP_DBG_OPTION_LO)
dh_strip -pure $(DH_STRIP_DBG_OPTION_URE)