Source: gnuplot
Version: 5.2.6+dfsg1-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: cross-satisfiability
gnuplot fails to satisfy its cross Build-Depends for multiple reasons.
One of them is depending on latex2html. While this may be fixable in
latex2html, it is not actually required for performing an arch-only
build. Moving it to Build-Depends-Indep is feasible. The attached patch
demonstrates that.
I compared the -b, -B and -A builds using reproducible builds after
applying the patch. The results are *not* reproducible. In the full
build, gnuplot-doc contains
/usr/share/doc/gnuplot/examples/binary{1,2,3}. These files are missing
in the indep-only build. I checked that this difference is also present
in the unmodified package. You may want to investigate this.
Please consider applying the attached patch. If you happen to know that
more dependencies are only relevant to indep builds, please consier
moving them as well. I only looked into latex2html here, because it
poses a problem to cross building.
Helmut
diff --minimal -Nru gnuplot-5.2.6+dfsg1/debian/changelog
gnuplot-5.2.6+dfsg1/debian/changelog
--- gnuplot-5.2.6+dfsg1/debian/changelog 2019-01-05 23:07:07.000000000
+0100
+++ gnuplot-5.2.6+dfsg1/debian/changelog 2019-06-09 13:19:34.000000000
+0200
@@ -1,3 +1,10 @@
+gnuplot (5.2.6+dfsg1-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Demote latex2html to Build-Depends-Indep. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Sun, 09 Jun 2019 13:19:34 +0200
+
gnuplot (5.2.6+dfsg1-1) unstable; urgency=medium
* [132187c] New upstream version 5.2.6+dfsg1
diff --minimal -Nru gnuplot-5.2.6+dfsg1/debian/control
gnuplot-5.2.6+dfsg1/debian/control
--- gnuplot-5.2.6+dfsg1/debian/control 2019-01-05 23:06:15.000000000 +0100
+++ gnuplot-5.2.6+dfsg1/debian/control 2019-06-09 13:19:33.000000000 +0200
@@ -16,7 +16,6 @@
qtbase5-dev,
qtbase5-dev-tools,
qttools5-dev-tools,
- latex2html,
libqt5webkit5-dev,
libqt5opengl5-dev,
libqt5svg5-dev,
@@ -32,6 +31,7 @@
libwxgtk3.0-dev,
zlib1g-dev,
emacs25-nox | emacs25 | emacs24
+Build-Depends-Indep: latex2html,
Standards-Version: 4.2.1
Vcs-Browser: https://salsa.debian.org/science-team/gnuplot
Vcs-Git: https://salsa.debian.org/science-team/gnuplot.git
diff --minimal -Nru gnuplot-5.2.6+dfsg1/debian/rules
gnuplot-5.2.6+dfsg1/debian/rules
--- gnuplot-5.2.6+dfsg1/debian/rules 2017-11-09 05:39:18.000000000 +0100
+++ gnuplot-5.2.6+dfsg1/debian/rules 2019-06-09 13:19:34.000000000 +0200
@@ -48,10 +48,12 @@
mkdir -p $(BUILDDIR_QT)
cd $(BUILDDIR_QT); CONFIG_SHELL=/bin/sh ../../configure $(conf_opts)
--enable-qt
-override_dh_auto_build:
+override_dh_auto_build-arch:
dh_auto_build -a -- -C $(BUILDDIR_NOX)/src
dh_auto_build -a -- -C $(BUILDDIR_X11) pkglibexecdir='$$(libexecdir)'
dh_auto_build -a -- -C $(BUILDDIR_QT) pkglibexecdir='$$(libexecdir)'
+
+override_dh_auto_build-indep:
cd $(BUILDDIR_X11)/docs; $(MAKE) pdf; $(MAKE) ps; $(MAKE) html; $(MAKE)
info; ls
cd $(BUILDDIR_X11)/tutorial; $(MAKE) pdf; $(MAKE) ps; ls
sed -i '/<ADDRESS>/,/<\/ADDRESS>/{//!d}'
$(BUILDDIR_X11)/docs/htmldocs/index.html
