[libreoffice] 01/10: debian/libreoffice-dev.maintscript, debian/libreoffice-dev.p*.in: fix -dev(-doc) upgrade from jessie (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 fbca28c6af86d0d3d9de51682cbfea82267ac2b3
Author: Rene Engelhard <rene at debian.org>
Date:   Sat Feb 11 16:00:26 2017 +0100

    debian/libreoffice-dev.maintscript, debian/libreoffice-dev.p*.in: fix -dev(-doc) upgrade from jessie (closes: #854576)
---
 changelog                   | 12 ++++++++++++
 control                     |  3 ++-
 control.sdk.in              |  3 ++-
 libreoffice-dev.maintscript |  1 -
 libreoffice-dev.postinst.in |  5 +++++
 libreoffice-dev.postrm.in   |  5 +++++
 libreoffice-dev.preinst.in  | 15 +++++++++++++++
 libreoffice-dev.prerm.in    |  5 +++++
 8 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/changelog b/changelog
index fab9a6a..58f6676 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+libreoffice (1:5.2.5-2) UNRELEASED; urgency=medium
+
+  * debian/libreoffice-dev.maintscript, debian/libreoffice-dev.p*.in:
+    remove .maintscript. expand into the generated maintainer scripts and
+    rm -rf /usr/share/doc/libreoffice-dev in preinst to avoid
+    dpkg-maintscript-helper expecting files not being there (and fix the upgrade
+    anyway to not loose files) (closes: #854576)
+  * debian/control.sdk.in: update libreoffice-dev-doc Conflicts:, add Breaks:
+    for being safe, too
+
+ -- Rene Engelhard <rene at debian.org>  Sat, 11 Feb 2017 16:01:34 +010
+
 libreoffice (1:5.2.5-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/control b/control
index 3a70dc8..2d8a351 100644
--- a/control
+++ b/control
@@ -4373,7 +4373,8 @@ 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.1.1~rc3-1)
+Breaks: libreoffice-dev-doc (<< 1:5.1.1~rc3-1)
 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..594c64f 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -10,7 +10,8 @@ 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.1.1~rc3-1)
+Breaks: libreoffice-dev-doc (<< 1:5.1.1~rc3-1)
 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.maintscript b/libreoffice-dev.maintscript
deleted file mode 100644
index f052d3a..0000000
--- a/libreoffice-dev.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/libreoffice-dev /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE
diff --git a/libreoffice-dev.postinst.in b/libreoffice-dev.postinst.in
new file mode 100755
index 0000000..5c4feb0
--- /dev/null
+++ b/libreoffice-dev.postinst.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+# Automatically added by dh_installdeb
+dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libreoffice-dev /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE -- "$@"
+# End automatically added section
diff --git a/libreoffice-dev.postrm.in b/libreoffice-dev.postrm.in
new file mode 100755
index 0000000..5c4feb0
--- /dev/null
+++ b/libreoffice-dev.postrm.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+# Automatically added by dh_installdeb
+dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libreoffice-dev /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE -- "$@"
+# End automatically added section
diff --git a/libreoffice-dev.preinst.in b/libreoffice-dev.preinst.in
new file mode 100755
index 0000000..9a5c624
--- /dev/null
+++ b/libreoffice-dev.preinst.in
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+if [ "$1" = "upgrade" ] && dpkg --compare-versions $2 lt "1:5.1.1~rc3-1"; then
+	# remove old SDK docs whch will confuse dpkg-maintscript-helper.
+	# should be unpacked by the new -dev-doc unpack phase anyway.
+#	rm -rf /usr/share/doc/libreoffice-dev/api
+#	rm -rf /usr/share/doc/libreoffice-dev/docs
+#	rm -rf /usr/share/doc/libreoffice-dev/examples
+#	rm -rf /usr/share/doc/libreoffice-dev/index.html
+	rm -rf /usr/share/doc/libreoffice-dev
+
+	# (Originally/Normally) Automatically added by dh_installdeb
+	dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libreoffice-dev /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE -- "$@"
+	# End automatically added section
+fi
diff --git a/libreoffice-dev.prerm.in b/libreoffice-dev.prerm.in
new file mode 100755
index 0000000..5c4feb0
--- /dev/null
+++ b/libreoffice-dev.prerm.in
@@ -0,0 +1,5 @@
+#!/bin/sh
+set -e
+# Automatically added by dh_installdeb
+dpkg-maintscript-helper dir_to_symlink /usr/share/doc/libreoffice-dev /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE -- "$@"
+# End automatically added section

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