Bug#1063999: libhdf4-0-alt: is not multi-arch compatible

2024-02-15 Thread Sebastiaan Couwenberg

Control: tags -1 pending

Thanks for the patch, it's applied in git.

Kind Regards,

Bas

--
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1



Bug#1063999: libhdf4-0-alt: is not multi-arch compatible

2024-02-15 Thread Yuriy M. Kaminskiy
Package: libhdf4-0-alt
Version: 4.2.15-5
Severity: normal
Tags: patch
X-Debbugs-Cc: yumkam+deb...@gmail.com

Dear Maintainer,

libhdf4 is dependency of libgdal32 and indirect dependency of opencv.
Lack of Multi-Arch compatibility prevents co-installation of libraries
on M-A systems.
*-dev packages looks not M-A compatible due to include/hdf/h4config.h, and
was not priority for me.
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.

Patch for 4.2.16-3 is not tested at all.

-- 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 libhdf4-0-alt depends on:
ii  libc62.36-9+deb12u4
ii  libjpeg62-turbo  1:2.1.5-2
ii  libtirpc31.3.3+ds-1
ii  zlib1g   1:1.2.13.dfsg-1

libhdf4-0-alt recommends no packages.

Versions of packages libhdf4-0-alt suggests:
pn  hdf4-tools   
pn  libhdf4-alt-dev  
pn  libhdf4-doc  

-- no debconf information
Note: debhelper bump required for substitutions in *.install

diff -Nru libhdf4-4.2.15/debian/changelog libhdf4-4.2.15/debian/changelog
--- libhdf4-4.2.15/debian/changelog 2022-12-01 13:28:15.0 +0300
+++ libhdf4-4.2.15/debian/changelog 2024-02-14 23:18:22.0 +0300
@@ -1,3 +1,11 @@
+libhdf4 (4.2.15-5.1~local1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix Multi-Arch.
+- Bump compat to 13.
+
+ -- Yuriy M. Kaminskiy   Wed, 14 Feb 2024 23:18:22 
+0300
+
 libhdf4 (4.2.15-5) unstable; urgency=medium
 
   * Team upload.
diff -Nru libhdf4-4.2.15/debian/control libhdf4-4.2.15/debian/control
--- libhdf4-4.2.15/debian/control   2022-11-27 20:47:57.0 +0300
+++ libhdf4-4.2.15/debian/control   2024-02-14 23:18:22.0 +0300
@@ -4,7 +4,7 @@
Johan Van de Wauw 
 Section: graphics
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
bison,
chrpath,
flex,
@@ -21,6 +21,7 @@
 
 Package: libhdf4-0
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -62,6 +63,7 @@
 
 Package: libhdf4-0-alt
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -128,6 +130,7 @@
 
 Package: hdf4-tools
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
diff -Nru libhdf4-4.2.15/debian/control.in libhdf4-4.2.15/debian/control.in
--- libhdf4-4.2.15/debian/control.in2022-11-27 20:48:02.0 +0300
+++ libhdf4-4.2.15/debian/control.in2024-02-14 23:18:22.0 +0300
@@ -4,7 +4,7 @@
Johan Van de Wauw 
 Section: graphics
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
bison,
chrpath,
flex,
@@ -21,6 +21,7 @@
 
 Package: @PACKAGE@-@SOVER@
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -62,6 +63,7 @@
 
 Package: @PACKAGE@-@SOVER@-alt
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
  ${misc:Depends}
@@ -128,6 +130,7 @@
 
 Package: hdf4-tools
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
diff -Nru libhdf4-4.2.15/debian/libhdf4-0-alt.install 
libhdf4-4.2.15/debian/libhdf4-0-alt.install
--- libhdf4-4.2.15/debian/libhdf4-0-alt.install 2021-09-14 18:02:36.0 
+0300
+++ libhdf4-4.2.15/debian/libhdf4-0-alt.install 2024-02-14 23:18:22.0 
+0300
@@ -1 +1 @@
-usr/lib-alt/lib*.so.0* usr/lib
+usr/lib-alt/${DEB_HOST_MULTIARCH}/lib*.so.0* usr/lib/${DEB_HOST_MULTIARCH}
diff -Nru libhdf4-4.2.15/debian/libhdf4-0.install 
libhdf4-4.2.15/debian/libhdf4-0.install
--- libhdf4-4.2.15/debian/libhdf4-0.install 2021-09-14 18:02:36.0 
+0300
+++ libhdf4-4.2.15/debian/libhdf4-0.install 2024-02-14 23:18:22.0 
+0300
@@ -1 +1 @@
-usr/lib/lib*.so.0*
+usr/lib/*/lib*.so.0*
diff -Nru libhdf4-4.2.15/debian/libhdf4-alt-dev.install 
libhdf4-4.2.15/debian/libhdf4-alt-dev.install
--- libhdf4-4.2.15/debian/libhdf4-alt-dev.install   2021-09-14 
18:02:36.0 +0300
+++ libhdf4-4.2.15/debian/libhdf4-alt-dev.install   2024-02-14