Merge ~vpa1977/ubuntu/+source/condor:fix-depends into ubuntu/+source/condor:ubuntu/devel

[Vladimir Petko]

Changes:
     - Derive the library name from the -dev package, add a b-d on the -dev package, replace the hard coded library in the control file with a macro, and pass that macro in dh_gencontrol.

PPA: ppa:vpa1977/october-21-2 [1]

Tests:
 - package builds
 - package installs on arhmf:
---
apt install condor=23.4.0+dfsg-1ubuntu2~ppa2
Reading package lists... Done
Building dependency tree... Done
Reading state information... Done
The following additional packages will be installed:
  fonts-glyphicons-halflings libboost-python1.83.0 libdate-manip-perl libjs-bootstrap libmunge2 libscitokens0t64 libvomsapi1t64 net-tools
Suggested packages:
  docker.io coop-computing-tools singularity-container slurm-client
The following NEW packages will be installed:
  condor fonts-glyphicons-halflings libboost-python1.83.0 libdate-manip-perl libjs-bootstrap libmunge2 libscitokens0t64 libvomsapi1t64 net-tools
0 upgraded, 9 newly installed, 0 to remove and 61 not upgraded.
Need to get 10.4 MB of archives.
After this operation, 38.9 MB of additional disk space will be used.
Do you want to continue? [Y/n]
....
Processing triggers for libc-bin (2.39-0ubuntu6) ...
----

[1] https://launchpad.net/~vpa1977/+archive/ubuntu/october-21-2

0b824a0... by Vladimir Petko on 2024-03-25

  * Don't hard-code dependency on a shared library (LP: 2058880).

e5f6e5f... by Vladimir Petko on 2024-03-25

changelog

Unmerged commits

e5f6e5f... by Vladimir Petko on 2024-03-25

changelog

0b824a0... by Vladimir Petko on 2024-03-25

  * Don't hard-code dependency on a shared library (LP: 2058880).

diff --git a/debian/changelog b/debian/changelog
index 8ebc570..5f71a0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+condor (23.4.0+dfsg-1ubuntu2) noble; urgency=medium
+
+  * Don't hard-code dependency on a shared library (LP: #2058880).
+
+ -- Vladimir Petko <[e-mail]>  Mon, 25 Mar 2024 15:56:46 +1300
+
 condor (23.4.0+dfsg-1ubuntu1) noble; urgency=high
 
   * Bump dependency to libssl3t64.
diff --git a/debian/control b/debian/control
index 854f423..8643537 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Build-Depends: cmake (>= 3.16),
                libpcre2-dev,
                libpq-dev,
                libscitokens-dev,
+               libssl-dev,
                libsqlite3-dev,
                libsystemd-dev,
                libvirt-dev,
@@ -59,12 +60,10 @@ Depends: adduser,
          libkrb5-3,
          libkrb5support0,
          libmunge2,
-         libssl3t64,
-         libscitokens0,
-         libvomsapi1v5,
          net-tools,
          libjs-bootstrap,
          libjs-jquery,
+         ${lib:Depends},
          ${misc:Depends},
          ${perl:Depends},
          ${python3:Depends},
diff --git a/debian/rules b/debian/rules
index 616641c..319c3bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -132,3 +132,10 @@ override_dh_strip:
 
 override_dh_auto_test:
 
+override_dh_gencontrol:
+	dh_gencontrol -- \
+		-Vlib:Depends="$(foreach package, libscitokens libssl, \
+			$(shell dpkg-query -W -f '$${Depends}' $(package)-dev \
+				| sed -E 's/.*($(package)[[:alnum:].-]+).*/\1,/' )) \
+			$(shell dpkg-query -W -f '$${Depends}' voms-dev \
+				| sed -E 's/.*(libvomsapi[[:alnum:].-]+).*/\1,/' )"