Merge ~vmpyr/ubuntu/+source/sdpa:merge-lp2131189-resolute into ubuntu/+source/sdpa:debian/sid

[Ujjwal Sarswat]

[Ujjwal Sarswat (vmpyr)]

Here's the passing ppa build:

https://launchpad.net/~vmpyr/+archive/ubuntu/merges/+build/31485473

[Dominik Viererbe (dviererbe)]

I have one nitpick (see comment below) with the merge, otherwise it looks good.

todo: It's great that you tested that this merge builds in a PPA, but you just built it for amd64.
You also need to enable all other architectures (amd64v3, arm64, armhf, ppc64el, riscv64, s390x, ...) and verify that it builds successfully for these architectures.

suggestion: I see that the package has no autopkgtests, but I would be nice if you can run a small smoke test to verify that the binaries still work.

[Ujjwal Sarswat (vmpyr)]

https://launchpad.net/~vmpyr/+archive/ubuntu/merges/+packages

Have completed the builds on the rest of the architectures.

Checked if the binary is installed and working and if upgrading the package works fine.

[Nick Rosbrook (enr0n)]

Have you investigated why Debian does not require this change? Or is it possible to have a solution that could be forwarded to Debian?

For such a simple looking delta, it would be nice to forward it and not have to maintain anymore.

At the very least, please do add the LP bug number to the changelog as Dominik requested below.

review: Needs Fixing

[Ujjwal Sarswat (vmpyr)]

The delta was forwarded to debian with this bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1122042

The maintainer said on the bug tracker that the bug that led to this ubuntu delta was fixed in v7.3.20-1
After doing through the changes and changelog, it seems the issue has been fixed by the maintainer. THe current version in resolute is v7.3.20-2. It was autosynced with the ubuntu delta dropped.

I am closing this MR with these changes in light.

review: Disapprove (not needed)

Unmerged commits

e0c7b85... by Ujjwal Sarswat on 2025-11-13

update-maintainer

4e59a2b... by Ujjwal Sarswat on 2025-11-13

changelog

5117dcb... by Sudip Mukherjee on 2024-12-19

Fix dependency generation for the shared mumps library.

Signed-off-by: Sudip Mukherjee <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 0220eca..e10b993 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sdpa (7.3.19-1ubuntu1) resolute; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Fix dependency generation for the shared mumps library.
+
+ -- Ujjwal Sarswat <[e-mail]>  Thu, 13 Nov 2025 11:28:48 +0530
+
 sdpa (7.3.19-1) unstable; urgency=low
   * New upstream
     + Change $MUMPS from 5.6.2 to 5.7.3
@@ -8,6 +15,13 @@ sdpa (7.3.19-1) unstable; urgency=low
  -- Makoto Yamashita <[e-mail]>  Sat, 06 Sep 2025 09:00:00 +0900
 
 
+sdpa (7.3.18-1ubuntu1) plucky; urgency=medium
+
+  * Merge with Debian unstable. Remaining changes:
+    - Fix dependency generation for the shared mumps library.
+
+ -- Sudip Mukherjee <[e-mail]>  Thu, 19 Dec 2024 10:29:49 +0000
+
 sdpa (7.3.18-1) unstable; urgency=low
 
   * New upstream
@@ -20,6 +34,42 @@ sdpa (7.3.18-1) unstable; urgency=low
 
  -- Makoto Yamashita <[e-mail]>  Wed, 08 May 2024 09:00:00 +0900
 
