Merge ~paelzer/ubuntu/+source/open-vm-tools:lp-1944946-multiarch-fallout-IMPISH into ubuntu/+source/open-vm-tools:ubuntu/impish-devel

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA (same content just other changelog): https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/4673

Debian discussion (accepted but reverted by me as we do not want it later in 22.04 or experimental/unstable):
https://salsa.debian.org/vmware-packaging-team/pkg-open-vm-tools/-/merge_requests/11

[Paride Legovini (paride)]

Simple packaging-only change with a clear comment; I verified that the link is in place in the installed package and point to the right location. This LGTM, approving.

---

I normally prefer using dh_link d/package.links files to add symlinks, but in this case it would have required dh-exec to expand $(DEB_HOST_MULTIARCH) as an extra build-dep, easy to forget there even after we remove this workaround. Debhelper level 13 now expands dpkg-architecture variables natively, without resorting to dh-exec, but the package is at compat 12. In the end I would have implemented the workaround in the same way as proposed.

review: Approve

[Paride Legovini (paride)]

Reapproving with the update-maintainer changes (discussed on MM).

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks, fixed up the update-maintainer that you asked for.
Uploading ...

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading open-vm-tools_11.3.0-2ubuntu1.dsc: done.
  Uploading open-vm-tools_11.3.0-2ubuntu1.debian.tar.xz: done.
  Uploading open-vm-tools_11.3.0-2ubuntu1_source.buildinfo: done.
  Uploading open-vm-tools_11.3.0-2ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index cd1f2ff..35e13cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+open-vm-tools (2:11.3.0-2ubuntu1) impish; urgency=medium
+
+  * d/rules: provide a compat link for the old open-vm-tools
+    library/plugin paths (LP: #1944946)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 07 Oct 2021 09:31:05 +0200
+
 open-vm-tools (2:11.3.0-2) experimental; urgency=medium
 
   * d/copyright: further fix licenses after consulting SPDX
diff --git a/debian/control b/debian/control
index 52f79c5..0264bc6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: open-vm-tools
 Section: admin
 Priority: optional
-Maintainer: Bernd Zeimetz <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Bernd Zeimetz <[e-mail]>
 Uploaders: Christian Ehrhardt <[e-mail]>
 Build-Depends:
  debhelper-compat (= 12), doxygen, libcunit1-dev,
diff --git a/debian/rules b/debian/rules
index f19b2ba..481ec14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,6 +85,9 @@ override_dh_auto_install:
 	mv debian/open-vm-tools/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/serviceDiscovery/scripts/* debian/open-vm-tools-sdmp/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/serviceDiscovery/scripts/
 	rm -rf debian/open-vm-tools/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools/serviceDiscovery/
 
+	# Compat link for LP: #1944946 due to software checking the old non multiarch .so paths
+	ln --relative --symbolic debian/open-vm-tools/usr/lib/$(DEB_HOST_MULTIARCH)/open-vm-tools debian/open-vm-tools/usr/lib/open-vm-tools
+
 override_dh_gencontrol:
 	if [ "${VENDOR}" = "UBUNTU" ]; \
 	then \