Bug#1063996: libogdi4.1: is not multi-arch compatible

Thu Feb 15 12:26:13 GMT 2024

Package: libogdi4.1
Version: 4.1.0+ds-6
Severity: normal
Tags: patch

Dear Maintainer,

libogdi4 is dependency of libgdal32 and indirect dependency of opencv.
Lack of multi-arch markup and compatibility prevents their
co-installation on multi-arch systems.

.pc moved from /usr/share/pkgconfig to /usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig
debhelper bump required for use of substitutions in .install

Patch attached.

Disclaimer: I was able to co-install M-A-patched
libgdal32/libogdi4.1/libarmadillo11/libhdf4 libraries on stable/bookworm,
but have no way to verify if there are any problems with their use.

-- System Information:
Debian Release: 12.4
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable-security'), (500, 'stable'), (100, 'proposed-updates')
Architecture: i386 (x86_64)
Foreign Architectures: amd64

Kernel: Linux 6.1.0-17-amd64 (SMP w/2 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE
Locale: LANG=ru_RU.UTF-8, LC_CTYPE=ru_RU.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled

Versions of packages libogdi4.1 depends on:
ii  libc6      2.36-9+deb12u4
ii  libexpat1  2.5.0-1
ii  libtirpc3  1.3.3+ds-1
ii  zlib1g     1:1.2.13.dfsg-1

libogdi4.1 recommends no packages.

Versions of packages libogdi4.1 suggests:
ii  ogdi-bin  4.1.0+ds-6

-- no debconf information
-------------- next part --------------
Notes:
.pc moved from /usr/share/pkgconfig to /usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig
debhelper bump required for substitutions in .install

diff -Nru ogdi-dfsg-4.1.0+ds/debian/changelog ogdi-dfsg-4.1.0+ds/debian/changelog

--- ogdi-dfsg-4.1.0+ds/debian/changelog	2022-12-01 15:52:30.000000000 +0300
+++ ogdi-dfsg-4.1.0+ds/debian/changelog	2024-02-14 23:56:13.000000000 +0300
@@ -1,3 +1,11 @@
+ogdi-dfsg (4.1.0+ds-6.1~local1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Bump debheler compat to 13.
+  * Fix Multi-Arch.
+
+ -- Yuriy M. Kaminskiy <yumkam+debian at gmail.com>  Wed, 14 Feb 2024 23:56:13 +0300
+
 ogdi-dfsg (4.1.0+ds-6) unstable; urgency=medium
 
   * Team upload.
diff -Nru ogdi-dfsg-4.1.0+ds/debian/control ogdi-dfsg-4.1.0+ds/debian/control
--- ogdi-dfsg-4.1.0+ds/debian/control	2022-11-28 18:21:45.000000000 +0300
+++ ogdi-dfsg-4.1.0+ds/debian/control	2024-02-14 23:53:25.000000000 +0300
@@ -3,7 +3,7 @@
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
 Section: libs
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                libexpat1-dev,
                pkg-config,
                tcl-dev (>= 8.4),
@@ -36,6 +36,7 @@
 
 Package: libogdi4.1
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: ogdi-bin
@@ -52,6 +53,7 @@
 
 Package: ogdi-bin
 Architecture: any
+Multi-Arch: foreign
 Section: science
 Depends: ${shlibs:Depends},
          ${misc:Depends}
diff -Nru ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.dirs ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.dirs
--- ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.dirs	2021-06-13 15:17:54.000000000 +0300
+++ ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.dirs	2024-02-14 23:52:43.000000000 +0300
@@ -1 +1 @@
-usr/lib/ogdi/4.1
+usr/lib/${DEB_HOST_MULTIARCH}/ogdi/4.1
diff -Nru ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.install ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.install
--- ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.install	2021-06-13 15:12:37.000000000 +0300
+++ ogdi-dfsg-4.1.0+ds/debian/libogdi4.1.install	2024-02-14 23:50:26.000000000 +0300
@@ -1,3 +1,3 @@
-usr/lib/libogdi.so.*
-usr/lib/libvpf.so.*
-usr/lib/ogdi/*.so	usr/lib/ogdi/4.1
+usr/lib/*/libogdi.so.*
+usr/lib/*/libvpf.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/ogdi/*.so	usr/lib/${DEB_HOST_MULTIARCH}/ogdi/4.1
diff -Nru ogdi-dfsg-4.1.0+ds/debian/libogdi-dev.install ogdi-dfsg-4.1.0+ds/debian/libogdi-dev.install
--- ogdi-dfsg-4.1.0+ds/debian/libogdi-dev.install	2020-11-12 08:35:27.000000000 +0300
+++ ogdi-dfsg-4.1.0+ds/debian/libogdi-dev.install	2024-02-14 23:51:03.000000000 +0300
@@ -1,5 +1,5 @@
-usr/lib/lib*.so
+usr/lib/*/lib*.so
 usr/include/ecs.h      usr/include/ogdi
 usr/include/ecs_util.h usr/include/ogdi
 ogdi-config            usr/bin/
-ogdi.pc                usr/share/pkgconfig/
+ogdi.pc                usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
diff -Nru ogdi-dfsg-4.1.0+ds/debian/patches/modules_path.patch ogdi-dfsg-4.1.0+ds/debian/patches/modules_path.patch
--- ogdi-dfsg-4.1.0+ds/debian/patches/modules_path.patch	2021-06-13 15:14:04.000000000 +0300
+++ ogdi-dfsg-4.1.0+ds/debian/patches/modules_path.patch	2024-02-14 23:54:36.000000000 +0300
@@ -9,7 +9,7 @@
  		$(EXPAT_INCLUDE)
  
 -CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -DMODULES_PATH="\"$(INST_LIB)/ogdi/\""
-+CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -DMODULES_PATH="\"/usr/lib/ogdi/4.1/\""
++CFLAGS 	= $(INCLUDES) $(COMMON_CFLAGS) -DMODULES_PATH="\"/usr/${DEB_HOST_MULTIARCH}/lib/ogdi/4.1/\""
  
  LINK_LIBS= $(RPC_LINKLIB) $(ZLIB_LINKLIB) $(EXPAT_LINKLIB) $(WIN_LINKLIB) \
  		$(MATH_LINKLIB)
diff -Nru ogdi-dfsg-4.1.0+ds/debian/rules ogdi-dfsg-4.1.0+ds/debian/rules
--- ogdi-dfsg-4.1.0+ds/debian/rules	2021-09-13 13:54:25.000000000 +0300
+++ ogdi-dfsg-4.1.0+ds/debian/rules	2024-02-14 23:52:19.000000000 +0300
@@ -28,7 +28,7 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
-		 --libdir=$(CURDIR)/debian/tmp/usr/lib \
+		 --libdir=$(CURDIR)/debian/tmp/usr/lib/${DEB_HOST_MULTIARCH} \
 		 --with-expat=yes \
 		 --with-expatinc=/usr/include \
 		 --with-expatlib=-lexpat \
@@ -48,7 +48,7 @@
 	dh_install
 	sed -i -e 's@$(CURDIR)/debian/tmp@@g' \
 		debian/*/usr/bin/ogdi-config \
-		debian/*/usr/share/pkgconfig/ogdi.pc
+		debian/*/usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/ogdi.pc
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -v$(UPSTREAM_VERSION)
