[libreoffice] 01/01: fix generating lo-idl-ref doc-base file

[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 08b1449f1465515f014dc0fbcfa43614d86da7a6
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Feb 18 10:15:56 2017 +0100

    fix generating lo-idl-ref doc-base file
---
 changelog     | 1 +
 lo-idl-ref.in | 2 +-
 rules         | 6 +++---
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/changelog b/changelog
index 7f7617f..3c5dfb6 100644
--- a/changelog
+++ b/changelog
@@ -17,6 +17,7 @@ libreoffice (1:5.3.0-2) UNRELEASED; urgency=medium
       /usr/share/java/unoil.jar to "dedup" it
     - run rdfind to get duplicated /usr/share/icons/gnome symlinked to
       hicolor if identical (closes: #835515); add rdlink/symlinks B-D-I
+    - fix generating lo-idl-ref doc-base file
   * debian/control.in, debian/rules, debian/scripts/cleandupes: remove unused
     fdupes B-D-I and commented-out usage
 
diff --git a/lo-idl-ref.in b/lo-idl-ref.in
index 5954ea9..3c9a812 100644
--- a/lo-idl-ref.in
+++ b/lo-idl-ref.in
@@ -1,5 +1,5 @@
 Document: lo-idl-ref
-Title: LibreOffice @lo_sources_ver@ IDL Reference
+Title: LibreOffice @lo_sources_ver@ SDK API Reference
 Author: The Document Foundation
 Section: Programming
 
diff --git a/rules b/rules
index 100aabc..35f479d 100755
--- a/rules
+++ b/rules
@@ -3396,7 +3396,7 @@ endif
 	done
 
 ifeq "$(PACKAGE_SDK)" "y"
-	for i in common cpp java; do \
+	for i in idl cpp java; do \
 		cat debian/lo-$$i-ref.in \
 			| sed -e "s/@lo_sources_ver@/$(lo_sources_ver)/" \
 			> debian/libreoffice-dev-doc.doc-base.lo-$$i-ref; \
@@ -3409,10 +3409,10 @@ ifeq "$(PACKAGE_SDK)" "y"
 	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/sdk/docs/common/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
+	UDK_IDL_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice/sdk/docs/idl/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; \
+	echo "Files: $$UDK_IDL_FILES" >> $$TMP; \
 	cat $$TMP | perl -e 'while(<>) { if (/^Files/) {$$f=1;} if ($$f eq "1") { chomp(); } print $$_; }' > debian/libreoffice-dev-doc.doc-base.lo-idl-ref; \
 	rm -f $$TMP
 	# no idea why this happens; afais this can't come from above

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