[libreoffice] 04/10: more path changes for SDK docs move

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libreoffice.

commit 65bd1190c66f472edc815f567c4207c9b72f8e6a
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 13 12:42:38 2017 +0100

    more path changes for SDK docs move
---
 changelog | 4 ++--
 rules     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/changelog b/changelog
index c39d972..6833c33 100644
--- a/changelog
+++ b/changelog
@@ -1,12 +1,12 @@
 libreoffice (1:5.2.5-2) unstable; urgency=medium
 
   * debian/rules, debian/libreoffice-dev-doc.links: install SDK documentation
-    into /usr/share/doc/libreoffice/sdk (and adapt dev-docs api/ symlink).
+    into /usr/share/doc/libreoffice/sdk (and adapt dev-docs symlinks/doc-base).
     (closes: #854576)
   * debian/control.sdk.in: update -devs libreoffice-dev-doc Conflicts to
     (<< 1:5.2.5-2~)
 
- -- Rene Engelhard <rene at debian.org>  Sun, 12 Feb 2017 19:11:22 +0100
+ -- Rene Engelhard <rene at debian.org>  Mon, 13 Feb 2017 12:41:33 +0100
 
 libreoffice (1:5.2.5-1) unstable; urgency=medium
 
diff --git a/rules b/rules
index 31fe097..ff8fd8c 100755
--- a/rules
+++ b/rules
@@ -3123,7 +3123,7 @@ ifeq "$(PACKAGE_SDK)" "y"
 	# add symlinks for docs and examples
 	cd $(PKGDIR)-dev-doc/$(OOSDKDIR) && \
 		rm -rf docs && \
-		ln -sf /usr/share/doc/libreoffice-dev/sdk/docs docs
+		ln -sf /usr/share/doc/libreoffice/sdk/docs docs
 endif
 
 ifeq "$(ENABLE_JAVA)" "y"
@@ -3521,14 +3521,14 @@ 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 | 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`; \
 	echo "Files: $$UDK_JAVA_FILES" >> debian/libreoffice-dev-doc.doc-base.lo-java-ref
   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