On Wed, 20 Dec 2023 at 01:06, andy pugh <bodge...@gmail.com> wrote:
>
> On Mon, 18 Dec 2023 at 18:31, Sudip Mukherjee
> <sudipm.mukher...@gmail.com> wrote:
>
> > > However I haven't so far worked out why the man3 sections are being
> > > included in the main package installer.
> > > (the commands in man3 are only of interest to developers)
> >
> > From
> > https://sources.debian.org/src/linuxcnc/2.9.1-2/debian/linuxcnc-uspace.manpages/#L2
>
> OK, so where does _that_ file come from? I don't see it in our source
> repository:
> https://github.com/LinuxCNC/linuxcnc-gbp/tree/debian/unstable/debian
I dont think you have this file in your source and even your scripts
to prepare the source are not adding it. It has been added by "Steffen
Moeller <moel...@debian.org>" in 2.9.1-2 version and the changelog
says it was done to address build failure. You might want to check
with him about this.
I am attaching the diff between 2.9.1-1 and 2.9.1-2 for your reference.
--
Regards
Sudip
diff --git a/debian/changelog b/debian/changelog
index e173d46..f432914 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linuxcnc (2.9.1-2) unstable; urgency=medium
+
+ * Addressed build failure.
+
+ -- Steffen Moeller <moel...@debian.org> Sun, 05 Nov 2023 12:59:16 +0100
+
linuxcnc (2.9.1-1) unstable; urgency=medium
* New upstream version 2.9.1
diff --git a/debian/control b/debian/control
index e58c61c..5f25e28 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends:
libgtk2.0-dev,
libgtk-3-dev,
libmodbus-dev (>= 3.0),
- libeditreadline-dev,
+ libeditreadline-dev | libreadline-dev,
libtirpc-dev,
libusb-1.0-0-dev,
libxmu-dev,
diff --git a/debian/linuxcnc-uspace.install b/debian/linuxcnc-uspace.install
index d429141..acd44f5 100644
--- a/debian/linuxcnc-uspace.install
+++ b/debian/linuxcnc-uspace.install
@@ -116,7 +116,7 @@ usr/lib/python3
usr/lib/tcltk
usr/share/axis
-usr/share/glade3
+usr/share/glade
usr/share/gmoccapy
usr/share/gscreen
usr/share/gtksourceview-2.0
@@ -144,111 +144,111 @@ usr/share/linuxcnc/touchy.glade
usr/share/locale
-usr/share/man/man1/5axisgui.1
-usr/share/man/man1/axis.1
-usr/share/man/man1/axis-remote.1
-usr/share/man/man1/debuglevel.1
-usr/share/man/man1/elbpcom.1
-usr/share/man/man1/gladevcp.1
-usr/share/man/man1/gladevcp_demo.1
-usr/share/man/man1/gmoccapy.1
-usr/share/man/man1/gremlin_view.1
-usr/share/man/man1/gs2_vfd.1
-usr/share/man/man1/gscreen.1
-usr/share/man/man1/halcmd.1
-usr/share/man/man1/halcmd_twopass.1
-usr/share/man/man1/hal-histogram.1
-usr/share/man/man1/hal_input.1
-usr/share/man/man1/hal_manualtoolchange.1
-usr/share/man/man1/halmeter.1
-usr/share/man/man1/hal_parport.1
-usr/share/man/man1/halreport.1
-usr/share/man/man1/halrmt.1
-usr/share/man/man1/halrun.1
-usr/share/man/man1/halsampler.1
-usr/share/man/man1/halscope.1
-usr/share/man/man1/halshow.1
-usr/share/man/man1/halstreamer.1
-usr/share/man/man1/haltcl.1
-usr/share/man/man1/halui.1
-usr/share/man/man1/hbmgui.1
-usr/share/man/man1/hexagui.1
-usr/share/man/man1/hy_gt_vfd.1
-usr/share/man/man1/hy_vfd.1
-usr/share/man/man1/image-to-gcode.1
-usr/share/man/man1/inivar.1
-usr/share/man/man1/io.1
-usr/share/man/man1/iocontrol.1
-usr/share/man/man1/iov2.1
-usr/share/man/man1/latency-histogram.1
-usr/share/man/man1/latency-plot.1
-usr/share/man/man1/latency-test.1
-usr/share/man/man1/lineardelta.1
-usr/share/man/man1/linuxcnc.1
-usr/share/man/man1/linuxcnc_info.1
-usr/share/man/man1/linuxcnclcd.1
-usr/share/man/man1/linuxcncmkdesktop.1
-usr/share/man/man1/linuxcnc_module_helper.1
-usr/share/man/man1/linuxcncrsh.1
-usr/share/man/man1/linuxcncsvr.1
-usr/share/man/man1/linuxcnctop.1
-usr/share/man/man1/linuxcnc_var.1
-usr/share/man/man1/maho600gui.1
-usr/share/man/man1/max5gui.1
-usr/share/man/man1/mb2hal.1
-usr/share/man/man1/mdi.1
-usr/share/man/man1/mdro.1
-usr/share/man/man1/milltask.1
-usr/share/man/man1/mitsub_vfd.1
-usr/share/man/man1/monitor-xhc-hb04.1
-usr/share/man/man1/motion-logger.1
-usr/share/man/man1/moveoff_gui.1
-usr/share/man/man1/mqtt-publisher.1
-usr/share/man/man1/ngcgui.1
-usr/share/man/man1/panelui.1
-usr/share/man/man1/pi500_vfd.1
-usr/share/man/man1/pmx485.1
-usr/share/man/man1/pmx485-test.1
-usr/share/man/man1/pncconf.1
-usr/share/man/man1/puma560gui.1
-usr/share/man/man1/pumagui.1
-usr/share/man/man1/pyngcgui.1
-usr/share/man/man1/pyui.1
-usr/share/man/man1/pyvcp.1
-usr/share/man/man1/pyvcp_demo.1
-usr/share/man/man1/qtplasmac-cfg2prefs.1
-usr/share/man/man1/qtplasmac-materials.1
-usr/share/man/man1/qtplasmac-plasmac2qt.1
-usr/share/man/man1/qtplasmac-setup.1
-usr/share/man/man1/qtvcp.1
-usr/share/man/man1/rotarydelta.1
-usr/share/man/man1/rs274.1
-usr/share/man/man1/rtapi_app.1
-usr/share/man/man1/scaragui.1
-usr/share/man/man1/schedrmt.1
-usr/share/man/man1/scorbot-er-3.1
-usr/share/man/man1/sendkeys.1
-usr/share/man/man1/shuttle.1
-usr/share/man/man1/sim_pin.1
-usr/share/man/man1/sim-torch.1
-usr/share/man/man1/simulate_probe.1
-usr/share/man/man1/stepconf.1
-usr/share/man/man1/svd-ps_vfd.1
-usr/share/man/man1/teach-in.1
-usr/share/man/man1/thermistor.1
-usr/share/man/man1/tooledit.1
-usr/share/man/man1/touchy.1
-usr/share/man/man1/update_ini.1
-usr/share/man/man1/vfdb_vfd.1
-usr/share/man/man1/vfs11_vfd.1
-usr/share/man/man1/wj200_vfd.1
-usr/share/man/man1/xhc-hb04.1
-usr/share/man/man1/xhc-hb04-accels.1
-usr/share/man/man1/xhc-whb04b-6.1
-usr/share/man/man1/xyzac-trt-gui.1
-usr/share/man/man1/xyzbc-trt-gui.1
+#usr/share/man/man1/5axisgui.1
+#usr/share/man/man1/axis.1
+#usr/share/man/man1/axis-remote.1
+#usr/share/man/man1/debuglevel.1
+#usr/share/man/man1/elbpcom.1
+#usr/share/man/man1/gladevcp.1
+#usr/share/man/man1/gladevcp_demo.1
+#usr/share/man/man1/gmoccapy.1
+#usr/share/man/man1/gremlin_view.1
+#usr/share/man/man1/gs2_vfd.1
+#usr/share/man/man1/gscreen.1
+#usr/share/man/man1/halcmd.1
+#usr/share/man/man1/halcmd_twopass.1
+#usr/share/man/man1/hal-histogram.1
+#usr/share/man/man1/hal_input.1
+#usr/share/man/man1/hal_manualtoolchange.1
+#usr/share/man/man1/halmeter.1
+#usr/share/man/man1/hal_parport.1
+#usr/share/man/man1/halreport.1
+#usr/share/man/man1/halrmt.1
+#usr/share/man/man1/halrun.1
+#usr/share/man/man1/halsampler.1
+#usr/share/man/man1/halscope.1
+#usr/share/man/man1/halshow.1
+#usr/share/man/man1/halstreamer.1
+#usr/share/man/man1/haltcl.1
+#usr/share/man/man1/halui.1
+#usr/share/man/man1/hbmgui.1
+#usr/share/man/man1/hexagui.1
+#usr/share/man/man1/hy_gt_vfd.1
+#usr/share/man/man1/hy_vfd.1
+#usr/share/man/man1/image-to-gcode.1
+#usr/share/man/man1/inivar.1
+#usr/share/man/man1/io.1
+#usr/share/man/man1/iocontrol.1
+#usr/share/man/man1/iov2.1
+#usr/share/man/man1/latency-histogram.1
+#usr/share/man/man1/latency-plot.1
+#usr/share/man/man1/latency-test.1
+#usr/share/man/man1/lineardelta.1
+#usr/share/man/man1/linuxcnc.1
+#usr/share/man/man1/linuxcnc_info.1
+#usr/share/man/man1/linuxcnclcd.1
+#usr/share/man/man1/linuxcncmkdesktop.1
+#usr/share/man/man1/linuxcnc_module_helper.1
+#usr/share/man/man1/linuxcncrsh.1
+#usr/share/man/man1/linuxcncsvr.1
+#usr/share/man/man1/linuxcnctop.1
+##usr/share/man/man1/linuxcnc_var.1
+#usr/share/man/man1/maho600gui.1
+#usr/share/man/man1/max5gui.1
+#usr/share/man/man1/mb2hal.1
+#usr/share/man/man1/mdi.1
+#usr/share/man/man1/mdro.1
+#usr/share/man/man1/milltask.1
+#usr/share/man/man1/mitsub_vfd.1
+#usr/share/man/man1/monitor-xhc-hb04.1
+#usr/share/man/man1/motion-logger.1
+#usr/share/man/man1/moveoff_gui.1
+#usr/share/man/man1/mqtt-publisher.1
+#usr/share/man/man1/ngcgui.1
+#usr/share/man/man1/panelui.1
+#usr/share/man/man1/pi500_vfd.1
+#usr/share/man/man1/pmx485.1
+#usr/share/man/man1/pmx485-test.1
+#usr/share/man/man1/pncconf.1
+#usr/share/man/man1/puma560gui.1
+#usr/share/man/man1/pumagui.1
+#usr/share/man/man1/pyngcgui.1
+#usr/share/man/man1/pyui.1
+#usr/share/man/man1/pyvcp.1
+#usr/share/man/man1/pyvcp_demo.1
+#usr/share/man/man1/qtplasmac-cfg2prefs.1
+#usr/share/man/man1/qtplasmac-materials.1
+#usr/share/man/man1/qtplasmac-plasmac2qt.1
+#usr/share/man/man1/qtplasmac-setup.1
+#usr/share/man/man1/qtvcp.1
+#usr/share/man/man1/rotarydelta.1
+#usr/share/man/man1/rs274.1
+#usr/share/man/man1/rtapi_app.1
+#usr/share/man/man1/scaragui.1
+#usr/share/man/man1/schedrmt.1
+#usr/share/man/man1/scorbot-er-3.1
+#usr/share/man/man1/sendkeys.1
+#usr/share/man/man1/shuttle.1
+#usr/share/man/man1/sim_pin.1
+#usr/share/man/man1/sim-torch.1
+#usr/share/man/man1/simulate_probe.1
+#usr/share/man/man1/stepconf.1
+#usr/share/man/man1/svd-ps_vfd.1
+#usr/share/man/man1/teach-in.1
+#usr/share/man/man1/thermistor.1
+#usr/share/man/man1/tooledit.1
+#usr/share/man/man1/touchy.1
+#usr/share/man/man1/update_ini.1
+#usr/share/man/man1/vfdb_vfd.1
+#usr/share/man/man1/vfs11_vfd.1
+#usr/share/man/man1/wj200_vfd.1
+#usr/share/man/man1/xhc-hb04.1
+#usr/share/man/man1/xhc-hb04-accels.1
+#usr/share/man/man1/xhc-whb04b-6.1
+#usr/share/man/man1/xyzac-trt-gui.1
+#usr/share/man/man1/xyzbc-trt-gui.1
-usr/share/man/man9
+#usr/share/man/man9
usr/share/qtvcp
diff --git a/debian/linuxcnc-uspace.manpages b/debian/linuxcnc-uspace.manpages
new file mode 100644
index 0000000..61c7f01
--- /dev/null
+++ b/debian/linuxcnc-uspace.manpages
@@ -0,0 +1,3 @@
+usr/share/man/man1/*
+usr/share/man/man3/*
+usr/share/man/man9/*
diff --git a/debian/rules b/debian/rules
index b376048..6ec1de2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,6 +63,12 @@ override_dh_auto_clean:
rm -f Makefile.inc
rm -f src/config.log src/config.status
rm -f $(for i in $(find . -name "*.in"); do basename $i .in; done)
+
+ rm -f scripts/halcmd_twopass scripts/halrun scripts/haltcl scripts/linuxcnc scripts/linuxcnc-checklink scripts/linuxcnc_info scripts/linuxcnc_var scripts/linuxcncmkdesktop scripts/realtime scripts/rip-environment scripts/runtests src/config.guess src/config.sub src/configure src/install-sh lib/libpyplugin.so docs/src/hal/components_gen.adoc
+
+ rm -f lib/python/nf.py scripts/rtapi.conf scripts/setup_designer share/applications/linuxcnc-latency-histogram.desktop share/applications/linuxcnc-latency.desktop share/applications/linuxcnc-pncconf.desktop share/applications/linuxcnc-stepconf.desktop share/applications/linuxcnc.desktop share/desktop-directories/linuxcnc-cnc.directory share/desktop-directories/linuxcnc-doc.directory share/desktop-directories/linuxcnc-ref.directory share/menus/CNC.menu src/Makefile.inc src/Makefile.modinc src/config.h src/config.h.in tcl/linuxcnc.tcl
+
+ rm -f docs/po/cs.po docs/po/da.po docs/po/de.po
dh_clean
diff --git a/debian/shlibs.local b/debian/shlibs.local
new file mode 100644
index 0000000..d7dda96
--- /dev/null
+++ b/debian/shlibs.local
@@ -0,0 +1,9 @@
+liblinuxcnchal 0 linuxcnc-uspace (>= 2.9.1)
+liblinuxcncini 0 linuxcnc-uspace (>= 2.9.1)
+libnml 0 linuxcnc-uspace (>= 2.9.1)
+libposemath 0 linuxcnc-uspace (>= 2.9.1)
+libpyplugin 0 linuxcnc-uspace (>= 2.9.1)
+librs274 0 linuxcnc-uspace (>= 2.9.1)
+libtooldata 0 linuxcnc-uspace (>= 2.9.1)
+libncurses 5 libncurses5 (>= 5.0)
+libpth 20 libpth2 | libpth20
