[Git][debian-gis-team/hdf4][master] Apply Multi-Arch patch by Yuriy M. Kaminskiy. (closes: #1063999)
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Feb 15 13:23:15 GMT 2024
Bas Couwenberg pushed to branch master at Debian GIS Project / hdf4
Commits:
aab9ea3e by Bas Couwenberg at 2024-02-15T14:18:11+01:00
Apply Multi-Arch patch by Yuriy M. Kaminskiy. (closes: #1063999)
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/control.in
- debian/libhdf4-0-alt.install
- debian/libhdf4-0.install
- debian/libhdf4-alt-dev.install
- debian/libhdf4-dev.install
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -3,6 +3,8 @@ libhdf4 (4.2.16-4) UNRELEASED; urgency=medium
* Team upload.
* Use execute_{before,after} instead of override in rules file.
* Enable Salsa CI.
+ * Apply Multi-Arch patch by Yuriy M. Kaminskiy.
+ (closes: #1063999)
-- Bas Couwenberg <sebastic at debian.org> Sat, 12 Aug 2023 12:59:40 +0200
=====================================
debian/control
=====================================
@@ -21,6 +21,7 @@ Rules-Requires-Root: no
Package: libhdf4-0
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -62,6 +63,7 @@ Description: Hierarchical Data Format development files (embedded NetCDF)
Package: libhdf4-0-alt
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -128,6 +130,7 @@ Description: Hierarchical Data Format library -- documentation
Package: hdf4-tools
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
=====================================
debian/control.in
=====================================
@@ -21,6 +21,7 @@ Rules-Requires-Root: no
Package: @PACKAGE at -@SOVER@
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -62,6 +63,7 @@ Description: Hierarchical Data Format development files (embedded NetCDF)
Package: @PACKAGE at -@SOVER at -alt
Architecture: any
+Multi-Arch: same
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
@@ -128,6 +130,7 @@ Description: Hierarchical Data Format library -- documentation
Package: hdf4-tools
Architecture: any
+Multi-Arch: foreign
Depends: ${shlibs:Depends},
${misc:Depends}
Pre-Depends: ${misc:Pre-Depends}
=====================================
debian/libhdf4-0-alt.install
=====================================
@@ -1 +1 @@
-usr/lib-alt/lib*.so.0* usr/lib
+usr/lib-alt/${DEB_HOST_MULTIARCH}/lib*.so.0* usr/lib/${DEB_HOST_MULTIARCH}
=====================================
debian/libhdf4-0.install
=====================================
@@ -1 +1 @@
-usr/lib/lib*.so.0*
+usr/lib/*/lib*.so.0*
=====================================
debian/libhdf4-alt-dev.install
=====================================
@@ -1,6 +1,6 @@
-usr/lib-alt/lib*.a usr/lib
-usr/lib-alt/lib*.la usr/lib
-usr/lib-alt/lib*.settings usr/lib
-usr/lib-alt/lib*.so usr/lib
+usr/lib-alt/${DEB_HOST_MULTIARCH}/lib*.a usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib-alt/${DEB_HOST_MULTIARCH}/lib*.la usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib-alt/${DEB_HOST_MULTIARCH}/lib*.settings usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib-alt/${DEB_HOST_MULTIARCH}/lib*.so usr/lib/${DEB_HOST_MULTIARCH}
usr/include-alt/hdf usr/include
usr/share/man/man3
=====================================
debian/libhdf4-dev.install
=====================================
@@ -1,6 +1,6 @@
-usr/lib/lib*.a
-usr/lib/lib*.la
-usr/lib/lib*.settings
-usr/lib/lib*.so
+usr/lib/*/lib*.a
+usr/lib/*/lib*.la
+usr/lib/*/lib*.settings
+usr/lib/*/lib*.so
usr/include/hdf
usr/share/man/man3
=====================================
debian/rules
=====================================
@@ -8,6 +8,7 @@
# Enable hardening build flags
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+include /usr/share/dpkg/architecture.mk
include /usr/share/dpkg/pkg-info.mk
UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
@@ -81,7 +82,7 @@ override_dh_auto_configure: templates
--builddirectory=debian/build-hdf4 \
-- --prefix=/usr \
--includedir=/usr/include/hdf \
- --libdir=/usr/lib \
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--enable-shared \
--enable-fortran \
--with-szlib=yes \
@@ -93,7 +94,7 @@ override_dh_auto_configure: templates
--builddirectory=debian/build-hdf4-alt \
-- --prefix=/usr \
--includedir=/usr/include/hdf \
- --libdir=/usr/lib \
+ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \
--enable-shared \
--disable-fortran \
--disable-netcdf \
@@ -172,12 +173,12 @@ override_dh_auto_install:
mv $(DESTDIR)/usr/share/hdf4_examples $(DESTDIR)/usr/share/doc/$(PACKAGE)-doc/examples
# strip rpath into binaries and libraries
- for obj in $(DESTDIR)/usr/bin/* $(DESTDIR)/usr/lib/*.so.* $(DESTDIR)/usr/lib-alt/*.so.*; do \
+ for obj in $(DESTDIR)/usr/bin/* $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.so.* $(DESTDIR)/usr/lib-alt/$(DEB_HOST_MULTIARCH)/*.so.*; do \
chrpath -d $${obj} || true; \
done
# Empty out the dependency field in our .la files
- for file in $(DESTDIR)/usr/lib/*.la $(DESTDIR)/usr/lib-alt/*.la; do \
+ for file in $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.la $(DESTDIR)/usr/lib-alt/$(DEB_HOST_MULTIARCH)/*.la; do \
sed -i -e "/dependency_libs/ s/'.*'/''/" $$file ; \
done
View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/commit/aab9ea3e68f4ed8f1e470b4bde8914d3b7bd92b4
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/hdf4/-/commit/aab9ea3e68f4ed8f1e470b4bde8914d3b7bd92b4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240215/ccee44b2/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list