Bug#1055493: [Emc-developers] Bug#1055493: linuxcnc-uspace, linuxcnc-uspace-dev: both packages ship the manpages
Control: tags -1 + patch Here is a patch to fix it. diff --git a/debian/linuxcnc-uspace-dev.install b/debian/linuxcnc-uspace-dev.install index b7f6d14..199dae9 100644 --- a/debian/linuxcnc-uspace-dev.install +++ b/debian/linuxcnc-uspace-dev.install @@ -5,5 +5,3 @@ usr/lib/liblinuxcnc.a usr/lib/*.so usr/share/linuxcnc/Makefile.modinc usr/share/linuxcnc/mesa_modbus.c.tmpl -usr/share/man/man1/halcompile.1 -usr/share/man/man3 diff --git a/debian/linuxcnc-uspace-dev.manpages b/debian/linuxcnc-uspace-dev.manpages new file mode 100644 index 000..1186966 --- /dev/null +++ b/debian/linuxcnc-uspace-dev.manpages @@ -0,0 +1 @@ +usr/share/man/man3/* diff --git a/debian/linuxcnc-uspace.install b/debian/linuxcnc-uspace.install index acd44f5..55afb46 100644 --- a/debian/linuxcnc-uspace.install +++ b/debian/linuxcnc-uspace.install @@ -144,112 +144,6 @@ 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/man9 - usr/share/qtvcp src/emc/usr_intf/axis/etcusr/share/doc/linuxcnc-uspace/axis diff --git a/debian/linuxcnc-uspace.manpages b/debian/linuxcnc-uspace.manpages index 61c7f01..7ffb473 100644 --- a/debian/linuxcnc-uspace.manpages +++ b/debian/linuxcnc-uspace.manpages @@ -1,3 +1,2 @@ usr/share/man/man1/* -usr/share/man/man3/* usr/share/man/man9/* -- Happy hacking Petter Reinholdtsen
Bug#1055493: [Emc-developers] Bug#1055493: linuxcnc-uspace, linuxcnc-uspace-dev: both packages ship the manpages
On Wed, 20 Dec 2023 at 01:06, andy pugh wrote: > > On Mon, 18 Dec 2023 at 18:31, Sudip Mukherjee > 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 " 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 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
Bug#1055493: [Emc-developers] Bug#1055493: linuxcnc-uspace, linuxcnc-uspace-dev: both packages ship the manpages
On Mon, 18 Dec 2023 at 18:31, Sudip Mukherjee 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 -- atp "A motorcycle is a bicycle with a pandemonium attachment and is designed for the especial use of mechanical geniuses, daredevils and lunatics." — George Fitch, Atlanta Constitution Newspaper, 1912
Bug#1055493: [Emc-developers] Bug#1055493: linuxcnc-uspace, linuxcnc-uspace-dev: both packages ship the manpages
On Tue, Nov 07, 2023 at 11:06:01AM +, andy pugh wrote: > On Tue, 7 Nov 2023 at 10:45, Andreas Beckmann wrote: > > > > Package: linuxcnc-uspace,linuxcnc-uspace-dev > > Version: 2.9.1-2 > > Severity: serious > > User: debian...@lists.debian.org > > Usertags: piuparts > > > > Hi, > > > > during a test with piuparts I noticed your package failed to install > > because it tries to overwrite other packages files: > > I assume that this could be fixed by deleting the last line here: > https://github.com/LinuxCNC/linuxcnc/blob/2.9/debian/linuxcnc-uspace-dev.install > > 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 -- Regards Sudip
Bug#1055493: [Emc-developers] Bug#1055493: linuxcnc-uspace, linuxcnc-uspace-dev: both packages ship the manpages
On Tue, 7 Nov 2023 at 10:45, Andreas Beckmann wrote: > > Package: linuxcnc-uspace,linuxcnc-uspace-dev > Version: 2.9.1-2 > Severity: serious > User: debian...@lists.debian.org > Usertags: piuparts > > Hi, > > during a test with piuparts I noticed your package failed to install > because it tries to overwrite other packages files: I assume that this could be fixed by deleting the last line here: https://github.com/LinuxCNC/linuxcnc/blob/2.9/debian/linuxcnc-uspace-dev.install 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) -- atp "A motorcycle is a bicycle with a pandemonium attachment and is designed for the especial use of mechanical geniuses, daredevils and lunatics." — George Fitch, Atlanta Constitution Newspaper, 1912