+sdpa (7.3.16+dfsg-1ubuntu3) plucky; urgency=medium
+
+  * No-change rebuild for mumps
+
+ -- Sudip Mukherjee <[e-mail]>  Fri, 06 Dec 2024 13:24:26 +0000
+
+sdpa (7.3.16+dfsg-1ubuntu2) noble; urgency=medium
+
+  * No-change rebuild for CVE-2024-3094
+
+ -- William Grant <[e-mail]>  Mon, 01 Apr 2024 15:39:18 +1100
+
+sdpa (7.3.16+dfsg-1ubuntu1) noble; urgency=medium
+
+  * Fix dependency generation for the shared mumps library.
+
+ -- Matthias Klose <[e-mail]>  Sat, 23 Mar 2024 15:21:45 +0100
+
+sdpa (7.3.16+dfsg-1build3) noble; urgency=high
+
+  * No change rebuild against libmumps-seq-5.6t64.
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 22 Mar 2024 17:54:20 +0100
+
+sdpa (7.3.16+dfsg-1build2) mantic; urgency=medium
+
+  * Rebuild against latest mumps
+
+ -- Jeremy Bícha <[e-mail]>  Sat, 02 Sep 2023 18:38:20 -0400
+
+sdpa (7.3.16+dfsg-1build1) lunar; urgency=medium
+
+  * No-change rebuild with libmumps-5.5
+
+ -- Graham Inggs <[e-mail]>  Mon, 14 Nov 2022 20:36:58 +0000
+
 sdpa (7.3.16-1) unstable; urgency=low
 
   * New upstream
diff --git a/debian/control b/debian/control
index 39c83fa..cf66ea8 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: sdpa
 Section: math
 Priority: optional
-Maintainer: Makoto Yamashita <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Makoto Yamashita <[e-mail]>
 Build-Depends: debhelper-compat (=13), 
    pkgconf,
    automake, autoconf, gfortran,
@@ -14,7 +15,7 @@ Homepage: http://sdpa.sourceforge.net/
 Package: sdpa
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-   libmumps-seq-${mumps-seq:Version}t64
+   ${lib:Depends}
 Description: High-performance package for SemiDefinite Programs
  The software SDPA (SemiDefinite Programming Algorithm) is one of the most
  efficient and stable  software packages for solving SDPs based on the
@@ -41,7 +42,7 @@ Description: Callable library and examples of SDPA
 Package: sdpam
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-   libopenblas-pthread-dev, libmumps-seq-${mumps-seq:Version},
+   libopenblas-pthread-dev, ${lib:Depends},
    octave, libsdpa-dev
 Description: Matlab/Octave interface of SDPA
  This package provides SDPA-M, Matlab/Octave interface
diff --git a/debian/rules b/debian/rules
index 2e299be..86e5b1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,11 +37,8 @@ MUMPS_LIBS="-ldmumps_seq -lsmumps_seq -lcmumps_seq -lzmumps_seq -lmumps_common_s
 # "/usr/lib/$(DEB_HOST_MULTIARCH)/libdmumps_seq.a /usr/lib/$(DEB_HOST_MULTIARCH)/libmumps_common_seq.a /usr/lib/$(DEB_HOST_MULTIARCH)/libmpiseq_seq.a /usr/lib/$(DEB_HOST_MULTIARCH)/libpord_seq.a -lscotch -lesmumps"
 DEB_CONFIGURE_EXTRA_FLAGS += --with-mumps-libs=$(MUMPS_LIBS)
 
-
-# LIBMUMPS_VER := $(shell dpkg --status libmumps-seq-dev | awk '/^Version:/ {print $$2}' |cut -f 1 -d "-")
-# LIBMUMPS_VER := $(shell dpkg --status libmumps-seq-dev  | grep ^Depends | tr " " "\n" | grep libmumps-seq | cut -f 3 -d "-")
-LIBMUMPS_VER := $(shell dpkg --status libmumps-seq-dev | awk '/^Version:/ {print $$2}' |cut -f 1 -d "-" | cut -d . -f 1-2)
-DEB_DH_GENCONTROL_ARGS_ALL = -- -Vmumps-seq:Version=$(LIBMUMPS_VER)
+LIBMUMPS := $(shell dpkg-query -W -f '$${Depends}' libmumps-seq-dev | sed -E 's/.*(libmumps-seq[[:alnum:].-]+).*/\1/')
+DEB_DH_GENCONTROL_ARGS_ALL = -- -Vlib:Depends=$(LIBMUMPS)
 
 SDPA_DIR=$(CURDIR)/debian/sdpa
 SDPAM_DIR=$(CURDIR)/debian/sdpam