[libreoffice] 01/01: Merge remote-tracking branch 'origin/debian-experimental-5.1' 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 d190267918440aaf9ee16d7f9d4b14f3f63a45b5
Merge: b7e3447 da95373
Author: Rene Engelhard <rene@debian.org>
Date: Fri Apr 8 08:00:09 2016 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.1' into debian-experimental-5.2
Conflicts:
patches/liborcus-0.11.diff
rules
tests/control
changelog | 12 +++++++++++-
control | 2 +-
libreoffice-gtk3.maintscript | 1 +
patches/series | 1 -
rules | 2 --
tests/sdk-examples | 18 +++++++++++-------
6 files changed, 24 insertions(+), 12 deletions(-)
diff --cc control
index cc9c8ae,af21144..f082dfa
--- a/control
+++ b/control
@@@ -4384,18 -4380,6 +4384,18 @@@ Description: office productivity suite
.
It also contains the gengal and ui-previewer utilities.
+Package: libreoffice-dev-common
+Section: devel
+Architecture: all
+Replaces: libreoffice-dev (<< 1:5.2.0~)
+Breaks: libreoffice-dev (<< 1:5.2.0~)
+Description: office productivity suite -- SDK -- architecture-independent parts
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
- This package contains the (architecture-independent) files needed to build
++ This package contains the (architecture-independent) files needed to build
+ plugins/add-ons for LibreOffice (includes, IDL files, ...)
+
Package: libreoffice-dev-doc
Section: doc
Architecture: all
diff --cc patches/series
index 2f5bbb0,60ef4dd..e43f183
--- a/patches/series
+++ b/patches/series
@@@ -28,6 -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
GCC-6-PR69273-workaround.diff
-bash-completion-dir.diff
-OPENCL_DLL_NAME.diff
no-packagekit-per-default.diff
--liborcus-0.11.diff
diff --cc rules
index 3b852c8,464f67b..b511625
--- a/rules
+++ b/rules
@@@ -692,8 -692,8 +692,6 @@@ ifeq "$(shell dpkg-parsechangelog | gre
BUILD_DBG_PACKAGE=y
BUILD_DDEBS=n
PYTHON_SIX_RECOMMENDS = python-six
-- MDDS_VER := 0.1
-- LIBORCUS_MINVER :=
endif
ifeq "$(shell dpkg-parsechangelog | grep Distribution | awk '{ print $$2 }')" "UNRELEASED"
BUGS=mailto:debian-openoffice@lists.debian.org
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: