[libreoffice] 03/10: install SDK documentation into /usr/share/doc/libreoffice/sdk (and adapt dev-docs api/ symlink) (closes: #854576)

[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 b5821d1eaecf8c9bd3589ab948de0cc98758cffd
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 13 11:44:28 2017 +0100

    install SDK documentation into /usr/share/doc/libreoffice/sdk (and adapt dev-docs api/ symlink) (closes: #854576)
---
 changelog                 | 10 ++++++++++
 control                   |  2 +-
 control.sdk.in            |  2 +-
 libreoffice-dev-doc.links |  2 +-
 rules                     |  8 ++++----
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/changelog b/changelog
index fab9a6a..c39d972 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,13 @@
+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).
+    (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
+
 libreoffice (1:5.2.5-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/control b/control
index 3a70dc8..8b38304 100644
--- a/control
+++ b/control
@@ -4373,7 +4373,7 @@ Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
 Suggests: libmythes-dev, libreoffice-dev-doc, libreofficekit-dev
 Replaces: libreoffice-common (<< 1:4.1.0~beta1),
           libreoffice-core (<< 1:4.1.0~beta1)
-Conflicts: libreoffice-dev-doc (<= 1:5.0.3~rc1-2)
+Conflicts: libreoffice-dev-doc (<< 1:5.2.5-2~)
 Description: office productivity suite -- SDK -- architecture-dependent parts
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.sdk.in b/control.sdk.in
index 4a10971..1ea6bcc 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -10,7 +10,7 @@ Depends: libreoffice-core (= ${binary:Version}),
 Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
 Suggests: libmythes-dev, libreofficekit-dev, libreoffice-dev-doc
 Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1)
-Conflicts: libreoffice-dev-doc (<= 1:5.0.3~rc1-2)
+Conflicts: libreoffice-dev-doc (<< 1:5.2.5-2~)
 Description: office productivity suite -- SDK -- architecture-dependent parts
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/libreoffice-dev-doc.links b/libreoffice-dev-doc.links
index 1d0f42f..7e6fd17 100644
--- a/libreoffice-dev-doc.links
+++ b/libreoffice-dev-doc.links
@@ -1 +1 @@
-usr/share/doc/libreoffice-dev/sdk/docs usr/share/doc/libreoffice-dev-doc/api
+usr/share/doc/libreoffice/sdk/docs usr/share/doc/libreoffice-dev-doc/api
diff --git a/rules b/rules
index f0d1af7..31fe097 100755
--- a/rules
+++ b/rules
@@ -2346,17 +2346,17 @@ endif
  ifeq "$(PACKAGE_SDK_DOCS)" "y"
 	# move SDK documentation into own package
 	rm -rf $(PKGDIR)-dev-doc
-	mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev
+	mkdir -p $(PKGDIR)-dev-doc/usr/share/doc/libreoffice
 	mv $(PKGDIR)-dev/usr/share/doc/libreoffice/sdk \
-		$(PKGDIR)-dev-doc/usr/share/doc/libreoffice-dev
+		$(PKGDIR)-dev-doc/usr/share/doc/libreoffice
 	mkdir -p $(PKGDIR)-dev-doc/$(OOSDKDIR)
-	ln -sf /usr/share/doc/libreoffice-dev/sdk/docs \
+	ln -sf /usr/share/doc/libreoffice/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-common/$(OOSDKDIR) && \
-		ln -sf /usr/share/doc/libreoffice-dev/sdk/index.html
+		ln -sf /usr/share/doc/libreoffice/sdk/index.html
   endif
 
 ifeq "$(PACKAGE_SDK)" "y"

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