[Pkg-sogo-maintainers] Bug#1094178: sope: FTBFS with the GNUstep multiarch layout: dh_install errors

[Yavor Doganov]

Source: sope
Version: 5.11.1-1
Tags: sid trixie ftbfs patch
Control: block 1093620 with -1
Control: block -1 with 1093948
User: pkg-gnustep-maintainers at lists.alioth.debian.org
Usertags: gnustep-multiarch

This package FTBFS with the GNUstep multiarch layout:

   dh_install
dh_install: warning: Cannot find (any matches for) "usr/lib/*.so.*" (tried in ., debian/tmp)

dh_install: warning: libsope1 missing files: usr/lib/*.so.*
dh_install: warning: Cannot find (any matches for) "usr/lib/GNUstep" (tried in ., debian/tmp)

dh_install: warning: libsope1 missing files: usr/lib/GNUstep
dh_install: warning: Cannot find (any matches for) "usr/lib/*.so" (tried in ., debian/tmp)

dh_install: warning: libsope-dev missing files: usr/lib/*.so
dh_install: error: missing files, aborting
make: *** [debian/rules:9: binary] Error 255

Patch attached.  This bug will become RC when the GNUstep
multiarch-based core packages will be uploaded to unstable (hopefully
early next week).
-------------- next part --------------
>From 894e88da2b2ad59fc92dbb1d7e93476c242bc933 Mon Sep 17 00:00:00 2001
From: Yavor Doganov <yavor at gnu.org>
Date: Sat, 25 Jan 2025 17:28:25 +0200
Subject: [PATCH] Fix FTBFS with the multiarch layout.

---
 debian/changelog           | 10 ++++++++++
 debian/control             |  3 ++-
 debian/libsope-dev.install |  2 +-
 debian/libsope1.install    |  4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cdd725c..fd77596 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sope (5.11.1-2) UNRELEASED; urgency=medium
+
+  * debian/control (Build-Depends): Require libgnustep-base-dev (>=
+    1.30.0-10) for the multiarch layout.
+    (libsope1): Mark as Multi-Arch: same.
+  * debian/libsope1.install: Update for the multiarch layout.
+  * debian/libsope-dev.install: Likewise.
+
+ -- Yavor Doganov <yavor at gnu.org>  Wed, 15 Jan 2025 00:05:08 +0200
+
 sope (5.11.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index e9ac2f2..63fd56e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Jeroen Dekkers <jeroen at dekkers.ch>,
 Build-Depends: debhelper-compat (= 13),
  gnustep-make,
  gobjc,
- libgnustep-base-dev (>= 1.29),
+ libgnustep-base-dev (>= 1.30.0-10),
  libxml2-dev,
  libldap2-dev,
  libpq-dev,
@@ -24,6 +24,7 @@ Vcs-Git: https://salsa.debian.org/debian/sope.git
 Package: libsope1
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: SKYRiX Object Publishing Environment (shared libraries)
  An extensive set of Objective-C frameworks which form a complete Web
  application server environment. Besides the Apple WebObjects
diff --git a/debian/libsope-dev.install b/debian/libsope-dev.install
index dcbb718..4f4b806 100644
--- a/debian/libsope-dev.install
+++ b/debian/libsope-dev.install
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/*.so
+usr/lib/*/*.so
 usr/share/GNUstep/Makefiles/*
diff --git a/debian/libsope1.install b/debian/libsope1.install
index c7a0c29..2bdacd4 100644
--- a/debian/libsope1.install
+++ b/debian/libsope1.install
@@ -1,2 +1,2 @@
-usr/lib/*.so.*
-usr/lib/GNUstep
+usr/lib/*/*.so.*
+usr/lib/*/GNUstep
-- 
2.47.2