Bug#854890: unblock: pre-approval for libreoffice/5.2.5-2
tag -1 - moreinfo
unblock 854576 by -1
thanks
On Sat, Feb 11, 2017 at 09:18:26PM +0100, Andreas Beckmann wrote:
> And wait, there is something more amiss here. Let's discuss this over there.
That discussion over there resulted in the move of the whole dir
to /usr/share/doc/libreoffice/sdk. Which would violate the policy wording a bit
if you take it verbatim but it's close enough, imho. And it solves the problem.
It needed a bit more shuffling around but I got it working for both
jessie->stretch and stretch (5.2.5-1->5.2.5-2) upgrades.
While doing that I noticed that copyright (and maybe changelog, though that
appeared in 5.2.5-2..) was not properly installed into the "libreoffice"
dummy package. Also fixed that one
So here's the new debdiff. The package (as it's not that questionable than
the original attempt) is already uploaded.
unblock libreoffice/1:5.2.5-2
Regards,
Rene
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-13 19:26:09.000000000 +0100
@@ -1,3 +1,22 @@
+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). 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~) and add Conflicts: libreoffice (<< 1:5.2.5-2~) to both
+ -dev*- for safety
+ (closes: #854576)
+
+ * debian/rules: fix dh_installdocs calls to install copyright for
+ "libreoffice"
+
+ -- Rene Engelhard <rene@debian.org> Mon, 13 Feb 2017 19:26:09 +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-13 19:26:09.000000000 +0100
@@ -4373,7 +4373,7 @@
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 (<< 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 @@
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 @@
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 -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-13 16:59:36.000000000 +0100
@@ -10,7 +10,7 @@
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~), 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 @@
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 @@
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 -Nru libreoffice-5.2.5/debian/libreoffice-dev-doc.links libreoffice-5.2.5/debian/libreoffice-dev-doc.links
--- libreoffice-5.2.5/debian/libreoffice-dev-doc.links 2016-04-20 13:57:55.000000000 +0200
+++ libreoffice-5.2.5/debian/libreoffice-dev-doc.links 2017-02-12 19:10:09.000000000 +0100
@@ -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 -Nru libreoffice-5.2.5/debian/libreoffice.maintscript libreoffice-5.2.5/debian/libreoffice.maintscript
--- libreoffice-5.2.5/debian/libreoffice.maintscript 2016-02-25 11:41:03.000000000 +0100
+++ libreoffice-5.2.5/debian/libreoffice.maintscript 2017-02-13 18:20:25.000000000 +0100
@@ -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 -Nru libreoffice-5.2.5/debian/lo-cpp-ref.in libreoffice-5.2.5/debian/lo-cpp-ref.in
--- libreoffice-5.2.5/debian/lo-cpp-ref.in 2016-04-20 13:57:55.000000000 +0200
+++ libreoffice-5.2.5/debian/lo-cpp-ref.in 2017-02-13 13:18:32.000000000 +0100
@@ -4,4 +4,4 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libreoffice-dev/sdk/docs/cpp/ref/index.html
+Index: /usr/share/doc/libreoffice/sdk/docs/cpp/ref/index.html
diff -Nru libreoffice-5.2.5/debian/lo-idl-ref.in libreoffice-5.2.5/debian/lo-idl-ref.in
--- libreoffice-5.2.5/debian/lo-idl-ref.in 2015-09-04 09:35:28.000000000 +0200
+++ libreoffice-5.2.5/debian/lo-idl-ref.in 2017-02-13 13:19:21.000000000 +0100
@@ -4,4 +4,4 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libreoffice-dev/docs/idl/ref/index.html
+Index: /usr/share/doc/libreoffice/sdk/docs/idl/ref/index.html
diff -Nru libreoffice-5.2.5/debian/lo-java-ref.in libreoffice-5.2.5/debian/lo-java-ref.in
--- libreoffice-5.2.5/debian/lo-java-ref.in 2016-04-20 13:57:55.000000000 +0200
+++ libreoffice-5.2.5/debian/lo-java-ref.in 2017-02-13 13:18:42.000000000 +0100
@@ -4,4 +4,4 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libreoffice-dev/sdk/docs/java/ref/index.html
+Index: /usr/share/doc/libreoffice/sdk/docs/java/ref/index.html
diff -Nru libreoffice-5.2.5/debian/rules libreoffice-5.2.5/debian/rules
--- libreoffice-5.2.5/debian/rules 2017-01-12 07:57:25.000000000 +0100
+++ libreoffice-5.2.5/debian/rules 2017-02-13 19:25:09.000000000 +0100
@@ -2346,17 +2346,18 @@
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)
+ rm -f $(PKGDIR)-dev-doc/usr/share/doc/libreoffice/sdk/readme/LICENSE*
# 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"
@@ -3123,7 +3124,7 @@
# add symlinks for docs and examples
cd $(PKGDIR)-dev-doc/$(OOSDKDIR) && \
rm -rf docs && \
- ln -sf /usr/share/doc/libreoffice-dev/sdk/docs docs
+ ln -sf /usr/share/doc/libreoffice/sdk/docs docs
endif
ifeq "$(ENABLE_JAVA)" "y"
@@ -3250,8 +3251,9 @@
# 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
- dh_installdocs -pure -puno-libs3 -ppython3-uno -plibreoffice-mysql-connector
+ -Npython3-uno -Nlibreoffice-mysql-connector -Nlibreoffice \
+ --link-doc=libreoffice-core
+ dh_installdocs -pure -puno-libs3 -ppython3-uno -plibreoffice-mysql-connector -plibreoffice
ifeq "$(BUILD_DBG_PACKAGE)" "y"
dh_installdocs -pure-dbg -puno-libs3-dbg
endif
@@ -3521,14 +3523,14 @@
| sed -e "s/@lo_sources_ver@/$(lo_sources_ver)/" \
> debian/libreoffice-dev-doc.doc-base.lo-$$i-ref; \
done
- UDK_CPP_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/sdk/docs/cpp/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
+ UDK_CPP_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice/sdk/docs/cpp/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
echo "Files: $$UDK_CPP_FILES" >> debian/libreoffice-dev-doc.doc-base.lo-cpp-ref
ifeq "$(ENABLE_JAVA)" "y"
- UDK_JAVA_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/sdk/docs/java/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
+ UDK_JAVA_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice/sdk/docs/java/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
echo "Files: $$UDK_JAVA_FILES" >> debian/libreoffice-dev-doc.doc-base.lo-java-ref
endif
# xargs strips the many files here so we need to post-process it.
- UDK_COMMON_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice-dev/sdk/docs/common/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
+ UDK_COMMON_FILES=`find $(CURDIR)/debian/libreoffice-dev-doc/usr/share/doc/libreoffice/sdk/docs/common/ref | sed -e 's,$(CURDIR)/debian/libreoffice-dev-doc,,g' | xargs`; \
TMP=`mktemp -q`; \
cp debian/libreoffice-dev-doc.doc-base.lo-idl-ref $$TMP; \
echo "Files: $$UDK_COMMON_FILES" >> $$TMP; \
Reply to: