This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit ecbbe05aed12db330687bb7970186010c2097e9c Author: Rene Engelhard <[email protected]> Date: Sun Feb 28 13:08:51 2016 +0100 move install location of the SDK docs to /usr/share/doc/libreoffice-dev/sdk/docs --- changelog | 4 ++++ rules | 15 +++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/changelog b/changelog index 6df50bd..7fc8df5 100644 --- a/changelog +++ b/changelog @@ -8,6 +8,10 @@ libreoffice (1:5.1.1~rc2-1) UNRELEASED; urgency=medium --with-gdrive-client-{id,secret} properly (closes: #780253). Don't copy them but use chromiums ones directly, which makes this i386/amd64 only, but... + - move install location of the SDK docs to + /usr/share/doc/libreoffice-dev/sdk/docs as the old locations are + "burned". Also sdk/docs matches the upstream structure anyway. + (closes: #804317) * debian/scripts/get_libebook_dep.sh: fix to work with new multiarchified libebook * debian/control.sdk.in: remove broken and obsolete -dtd-officedocument1.0 diff --git a/rules b/rules index 3564071..5732ed7 100755 --- a/rules +++ b/rules @@ -2276,18 +2276,17 @@ endif ifeq "$(PACKAGE_SDK)" "y" # move SDK documentation into own package rm -rf $(PKGDIR)-dev-doc - mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev-doc - mv $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk/* \ - $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev-doc - rmdir $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk + mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev + mv $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk \ + $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev mkdir -p $(PKGDIR)-dev-doc/$(OOSDKDIR) - ln -sf /usr/share/doc/libreoffice-dev-doc/docs \ - $(PKGDIR)-dev/$(OOSDKDIR)/docs + ln -sf /usr/share/doc/libreoffice-dev/sdk/docs \ + $(PKGDIR)-dev-doc/$(OOSDKDIR)/docs mv $(PKGDIR)-dev/$(OOSDKDIR)/examples \ $(PKGDIR)-dev-doc/$(OOSDKDIR) # and fix the symlink now dangling due to the move above cd $(PKGDIR)-dev/$(OOSDKDIR) && \ - ln -sf /usr/share/doc/libreoffice-dev-doc/index.html + ln -sf /usr/share/doc/libreoffice-dev/sdk/index.html endif ifeq "$(ENABLE_EVO2)" "y" @@ -3044,7 +3043,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-doc/docs docs + ln -sf /usr/share/doc/libreoffice-dev/sdk/docs docs endif ifeq "$(ENABLE_JAVA)" "y" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
