[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.3

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-5.3
in repository libreoffice.

commit 019cb7e14cff6242d48abb6c9dc780b3177d9467
Merge: 26e5ec4 10974fa
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 13 20:01:08 2017 +0100

    Merge remote-tracking branch 'origin/master' into debian-experimental-5.3

 changelog                 |  9 +++++++++
 control                   |  7 +++++--
 control.sdk.in            |  5 +++--
 libreoffice-dev-doc.links |  2 +-
 lo-cpp-ref.in             |  2 +-
 lo-idl-ref.in             |  2 +-
 lo-java-ref.in            |  2 +-
 rules                     | 43 ++++++++++++++++++++++++++++++++-----------
 8 files changed, 53 insertions(+), 19 deletions(-)

diff --cc changelog
index cd29744,6d8fffe..03c1168
--- a/changelog
+++ b/changelog
@@@ -1,13 -1,23 +1,22 @@@
 -libreoffice (1:5.2.5-2) unstable; urgency=medium
 +libreoffice (1:5.3.0-2) UNRELEASED; urgency=medium
  
 -  * debian/libreoffice.maintscript: revert dir_to_symlink, add new
 -    symlink_to_dir for stretch/sid upgrades
 -  * debian/rules: ignore "libreoffice" for --link-doc
+   * debian/rules, debian/libreoffice-dev-doc.links, debian/lo*.in:
+     install SDK documentation into /usr/share/doc/libreoffice/sdk (and adapt
+     dev-docs symlinks/doc-base stuff). Remove extra license file (thanks
+     lintian) which otherwise would still install over the symlink.
+   * debian/control.sdk.in: update -devs libreoffice-dev-doc Conflicts to
+     (<< 1:5.2.5-2~) and add Conflicts: libreoffice (<< 1:5.2.5-2~) to both
+     -dev*- for safety
 -  (closes: #854576)
 -
 -  * debian/rules: fix dh_installdocs calls to install copyright for
 -    "libreoffice"
 +  * debian/rules:
 +    - enable mergelibs only on 64bit archs (and i386), ld goes to OOM on
 +      mips(el) for example...
 +    - allow build with gold (maybe for LTO?)
++    - ignore "libreoffice" for --link-doc
++    - fix dh_installdocs calls to install copyright for "libreoffice"
  
 - -- Rene Engelhard <rene at debian.org>  Mon, 13 Feb 2017 19:26:09 +0100
 + -- Rene Engelhard <rene at debian.org>  Thu, 02 Feb 2017 09:04:43 +0100
  
 -libreoffice (1:5.2.5-1) unstable; urgency=medium
 +libreoffice (1:5.3.0-1) experimental; urgency=medium
  
    * New upstream release
  
diff --cc rules
index 27bcc00,94f7a7f..cfdd30d
--- a/rules
+++ b/rules
@@@ -3156,9 -3250,13 +3176,10 @@@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/
  	# But how does it play with .symbols then?
  	# Also not for extensions, as they have an own version
  	# python3-uno has additional examples...
 -	dh_installdocs -a -A -Nure -Nuno-libs3 -Nure-dbg -Nuno-libs3-dbg \
 -		-Npython3-uno -Nlibreoffice-mysql-connector -Nlibreoffice \
 +	dh_installdocs -a -A -Nure -Nuno-libs3 \
- 		-Npython3-uno -Nlibreoffice-mysql-connector --link-doc=libreoffice-core
- 	dh_installdocs -pure -puno-libs3 -ppython3-uno -plibreoffice-mysql-connector
++		-Npython3-uno -Nlibreoffice-mysql-connector -Nlibreoffice }
+ 		--link-doc=libreoffice-core
+ 	dh_installdocs -pure -puno-libs3 -ppython3-uno -plibreoffice-mysql-connector -plibreoffice
 -ifeq "$(BUILD_DBG_PACKAGE)" "y"
 -	dh_installdocs -pure-dbg -puno-libs3-dbg
 -endif
  	cp workdir/CustomTarget/readlicense_oo/readme/README_en-US \
  		$(PKGDIR)-core/usr/share/doc/libreoffice-core/README
  	dh_installdebconf -a
@@@ -3397,15 -3523,14 +3418,15 @@@ ifeq "$(PACKAGE_SDK)" "y
  			| sed -e "s/@lo_sources_ver@/$(lo_sources_ver)/" \
  			> debian/libreoffice-dev-doc.doc-base.lo-$$i-ref; \
  	done
- 	UDK_CPP_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/sdk/docs/cpp/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
+ 	UDK_CPP_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice/sdk/docs/cpp/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
  	echo "Files: $$UDK_CPP_FILES" >> debian/libreoffice-dev-doc.doc-base.lo-cpp-ref
    ifeq "$(ENABLE_JAVA)" "y"
- 	UDK_JAVA_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/sdk/docs/java/ref ! -name "javadoc_log.txt" | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
 -	UDK_JAVA_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice/sdk/docs/java/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
++	UDK_JAVA_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice/sdk/docs/java/ref ! -name "javadoc_log.txt" | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
  	echo "Files: $$UDK_JAVA_FILES" >> debian/libreoffice-dev-doc.doc-base.lo-java-ref
 +	rm -f $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/sdk/docs/java/ref/javadoc_log.txt
    endif
  	# xargs strips the many files here so we need to post-process it.
- 	UDK_COMMON_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/sdk/docs/common/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
+ 	UDK_COMMON_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice/sdk/docs/common/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
  	TMP=`mktemp -q`; \
  	cp debian/libreoffice-dev-doc.doc-base.lo-idl-ref $$TMP; \
  	echo "Files: $$UDK_COMMON_FILES" >> $$TMP; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git