Skip to content

Commit bd96ca8

Browse files
committed
Merge branch '2.9'
2 parents ddcf703 + aa39548 commit bd96ca8

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

debian/changelog

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,15 @@ linuxcnc (1:2.10.0~pre0) UNRELEASED; urgency=medium
55

66
-- andypugh <andy@bodgesoc.org> Mon, 22 Sep 2025 22:55:20 +0100
77

8+
linuxcnc (1:2.9.7) bookworm; urgency=low
9+
10+
* [ci] publish releases with artifacts - GitHub now builds release debs
11+
* Revert 7d9ee66 to address #3583 - halui functions stop working in 2.9.5/6
12+
* Merge pull request #3512 from Sigma1912/patch-1
13+
* Gmoccapy: Fix arrow key up/down bug in tooleditor
14+
15+
-- andypugh <andy@bodgesoc.org> Wed, 22 Oct 2025 23:43:13 +0100
16+
817
linuxcnc (1:2.9.6) UNRELEASED; urgency=medium
918

1019
* qtvcp -Qt5_graphics: issue 2753; preview wrongly uses INI startup code

debian/control.top.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ Build-Depends:
1212
@KERNEL_HEADERS@,
1313
@MODUTILS_DEPENDS@,
1414
@EXTRA_BUILD@,
15-
docbook-xsl <!nodocs>,
15+
docbook-xsl <!nodoc>,
1616
asciidoc,
17-
ghostscript <!nodocs>,
18-
groff-base <!nodocs>,
19-
imagemagick <!nodocs>,
20-
asciidoc-dblatex <!nodocs>,
17+
ghostscript <!nodoc>,
18+
groff-base <!nodoc>,
19+
imagemagick <!nodoc>,
20+
asciidoc-dblatex <!nodoc>,
2121
autoconf,
2222
automake,
2323
bwidget (>= 1.7),
@@ -37,7 +37,7 @@ Build-Depends:
3737
libxmu-dev,
3838
netcat-traditional | netcat-openbsd | netcat,
3939
netpbm,
40-
po4a <!nodocs>,
40+
po4a <!nodoc>,
4141
procps,
4242
psmisc,
4343
python3,

debian/copyright

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Comment:
1111
(L)GPL must locate the original EMC1 code - they may NOT use LinuxCNC.
1212

1313
Files: *
14-
Copyright: 2004-2022 The LinuxCNC Developers and notably
14+
Copyright: 2004-2025 The LinuxCNC Developers and notably
1515
.
1616
EMC: Derived from a work by Fred Proctor & Will Shackleford
1717
1996-2002 Ben Bederson

0 commit comments

Comments
 (0)