[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#854890: unblock: pre-approval for libreoffice/5.2.5-2



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please pre-approve package libreoffice

Reason is https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854576.

Given there was some mess about the file location the following looks like the
most sane (if admittedly extremely hackish) way to get out of it. Unless
someone comes up with a better one...

Reading the policy (unpack phase) got me to the idea of completely getting rid
of the directory in preinst (preinst upgrade being the first thing ran).

The unpack of -dev-doc later will then restore the proper contents.

This works, given -dev-doc is removed anyway before -dev install (due
to the Conflicts:) and installed afterwards again.

I tried to do it as non-intrusive if possible. Maybe it would even make
sense to remove the .maintscript stuff at all as there's nothing to migrate
anymore basically, but I didn't do it. If you prefer me doing that I can do
that, though.

Current debdiff attached.

unblock libreoffice/5.2.5-2

-- System Information:
Debian Release: 8.7
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: armhf (armv7l)

Kernel: Linux 3.18.0-trunk-rpi2 (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru libreoffice-5.2.5/debian/changelog libreoffice-5.2.5/debian/changelog
--- libreoffice-5.2.5/debian/changelog	2017-01-12 07:57:25.000000000 +0100
+++ libreoffice-5.2.5/debian/changelog	2017-02-11 16:01:34.000000000 +0100
@@ -1,3 +1,15 @@
+libreoffice (1:5.2.5-2) unstable; 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@debian.org>  Sat, 11 Feb 2017 16:01:34 +0100
+
 libreoffice (1:5.2.5-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru libreoffice-5.2.5/debian/control libreoffice-5.2.5/debian/control
--- libreoffice-5.2.5/debian/control	2017-01-12 07:57:25.000000000 +0100
+++ libreoffice-5.2.5/debian/control	2017-02-11 16:01:34.000000000 +0100
@@ -4373,7 +4373,8 @@
 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 -Nru libreoffice-5.2.5/debian/control.sdk.in libreoffice-5.2.5/debian/control.sdk.in
--- libreoffice-5.2.5/debian/control.sdk.in	2016-06-13 16:31:04.000000000 +0200
+++ libreoffice-5.2.5/debian/control.sdk.in	2017-02-11 10:10:46.000000000 +0100
@@ -10,7 +10,8 @@
 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 -Nru libreoffice-5.2.5/debian/libreoffice-dbg.maintscript libreoffice-5.2.5/debian/libreoffice-dbg.maintscript
--- libreoffice-5.2.5/debian/libreoffice-dbg.maintscript	2016-02-25 11:41:03.000000000 +0100
+++ libreoffice-5.2.5/debian/libreoffice-dbg.maintscript	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-dir_to_symlink /usr/share/doc/libreoffice-dbg /usr/share/doc/libreoffice-core 1:5.0.3~rc1-2 $DPKG_MAINTSCRIPT_PACKAGE
diff -Nru libreoffice-5.2.5/debian/libreoffice-dev.maintscript libreoffice-5.2.5/debian/libreoffice-dev.maintscript
--- libreoffice-5.2.5/debian/libreoffice-dev.maintscript	2016-02-25 11:41:03.000000000 +0100
+++ libreoffice-5.2.5/debian/libreoffice-dev.maintscript	1970-01-01 01:00:00.000000000 +0100
@@ -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 -Nru libreoffice-5.2.5/debian/libreoffice-dev.postinst.in libreoffice-5.2.5/debian/libreoffice-dev.postinst.in
--- libreoffice-5.2.5/debian/libreoffice-dev.postinst.in	1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-5.2.5/debian/libreoffice-dev.postinst.in	2017-02-11 10:07:00.000000000 +0100
@@ -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 -Nru libreoffice-5.2.5/debian/libreoffice-dev.postrm.in libreoffice-5.2.5/debian/libreoffice-dev.postrm.in
--- libreoffice-5.2.5/debian/libreoffice-dev.postrm.in	1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-5.2.5/debian/libreoffice-dev.postrm.in	2017-02-11 10:07:00.000000000 +0100
@@ -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 -Nru libreoffice-5.2.5/debian/libreoffice-dev.preinst.in libreoffice-5.2.5/debian/libreoffice-dev.preinst.in
--- libreoffice-5.2.5/debian/libreoffice-dev.preinst.in	1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-5.2.5/debian/libreoffice-dev.preinst.in	2017-02-11 14:19:13.000000000 +0100
@@ -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 -Nru libreoffice-5.2.5/debian/libreoffice-dev.prerm.in libreoffice-5.2.5/debian/libreoffice-dev.prerm.in
--- libreoffice-5.2.5/debian/libreoffice-dev.prerm.in	1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-5.2.5/debian/libreoffice-dev.prerm.in	2017-02-11 10:07:00.000000000 +0100
@@ -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

Reply to: