Merge branch '2.9'

LinuxCNC · Jul 19, 2023 · 51bc0e3 · 51bc0e3
2 parents c1ee6b9 + ebf3cb2
commit 51bc0e3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/debian/configure b/debian/configure
@@ -93,7 +93,7 @@ PYTHON_GST=python3-gst-1.0,gstreamer1.0-plugins-base
 TCLTK_VERSION=8.6
 PYTHON_IMAGING=python3-pil
 PYTHON_IMAGING_TK=python3-pil.imagetk
-QTVCP_DEPENDS="python3-pyqt5,\n    python3-pyqt5.qsci,\n    python3-pyqt5.qtsvg,\n    python3-pyqt5.qtopengl,\n    python3-opencv,\n    python3-dbus,\n    python3-espeak,\n    python3-dbus.mainloop.pyqt5,\n    python3-pyqt5.qtwebkit,\n    espeak-ng,\n    pyqt5-dev-tools,\n    gstreamer1.0-tools,\n    espeak,\n    sound-theme-freedesktop,\n    python3-poppler-qt5"
+QTVCP_DEPENDS="python3-pyqt5,\n    python3-pyqt5.qsci,\n    python3-pyqt5.qtsvg,\n    python3-pyqt5.qtopengl,\n    python3-opencv,\n    python3-dbus,\n    python3-espeak,\n    python3-dbus.mainloop.pyqt5,\n    python3-pyqt5.qtwebengine | python3-pyqt5.qtwebkit,\n    espeak-ng,\n    pyqt5-dev-tools,\n    gstreamer1.0-tools,\n    espeak,\n    sound-theme-freedesktop,\n    python3-poppler-qt5"
 YAPPS_RUNTIME="python3-yapps"
 DEBHELPER="debhelper (>= 12)"
 COMPAT="12"

diff --git a/docs/po4a.cfg b/docs/po4a.cfg
@@ -48,6 +48,7 @@
 [type: AsciiDoc_def] src/drivers/ax5214h.adoc $lang:src/$lang/drivers/ax5214h.adoc
 [type: AsciiDoc_def] src/drivers/gm.adoc $lang:src/$lang/drivers/gm.adoc
 [type: AsciiDoc_def] src/drivers/gs2.adoc $lang:src/$lang/drivers/gs2.adoc
+[type: AsciiDoc_def] src/drivers/hal_pi_gpio.adoc $lang:src/$lang/drivers/hal_pi_gpio.adoc
 [type: AsciiDoc_def] src/drivers/hostmot2.adoc $lang:src/$lang/drivers/hostmot2.adoc
 [type: AsciiDoc_def] src/drivers/mb2hal.adoc $lang:src/$lang/drivers/mb2hal.adoc
 [type: AsciiDoc_def] src/drivers/mitsub-vfd.adoc $lang:src/$lang/drivers/mitsub-vfd.adoc