Skip to content

Commit 1e441b5

Browse files
authored
Merge pull request #3010 from petterreinholdtsen/deb-closer-to-debian
Adjust how files are distributed into binary packages.
2 parents 95dc30a + b8f15f4 commit 1e441b5

File tree

4 files changed

+107
-2
lines changed

4 files changed

+107
-2
lines changed

debian/configure

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ subst control.main-pkg.in >> control
181181

182182
subst linuxcnc.install.in > ${MAIN_PACKAGE_NAME}.install
183183
subst linuxcnc.lintian-overrides.in > ${MAIN_PACKAGE_NAME}.lintian-overrides
184+
subst linuxcnc.manpages.in > ${MAIN_PACKAGE_NAME}.manpages
184185

185186
subst rules.in > rules
186187
chmod +x rules

debian/linuxcnc-uspace-dev.install

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,3 @@ usr/lib/liblinuxcnc.a
55
usr/lib/*.so
66
usr/share/linuxcnc/Makefile.modinc
77
usr/share/linuxcnc/mesa_modbus.c.tmpl
8-
usr/share/man/man1/halcompile.1
9-
usr/share/man/man3
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
usr/share/man/man1/halcompile.1
2+
usr/share/man/man3/*

debian/linuxcnc.manpages.in

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
usr/share/man/man1/halmeter.1
2+
usr/share/man/man1/simulate_probe.1
3+
usr/share/man/man1/linuxcnc_info.1
4+
usr/share/man/man1/pyvcp.1
5+
usr/share/man/man1/gremlin_view.1
6+
usr/share/man/man1/linuxcnc_var.1
7+
usr/share/man/man1/hbmgui.1
8+
usr/share/man/man1/shuttle.1
9+
usr/share/man/man1/xhc-whb04b-6.1
10+
usr/share/man/man1/xhc-hb04.1
11+
usr/share/man/man1/scaragui.1
12+
usr/share/man/man1/halui.1
13+
usr/share/man/man1/halrmt.1
14+
usr/share/man/man1/sim-torch.1
15+
usr/share/man/man1/latency-histogram.1
16+
usr/share/man/man1/pyui.1
17+
usr/share/man/man1/puma560gui.1
18+
usr/share/man/man1/io.1
19+
usr/share/man/man1/touchy.1
20+
usr/share/man/man1/max5gui.1
21+
usr/share/man/man1/mdi.1
22+
usr/share/man/man1/linuxcncrsh.1
23+
usr/share/man/man1/halrun.1
24+
usr/share/man/man1/inivar.1
25+
usr/share/man/man1/hal-histogram.1
26+
usr/share/man/man1/stepconf.1
27+
usr/share/man/man1/gladevcp.1
28+
usr/share/man/man1/thermistor.1
29+
usr/share/man/man1/iov2.1
30+
usr/share/man/man1/panelui.1
31+
usr/share/man/man1/gmoccapy.1
32+
usr/share/man/man1/image-to-gcode.1
33+
usr/share/man/man1/mdro.1
34+
usr/share/man/man1/sendkeys.1
35+
usr/share/man/man1/xyzac-trt-gui.1
36+
usr/share/man/man1/axis-remote.1
37+
usr/share/man/man1/linuxcnc_module_helper.1
38+
usr/share/man/man1/scorbot-er-3.1
39+
usr/share/man/man1/monitor-xhc-hb04.1
40+
usr/share/man/man1/moveoff_gui.1
41+
usr/share/man/man1/qtplasmac-plasmac2qt.1
42+
usr/share/man/man1/gladevcp_demo.1
43+
usr/share/man/man1/xhc-hb04-accels.1
44+
usr/share/man/man1/linuxcnclcd.1
45+
usr/share/man/man1/halreport.1
46+
usr/share/man/man1/qtplasmac-cfg2prefs.1
47+
usr/share/man/man1/maho600gui.1
48+
usr/share/man/man1/hy_vfd.1
49+
usr/share/man/man1/svd-ps_vfd.1
50+
usr/share/man/man1/gs2_vfd.1
51+
usr/share/man/man1/haltcl.1
52+
usr/share/man/man1/qtvcp.1
53+
usr/share/man/man1/rotarydelta.1
54+
usr/share/man/man1/rs274.1
55+
usr/share/man/man1/halsampler.1
56+
usr/share/man/man1/milltask.1
57+
usr/share/man/man1/debuglevel.1
58+
usr/share/man/man1/linuxcnc.1
59+
usr/share/man/man1/vfs11_vfd.1
60+
usr/share/man/man1/update_ini.1
61+
usr/share/man/man1/pumagui.1
62+
usr/share/man/man1/halcmd.1
63+
usr/share/man/man1/lineardelta.1
64+
usr/share/man/man1/tooledit.1
65+
usr/share/man/man1/halstreamer.1
66+
usr/share/man/man1/rtapi_app.1
67+
usr/share/man/man1/linuxcncmkdesktop.1
68+
usr/share/man/man1/linuxcncsvr.1
69+
usr/share/man/man1/pi500_vfd.1
70+
usr/share/man/man1/gscreen.1
71+
usr/share/man/man1/motion-logger.1
72+
usr/share/man/man1/pncconf.1
73+
usr/share/man/man1/schedrmt.1
74+
usr/share/man/man1/5axisgui.1
75+
usr/share/man/man1/emccalib.1
76+
usr/share/man/man1/pyngcgui.1
77+
usr/share/man/man1/hexagui.1
78+
usr/share/man/man1/axis.1
79+
usr/share/man/man1/pyvcp_demo.1
80+
usr/share/man/man1/halcmd_twopass.1
81+
usr/share/man/man1/vfdb_vfd.1
82+
usr/share/man/man1/hal_manualtoolchange.1
83+
usr/share/man/man1/linuxcnctop.1
84+
usr/share/man/man1/hy_gt_vfd.1
85+
usr/share/man/man1/halscope.1
86+
usr/share/man/man1/sim_pin.1
87+
usr/share/man/man1/mb2hal.1
88+
usr/share/man/man1/qtplasmac-setup.1
89+
usr/share/man/man1/teach-in.1
90+
usr/share/man/man1/qtplasmac-materials.1
91+
usr/share/man/man1/latency-plot.1
92+
usr/share/man/man1/wj200_vfd.1
93+
usr/share/man/man1/pmx485-test.1
94+
usr/share/man/man1/mqtt-publisher.1
95+
usr/share/man/man1/ngcgui.1
96+
usr/share/man/man1/pmx485.1
97+
usr/share/man/man1/iocontrol.1
98+
usr/share/man/man1/hal_input.1
99+
usr/share/man/man1/latency-test.1
100+
usr/share/man/man1/xyzbc-trt-gui.1
101+
usr/share/man/man1/halshow.1
102+
usr/share/man/man1/mitsub_vfd.1
103+
usr/share/man/man1/elbpcom.1
104+
usr/share/man/man9/*

0 commit comments

Comments
 (0)