Merge pull request #1942 from LinuxCNC/fix-deb-build-again

Fix deb build again

Author: SebKuzminsky

debian/configure

@@ -62,7 +62,7 @@ elif [ -f /etc/lsb-release ]; then
 fi
 
 if [ -n "$ENABLE_BUILD_DOCUMENTATION" ]; then
-    DOC_DEPENDS="asciidoc (>= 8.5),\n    dblatex (>= 0.2.12),\n    docbook-xsl,\n    dvipng,\n    ghostscript,\n    graphviz,\n    groff,\n    imagemagick,\n    inkscape,\n    python3-lxml,\n    source-highlight,\n    w3c-linkchecker,\n    xsltproc,\n    texlive-extra-utils,\n    texlive-font-utils,\n    texlive-fonts-recommended,\n    texlive-lang-cyrillic,\n    texlive-lang-european,\n    texlive-lang-french,\n    texlive-lang-german,\n    texlive-lang-polish,\n    texlive-lang-spanish,\n    texlive-latex-recommended,\n    asciidoc-dblatex"
+    DOC_DEPENDS="dblatex (>= 0.2.12),\n    docbook-xsl,\n    dvipng,\n    graphviz,\n    groff,\n    inkscape,\n    python3-lxml,\n    w3c-linkchecker,\n    xsltproc,\n    texlive-extra-utils,\n    texlive-font-utils,\n    texlive-fonts-recommended,\n    texlive-lang-cyrillic,\n    texlive-lang-european,\n    texlive-lang-french,\n    texlive-lang-german,\n    texlive-lang-polish,\n    texlive-lang-spanish,\n    texlive-latex-recommended,\n    fonts-dejavu"
 
     case $DISTRIB_NAME in
 	Debian-9)

debian/control.top.in

@@ -10,6 +10,11 @@ Build-Depends:
     @KERNEL_HEADERS@,
     @MODUTILS_DEPENDS@,
     @EXTRA_BUILD@,
+    asciidoc,
+    ghostscript,
+    imagemagick,
+    source-highlight,
+    asciidoc-dblatex,
     autoconf,
     automake,
     bwidget (>= 1.7),

debian/rules.in

@@ -91,6 +91,9 @@ override_dh_installdocs-arch:
 
 override_dh_auto_install-indep:
 	DESTDIR=$(DESTDIR) $(MAKE) -C src install-docs install-doc
+	# Remove the docs we just built that we don't have debs for yet...
+	rm -f $(DESTDIR)/usr/share/doc/linuxcnc/*_de.pdf
+	rm -f $(DESTDIR)/usr/share/doc/linuxcnc/*_nb.pdf
 
 override_dh_installdocs-indep:
 	# The G-code quick reference html docs are built as