[Git][debian-gis-team/ogdi-dfsg][master] Apply Multi-Arch patch by Yuriy M. Kaminskiy. (closes: #1063996)

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / ogdi-dfsg


Commits:
bcf29eb2 by Bas Couwenberg at 2024-02-15T13:50:52+01:00
Apply Multi-Arch patch by Yuriy M. Kaminskiy. (closes: #1063996)

- - - - -


9 changed files:

- debian/changelog
- debian/control
- debian/libogdi-dev.dirs
- debian/libogdi-dev.install
- debian/libogdi4.1.dirs
- debian/libogdi4.1.install
- debian/libogdi4.1.lintian-overrides
- debian/patches/modules_path.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -2,6 +2,8 @@ ogdi-dfsg (4.1.1+ds-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Replace pkg-config (build) dependency with pkgconf.
+  * Apply Multi-Arch patch by Yuriy M. Kaminskiy.
+    (closes: #1063996)
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 06 Feb 2024 09:35:54 +0100
 


=====================================
debian/control
=====================================
@@ -36,6 +36,7 @@ Description: Open Geographic Datastore Interface Library -- development
 
 Package: libogdi4.1
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Suggests: ogdi-bin
@@ -52,6 +53,7 @@ Description: Open Geographic Datastore Interface Library -- library
 
 Package: ogdi-bin
 Architecture: any
+Multi-Arch: foreign
 Section: science
 Depends: ${shlibs:Depends},
          ${misc:Depends}


=====================================
debian/libogdi-dev.dirs
=====================================
@@ -2,5 +2,3 @@ usr/bin
 usr/lib
 usr/include
 usr/include/ogdi
-usr/share
-usr/share/pkgconfig


=====================================
debian/libogdi-dev.install
=====================================
@@ -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/


=====================================
debian/libogdi4.1.dirs
=====================================
@@ -1 +1 @@
-usr/lib/ogdi/4.1
+usr/lib/${DEB_HOST_MULTIARCH}/ogdi/4.1


=====================================
debian/libogdi4.1.install
=====================================
@@ -1,3 +1,3 @@
-usr/lib/libogdi.so.*
-usr/lib/libvpf.so.*
-usr/lib/ogdi/*.so	usr/lib/ogdi/4.1
+usr/lib/${DEB_HOST_MULTIARCH}/libogdi.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/libvpf.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/ogdi/*.so    usr/lib/${DEB_HOST_MULTIARCH}/ogdi/4.1


=====================================
debian/libogdi4.1.lintian-overrides
=====================================
@@ -1,3 +1,3 @@
 # False positive, string not included in the source.
-spelling-error-in-binary "allow to" "allow one to" [usr/lib/ogdi/*/libvrf.so]
+spelling-error-in-binary "allow to" "allow one to" [usr/lib/*/ogdi/*/libvrf.so]
 


=====================================
debian/patches/modules_path.patch
=====================================
@@ -9,7 +9,7 @@ Forwarded: not-needed
  		$(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)


=====================================
debian/rules
=====================================
@@ -14,6 +14,7 @@ export CFG=debug
 # Also link libm for cos() and related functions.
 export DEB_CFLAGS_MAINT_APPEND=-Wno-error=format-security -lm -DNDEBUG
 
+include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/pkg-info.mk
 
 UPSTREAM_VERSION = $(shell echo $(DEB_VERSION_UPSTREAM) | sed -e 's/\+.*//')
@@ -28,7 +29,7 @@ override_dh_auto_clean:
 
 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 \
@@ -47,7 +48,7 @@ override_dh_auto_install:
 execute_after_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)



View it on GitLab: https://salsa.debian.org/debian-gis-team/ogdi-dfsg/-/commit/bcf29eb28b0a25b2f6204f253fa0efc040d4a5f4

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/ogdi-dfsg/-/commit/bcf29eb28b0a25b2f6204f253fa0efc040d4a5f4
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/35bfa31e/attachment-0001.htm>