[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.2
in repository libreoffice.
commit 11d46eda0972cc78d545be802dc4ee137e19c4df
Merge: 54f3ea4 e37c819
Author: Rene Engelhard <rene@debian.org>
Date: Wed May 4 23:05:23 2016 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.2
Conflicts:
changelog
control
patches/series
rules
changelog | 11 +++++++++-
control | 28 +++++++++++++-------------
patches/series | 1 +
patches/zh-l10n-names.diff | 15 ++++++++++++++
rules | 50 ++++++++++++++++++++++++++--------------------
5 files changed, 68 insertions(+), 37 deletions(-)
diff --cc changelog
index 48b28a3,db8fc2a..d2af3cd
--- a/changelog
+++ b/changelog
@@@ -1,32 -1,20 +1,41 @@@
-libreoffice (1:5.1.3~rc1-2) UNRELEASED; urgency=medium
+libreoffice (1:5.2.0~alpha1-2) UNRELEASED; urgency=medium
+ * debian/patches/zh-l10n-names.diff: update zh-* in lo-xlate-lang
+ zh-CN:chinese_simplified -> zh-CN:chinese_china
+ zh-TW:chinese_traditional -> zh-TW:chinese_taiwan
+ (closes: #823429)
+
* debian/rules:
- print error in control without gcj-jdk installed
- don't try to run set GCJ_JAWT_DEPENDS if GCJ_VERSION is unset
+ - add initial build profile support: nodoc and nocheck
+ - disable the tests on kfreebsd-* (see #801865),
+ - move hardcoded (!)kfreebsd-i386 (!)kfreebsd-amd64 to (!)kfreebsd-any.
+ Use linux-any instead of just disabling it for kfreebsd for
+ libbbluetooth-dev B-D; reflects the sense better
- -- Rene Engelhard <rene@debian.org> Tue, 26 Apr 2016 21:33:47 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 03 May 2016 00:01:09 +0200
+libreoffice (1:5.2.0~alpha1-1) experimental; urgency=medium
+
+ * New upstream alpha release
+ - fixes SVG t(ext s)pan import (closes: #665094)
+
+ * debian/rules, debian/control.gtk3.in, debian/*.links: move
+ liblibreofficekitgtk.so into an own package, as we have
+ libreofficekit-{dev,data} anyway. Make liblibreofficekitgtk depend on
+ libreofficekit-data
+ * debian/rules, debian/control.in, debian/libreoffice-gtk.*: rename -gtk
+ to -gtk2
+ * debian/control.sdk.in, debian/rules: move arch-indep SDK stuff into new
+ -dev-common. Move g++-mingw-w64-i686 to BUILD_DEPS_INDEP and only try to
+ (re)build unowinreg.dll in build-indep. Remove arch-qualifiers.
+ * debian/uno-libs3.symbols: update
+ * debian/tests/control.in, debian/tests/sdk-examples: remove unowinreg.dll
+ special-casing, we now have unowinreg.dll in a Arch: all. Depend on that.
+
+ -- Rene Engelhard <rene@debian.org> Thu, 21 Apr 2016 22:26:49 +0200
+
libreoffice (1:5.1.3~rc1-1) unstable; urgency=medium
* New upstream release candidate
diff --cc control
index 8687bee,9288e74..834cd0b
--- a/control
+++ b/control
@@@ -30,7 -30,8 +30,7 @@@ Build-Depends: ant (>= 1.7.0) [!mips64]
gcc-5 [hppa ia64 s390 sparc],
gcj-jdk [hppa ia64 s390 sparc],
gcj-native-helper [hppa ia64 s390 sparc],
- gdb <!nocheck>,
- gdb [!kfreebsd-any],
++ gdb [!kfreebsd-any] <!nocheck>,
gettext,
gobject-introspection (>= 1.32.0),
gperf,
@@@ -186,9 -187,9 +186,9 @@@ Build-Conflicts: amd-libopencl1
nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
-Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.2
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-openoffice/libreoffice.git
--Bugs:
++Bugs: mailto:debian-openoffice@lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
diff --cc patches/series
index d75739c,3726b69..feb47ec
--- a/patches/series
+++ b/patches/series
@@@ -28,4 -29,10 +28,5 @@@ hppa-is-32bit.dif
gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
debian-branding.diff
-disable-npapi-plugin-support.diff
-gcc-6.diff
-bash-completion-dir.diff
-OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
-liborcus-0.11.diff
+ zh-l10n-names.diff
diff --cc rules
index d87e001,a205798..83520d2
--- a/rules
+++ b/rules
@@@ -926,12 -930,12 +930,12 @@@ ifneq (,$(filter cppunit, $(SYSTEM_STUF
BUILD_DEPS += , libcppunit-dev (>= $(CPPUNIT_MINVER))
endif
ifeq "$(RUN_MAKE_CHECK)" "y"
- BUILD_DEPS += , gdb <!nocheck>
- BUILD_DEPS += , gdb [!kfreebsd-any]
- BUILD_DEPS += , fontconfig
- BUILD_DEPS += , fonts-liberation
- BUILD_DEPS += , fonts-crosextra-carlito
++ BUILD_DEPS += , gdb [!kfreebsd-any] <!nocheck>
+ BUILD_DEPS += , fontconfig <!nocheck>
+ BUILD_DEPS += , fonts-liberation <!nocheck>
+ BUILD_DEPS += , fonts-crosextra-carlito <!nocheck>
ifeq "$(ENABLE_JUNIT4)" "y"
- BUILD_DEPS += , junit4 $(JUNIT_MIN_VER) <!nocheck>
+ BUILD_DEPS += , junit4 $(JUNIT_MIN_VER) [!kfreebsd-any]
else
CONFIGURE_FLAGS += --without-junit
endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: