[libreoffice] 09/10: more doc fixes; revert dir_to_symlink, add new symlink_to_dir; add some Conflicts: for safety

[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 c017254e4cff491b57a5b9b135a2d70500582a29
Author: Rene Engelhard <rene at debian.org>
Date:   Mon Feb 13 19:24:16 2017 +0100

    more doc fixes; revert dir_to_symlink, add new symlink_to_dir; add some Conflicts: for safety
---
 changelog               | 11 ++++++++---
 control                 |  7 +++++--
 control.sdk.in          |  5 +++--
 libreoffice.maintscript |  2 +-
 rules                   |  3 ++-
 5 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/changelog b/changelog
index b8ca394..427ed9c 100644
--- a/changelog
+++ b/changelog
@@ -1,11 +1,16 @@
 libreoffice (1:5.2.5-2) unstable; urgency=medium
 
+  * debian/libreoffice.maintscript: revert dir_to_symlink, add new
+    symlink_to_dir for stretch/sid upgrades
+  * debian/rules: ignore "libreoffice" for --link-doc
   * debian/rules, debian/libreoffice-dev-doc.links, debian/lo*.in:
     install SDK documentation into /usr/share/doc/libreoffice/sdk (and adapt
-    dev-docs symlinks/doc-base stuff). (closes: #854576). Remove extra license
-    file (thanks lintian) which otherwise would still install over the symlink.
+    dev-docs symlinks/doc-base stuff). Remove extra license file (thanks
+    lintian) which otherwise would still install over the symlink.
   * debian/control.sdk.in: update -devs libreoffice-dev-doc Conflicts to
-    (<< 1:5.2.5-2~)
+    (<< 1:5.2.5-2~) and add Conflicts: libreoffice (<< 1:5.2.5-2~) to both
+    -dev*- for safety
+  (closes: #854576)
 
  -- Rene Engelhard <rene at debian.org>  Mon, 13 Feb 2017 13:20:28 +0100
 
diff --git a/control b/control
index 8b38304..ccd8aa8 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.2.5-2~)
+Conflicts: libreoffice (<< 1:5.2.5-2~), 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.
@@ -4390,6 +4390,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Replaces: libreoffice-dev (<< 1:5.2.0~)
 Breaks: libreoffice-dev (<< 1:5.2.0~)
+Conflicts: libreoffice (<< 1:5.2.5-2~)
 Description: office productivity suite -- SDK -- architecture-independent parts
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -4402,7 +4403,9 @@ Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: libreoffice-dev (= ${binary:Version}), www-browser
-Conflicts: libreoffice-dev (<= 1:5.0.3~rc1-2), openoffice.org-dev-doc
+Conflicts: libreoffice (<< 1:5.2.5-2~),
+           libreoffice-dev (<= 1:5.0.3~rc1-2),
+           openoffice.org-dev-doc
 Description: office productivity suite -- SDK documentation
  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 1ea6bcc..aa64eb0 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.2.5-2~)
+Conflicts: libreoffice-dev-doc (<< 1:5.2.5-2~), libreoffice (<< 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.
@@ -27,6 +27,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Replaces: libreoffice-dev (<< 1:5.2.0~)
 Breaks: libreoffice-dev (<< 1:5.2.0~)
+Conflicts: libreoffice (<< 1:5.2.5-2~)
 Description: office productivity suite -- SDK -- architecture-independent parts
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -40,7 +41,7 @@ Architecture: all
 Depends: ${misc:Depends}
 Recommends: libreoffice-dev (= ${binary:Version}),
             www-browser
-Conflicts: openoffice.org-dev-doc, libreoffice-dev (<= 1:5.0.3~rc1-2)
+Conflicts: openoffice.org-dev-doc, libreoffice-dev (<= 1:5.0.3~rc1-2), libreoffice (<< 1:5.2.5-2~)
 Description: office productivity suite -- SDK documentation
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff --git a/libreoffice.maintscript b/libreoffice.maintscript
index 4319d1f..1f4849f 100644
--- a/libreoffice.maintscript
+++ b/libreoffice.maintscript
@@ -1 +1 @@
-dir_to_symlink /usr/share/doc/libreoffice /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE
+symlink_to_dir /usr/share/doc/libreoffice /usr/share/doc/libreoffice-core 1:5.2.5-2~ $DPKG_MAINTSCRIPT_PACKAGE
diff --git a/rules b/rules
index 278b611..1883825 100755
--- a/rules
+++ b/rules
@@ -3251,7 +3251,8 @@ $(STAMP_DIR)/binary-arch: $(STAMP_DIR)/install-arch debian/control $(STAMP_DIR)/
 	# Also not for extensions, as they have an own version
 	# python3-uno has additional examples...
 	dh_installdocs -a -A -Nure -Nuno-libs3 -Nure-dbg -Nuno-libs3-dbg \
-		-Npython3-uno -Nlibreoffice-mysql-connector --link-doc=libreoffice-core
+		-Npython3-uno -Nlibreoffice-mysql-connector -Nlibreoffice \
+		--link-doc=libreoffice-core
 	dh_installdocs -pure -puno-libs3 -ppython3-uno -plibreoffice-mysql-connector
 ifeq "$(BUILD_DBG_PACKAGE)" "y"
 	dh_installdocs -pure-dbg -puno-libs3-dbg

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