Bug#821164: vtk6: diff for NMU version 6.2.0+dfsg1-11.2

[Tobias Frost]

Control: tags 821164 + patch

Hi Anton,

thanks for the offer but at the moment I do not have capacity for so a big team / package :)

BTW, I made an error when checking for the build error cause on hurd, it is not related to this patch.
Therefore a NMU would be overkill..

Nevertheless, here's the patch I came up with; it might be incomplete:
I did not test if it works to "only" build the arch:all package, I
just checked if it does not break the normal build.
(vtk6 takes a hell lot of time to build on my machine...)

diff -Nru vtk6-6.2.0+dfsg1/debian/changelog vtk6-6.2.0+dfsg1/debian/changelog
--- vtk6-6.2.0+dfsg1/debian/changelog	2016-04-10 20:10:50.000000000 +0200
+++ vtk6-6.2.0+dfsg1/debian/changelog	2016-04-16 10:58:10.000000000 +0200
@@ -1,3 +1,11 @@
+vtk6 (6.2.0+dfsg1-11.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move B-Ds required to build the arch:all doc package to Build-Depends-Indep
+    and adapt d/rules accordingly. (Closes: #821164)
+
+ -- Tobias Frost <tobi at debian.org>  Sat, 16 Apr 2016 10:56:38 +0200
+
 vtk6 (6.2.0+dfsg1-11.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru vtk6-6.2.0+dfsg1/debian/control vtk6-6.2.0+dfsg1/debian/control
--- vtk6-6.2.0+dfsg1/debian/control	2016-04-10 20:09:10.000000000 +0200
+++ vtk6-6.2.0+dfsg1/debian/control	2016-04-16 10:55:28.000000000 +0200
@@ -10,12 +10,8 @@
                debhelper (>= 9),
                default-jdk,
                dh-python,
-               doxygen-latex,
                dpkg-dev (>= 1.16.1~),
                ftgl-dev,
-               ghostscript,
-               gnuplot-nox,
-               graphviz,
                hdf5-tools,
                javahelper,
                libalglib-dev,
@@ -68,13 +64,12 @@
                r-base-core,
                r-base-dev,
                tcl-dev,
-               texlive-binaries,
-               texlive-math-extra,
                tk-dev,
                x11proto-core-dev,
                xauth,
                xvfb,
                zlib1g-dev
+Build-Depends-Indep: doxygen-latex,  texlive-binaries,  texlive-math-extra, graphviz, ghostscript, gnuplot-nox
 Standards-Version: 3.9.7
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/vtk6.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/vtk6.git
diff -Nru vtk6-6.2.0+dfsg1/debian/rules vtk6-6.2.0+dfsg1/debian/rules
--- vtk6-6.2.0+dfsg1/debian/rules	2016-04-04 11:19:56.000000000 +0200
+++ vtk6-6.2.0+dfsg1/debian/rules	2016-04-16 10:55:28.000000000 +0200
@@ -66,10 +66,9 @@
 	dh_auto_clean
 	rm -rf $(BUILDDIR)
 
-override_dh_auto_build:
-	dh_auto_build
-	# Make doc (see wiki/VTK/debian/buildingDoxygen)
-	cd $(BUILDDIR) && make DoxygenDoc 
+override_dh_auto_build-indep:
+	# Make doc (see http://www.vtk.org/Wiki/VTK/BuildingDoxygen)
+	cd $(BUILDDIR) && make DoxygenDoc
 	# remove .md5 files
 	find $(BUILDDIR)/Utilities/Doxygen/doc/html/ -name "*.md5" | xargs rm -f