diffstat for vtk9-9.3.0+dfsg1 vtk9-9.3.0+dfsg1

 changelog |   10 ++++++++++
 control   |    8 ++++----
 rules     |   10 ++++++----
 3 files changed, 20 insertions(+), 8 deletions(-)

diff -Nru vtk9-9.3.0+dfsg1/debian/changelog vtk9-9.3.0+dfsg1/debian/changelog
--- vtk9-9.3.0+dfsg1/debian/changelog	2025-02-15 15:13:19.000000000 +0200
+++ vtk9-9.3.0+dfsg1/debian/changelog	2025-08-20 15:39:14.000000000 +0300
@@ -1,3 +1,13 @@
+vtk9 (9.3.0+dfsg1-4.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply patch from Samuel Thibault to disable Java and TBB on Hurd.
+    (Closes: #1094994)
+  * Make TBB architecture settings consistent.
+  * Remove handling of removed kfreebsd.
+
+ -- Adrian Bunk <bunk@debian.org>  Wed, 20 Aug 2025 15:39:14 +0300
+
 vtk9 (9.3.0+dfsg1-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru vtk9-9.3.0+dfsg1/debian/control vtk9-9.3.0+dfsg1/debian/control
--- vtk9-9.3.0+dfsg1/debian/control	2025-02-15 15:07:44.000000000 +0200
+++ vtk9-9.3.0+dfsg1/debian/control	2025-08-20 15:39:10.000000000 +0300
@@ -9,7 +9,7 @@
                chrpath,
                cmake,
                debhelper-compat (= 13),
-               default-jdk [!hppa !hurd-any !kfreebsd-any],
+               default-jdk [!hppa !hurd-any],
                default-libmysqlclient-dev,
                dh-sequence-python3,
                doxygen-latex,
@@ -91,7 +91,7 @@
 Section: libdevel
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         default-jdk [!hppa !hurd-any !kfreebsd-any],
+         default-jdk [!hppa !hurd-any],
          default-libmysqlclient-dev,
          libavcodec-dev,
          libavformat-dev,
@@ -117,12 +117,12 @@
          libproj-dev,
          libpython3-dev,
          libswscale-dev,
-         libtbb-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !alpha !ia64],
+         libtbb-dev [linux-any],
          libtheora-dev,
          libtiff-dev,
          libutfcpp-dev,
          libvtk9.3 (= ${binary:Version}),
-         libvtk9-java (= ${binary:Version}) [!hppa !hurd-any !kfreebsd-any],
+         libvtk9-java (= ${binary:Version}) [!hppa !hurd-any],
          libx11-dev,
          libxft-dev,
          libxml2-dev,
diff -Nru vtk9-9.3.0+dfsg1/debian/rules vtk9-9.3.0+dfsg1/debian/rules
--- vtk9-9.3.0+dfsg1/debian/rules	2025-02-15 15:07:44.000000000 +0200
+++ vtk9-9.3.0+dfsg1/debian/rules	2025-08-20 15:38:17.000000000 +0300
@@ -3,8 +3,9 @@
 
 include /usr/share/dpkg/architecture.mk
 
-nojava_archs=hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64
-ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(nojava_archs)))
+nojava_archs=hppa
+nojava_os=hurd
+ifeq (,$(filter $(DEB_BUILD_ARCH), $(nojava_archs))$(filter $(DEB_BUILD_ARCH_OS), $(nojava_os)))
   export JAVA_HOME=/usr/lib/jvm/default-java
   extra_flags += -DVTK_WRAP_JAVA=ON
 endif
@@ -14,8 +15,9 @@
   export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
 endif
 
-notbb_archs=hurd-i386 kfreebsd-i386 kfreebsd-amd64
-ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(notbb_archs)))
+notbb_archs=
+notbb_os=hurd
+ifeq (,$(filter $(DEB_BUILD_ARCH), $(notbb_archs))$(filter $(DEB_BUILD_ARCH_OS), $(notbb_os)))
   extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="TBB"
 else
   extra_flags += -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="OpenMP"