[libreoffice] 02/10: Revert "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 83fb71594a7416959a06df970dc36781178e6e41
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Feb 12 19:09:46 2017 +0100

    Revert "debian/libreoffice-dev.maintscript, debian/libreoffice-dev.p*.in: fix -dev(-doc) upgrade from jessie (closes: #854576)"
    
    This reverts commit fbca28c6af86d0d3d9de51682cbfea82267ac2b3.
---
 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, 3 insertions(+), 46 deletions(-)

diff --git a/changelog b/changelog
index 58f6676..fab9a6a 100644
--- a/changelog
+++ b/changelog
@@ -1,15 +1,3 @@
-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 2d8a351..3a70dc8 100644
--- a/control
+++ b/control
@@ -4373,8 +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.1.1~rc3-1)
-Breaks: libreoffice-dev-doc (<< 1:5.1.1~rc3-1)
+Conflicts: libreoffice-dev-doc (<= 1:5.0.3~rc1-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 594c64f..4a10971 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -10,8 +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.1.1~rc3-1)
-Breaks: libreoffice-dev-doc (<< 1:5.1.1~rc3-1)
+Conflicts: libreoffice-dev-doc (<= 1:5.0.3~rc1-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.maintscript b/libreoffice-dev.maintscript
new file mode 100644
index 0000000..f052d3a
--- /dev/null
+++ b/libreoffice-dev.maintscript
@@ -0,0 +1 @@
+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
deleted file mode 100755
index 5c4feb0..0000000
--- a/libreoffice-dev.postinst.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/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
deleted file mode 100755
index 5c4feb0..0000000
--- a/libreoffice-dev.postrm.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/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
deleted file mode 100755
index 9a5c624..0000000
--- a/libreoffice-dev.preinst.in
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/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
deleted file mode 100755
index 5c4feb0..0000000
--- a/libreoffice-dev.prerm.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/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