This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit b2826a488d38540969ce2ac96637e9939f854bbc
Author: Rene Engelhard <r...@debian.org>
Date: Tue Mar 15 18:28:01 2016 +0100
fix doc-base for new doc path since last upload...
---
changelog | 2 ++
lo-cpp-ref.in | 2 +-
lo-java-ref.in | 2 +-
rules | 6 +++---
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/changelog b/changelog
index 90827b7..4f8098d 100644
--- a/changelog
+++ b/changelog
@@ -10,6 +10,8 @@ libreoffice (1:5.1.1-2) UNRELEASED; urgency=medium
- don't hardcode python3-six in -dbgsyms Recommends
* debian/bug-presubj: point to TDF-bugzilla and LOs BT/strace instructions;
minor wording fixes
+ * debian/lo-{cpp,java}-ref.in, debian/rules: fix doc-base for new doc path
+ since last upload...
-- Rene Engelhard <r...@debian.org> Sun, 13 Mar 2016 21:18:55 +0100
diff --git a/lo-cpp-ref.in b/lo-cpp-ref.in
index 429c57a..943eb97 100644
--- a/lo-cpp-ref.in
+++ b/lo-cpp-ref.in
@@ -4,4 +4,4 @@ Author: The Document Foundation
Section: Programming
Format: HTML
-Index: /usr/share/doc/libreoffice-dev/docs/cpp/ref/index.html
+Index: /usr/share/doc/libreoffice-dev/sdk/docs/cpp/ref/index.html
diff --git a/lo-java-ref.in b/lo-java-ref.in
index e1e00b2..3e924f4 100644
--- a/lo-java-ref.in
+++ b/lo-java-ref.in
@@ -4,4 +4,4 @@ Author: The Document Foundation
Section: Programming
Format: HTML
-Index: /usr/share/doc/libreoffice-dev/docs/java/ref/index.html
+Index: /usr/share/doc/libreoffice-dev/sdk/docs/java/ref/index.html
diff --git a/rules b/rules
index e0c89cb..036992c 100755
--- a/rules
+++ b/rules
@@ -3428,14 +3428,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/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-dev/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/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-dev/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/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-dev/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
