Merge ~adrien/ubuntu/+source/therion:vtk9-9.3 into ubuntu/+source/therion:ubuntu/devel

[Adrien Nader]

Please review this merge request. Note that the package is amd64-only.

# 📊 PPA
A PPA is available at:
 https://launchpad.net/~adrien/+archive/ubuntu/oracular-gdcm-ftbfs-vtk-9.3

# Diff and stats from pkg/ubuntu/devel

## 📰 Changelog diff [pkg/ubuntu/devel]
@@ -0,0 +1,7 @@
+therion (6.2.1-1ubuntu1) oracular; urgency=medium
+
+ * Build-Depends on texlive-fonts-recommended for the logo10 font
+ (LP: #2069714)
+
+ -- Adrien Nader <email address hidden> Tue, 18 Jun 2024 12:11:18 +0200
+

## 📊 Diffstats for debian/ [pkg/ubuntu/devel]
 debian/changelog | 7 +++++++
 debian/control | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

## Diff of debian/patches/series [pkg/ubuntu/devel]
No new patch

# 🧪 Autopkgtest results
No autopkgtest results for therion/6.2.1-1ubuntu1~ppa1.

# 🔍 Lintian diff from most recent published package
No relevant lintian change.

[Adrien Nader (adrien)]

I had added the dependency to Build-Depends-Indep instead of Build-Depends. This is now fixed.

I think the package FTBFS due to the recent dpkg issue though. I don't know if we should disable the corresponding QA feature for now or if we should wait for dpkg. Comments welcome.

[Graham Inggs (ginggs)]

This looks good to me, sponsoring.

The package built fine for me, so I don't think it is affected by dpkg.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 6bfa0c4..b6c0018 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+therion (6.2.1-1ubuntu1) oracular; urgency=medium
+
+  * Build-Depends on texlive-fonts-recommended for the logo10 font
+    (LP: #2069714)
+
+ -- Adrien Nader <[e-mail]>  Tue, 18 Jun 2024 12:11:18 +0200
+
 therion (6.2.1-1build1) oracular; urgency=medium
 
   * Rebuild against new libvtk9.3.
diff --git a/debian/control b/debian/control
index dd61eac..879e596 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,13 @@
 Source: therion
 Section: science
 Priority: optional
-Maintainer: Martin Budaj <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Martin Budaj <[e-mail]>
 Uploaders: Wookey <[e-mail]>, Olly Betts <[e-mail]>
 Build-Depends: dpkg (>=1.16.2), debhelper, debhelper-compat (=13), perl (>= 5.5), tcl,
   libvtk9-dev, libwxgtk3.2-dev, libfreetype-dev, libjpeg-dev, libpng-dev,
   pkgconf, texlive-base, libproj-dev, libsqlite3-tcl, python3,
-  libshp-dev, catch2, cmake, ninja-build, libfmt-dev
+  libshp-dev, catch2, cmake, ninja-build, libfmt-dev, texlive-fonts-recommended
 Build-Depends-Indep: texlive-metapost, imagemagick-6.q16, ghostscript
 Standards-Version: 4.6.2
 Homepage: https://therion.speleo.sk/