From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 12 Feb 2021 10:19:43 +0000 (+0000)
Subject: Merge version 9.0.1+dfsg1-5+rpi1 and 9.0.1+dfsg1-8 to produce 9.0.1+dfsg1-8+rpi1
X-Git-Tag: archive/raspbian/9.0.1+dfsg1-8+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=61236e29782e44445df70651816d79a40da18b17;p=vtk9.git

Merge version 9.0.1+dfsg1-5+rpi1 and 9.0.1+dfsg1-8 to produce 9.0.1+dfsg1-8+rpi1
---

61236e29782e44445df70651816d79a40da18b17
diff --cc debian/changelog
index 5de297c8,782d3233..447162dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,28 +1,35 @@@
- vtk9 (9.0.1+dfsg1-5+rpi1) bullseye-staging; urgency=medium
++vtk9 (9.0.1+dfsg1-8+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 9.0.1+dfsg1-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Tue, 05 Jan 2021 14:46:48 +0000]
 +  * Link with libatomic on armhf too for raspbian.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Tue, 05 Jan 2021 14:46:48 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 12 Feb 2021 10:19:43 +0000
++
+ vtk9 (9.0.1+dfsg1-8) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * [e2a0f2b]  Fix java dep on non-java ports. (Closes: #980125)
+ 
+  -- Anton Gladky <gladk@debian.org>  Thu, 14 Jan 2021 21:36:46 +0100
+ 
+ vtk9 (9.0.1+dfsg1-7) unstable; urgency=medium
+ 
+   * [cab8734] Enable some more modules
+ 
+  -- Anton Gladky <gladk@debian.org>  Thu, 07 Jan 2021 19:43:49 +0100
+ 
+ vtk9 (9.0.1+dfsg1-6) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * [7027348] Fix FTBFS on hurd-i386 and non-java ports. (Closes: #978659)
+ 
+   [ Vagrant Cascadian ]
+   * [7a3a0e0] Make vtk9 build-reproducible. (Closes: #977522, #977521)
+ 
+   [ Anton Gladky ]
+   * [a341c32] Enable RenderingContextOpenGL2. (Closes: #979073)
+ 
+  -- Anton Gladky <gladk@debian.org>  Mon, 04 Jan 2021 22:12:05 +0100
  
  vtk9 (9.0.1+dfsg1-5) unstable; urgency=medium
  
diff --cc debian/rules
index 5bb70c25,f0d5dc20..78bc21c8
--- a/debian/rules
+++ b/debian/rules
@@@ -3,9 -3,13 +3,13 @@@ BUILDDIR = $(CURDIR)/debian/buil
  
  DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
  
- export JAVA_HOME=/usr/lib/jvm/default-java
+ nojava_archs=hppa hurd-i386 kfreebsd-i386 kfreebsd-amd64
+ ifneq ($(DEB_BUILD_ARCH),$(filter $(DEB_BUILD_ARCH), $(nojava_archs)))
+   export JAVA_HOME=/usr/lib/jvm/default-java
+   extra_flags += -DVTK_WRAP_JAVA=ON
+ endif
  
 -ifneq (,$(filter $(DEB_HOST_ARCH), armel m68k mips mipsel powerpc sh4))
 +ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf m68k mips mipsel powerpc sh4))
    export DEB_CXXFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
    export DEB_LDFLAGS_MAINT_APPEND += -Wl,--no-as-needed -latomic -Wl,--as-needed
  endif