Skip to content

Commit 5cfe46b

Browse files
authored
Merge pull request #3808 from smoe/copyright_fixes
Ruckig-motivated adjustments to debian/copyright
2 parents 3ec8e32 + 7eb9739 commit 5cfe46b

2 files changed

Lines changed: 13 additions & 3 deletions

File tree

debian/copyright

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,16 @@ Copyright: 2004-2025 The LinuxCNC Developers and notably
150150
.
151151
Please inspect the logs of the git repository to learn about the >230 (11/2021) committers.
152152
License: GPL-2+
153+
154+
Files: src/emc/tp/ruckig/*
155+
Copyright:
156+
2021-2024 Lars Berscheid
157+
License: Expat
158+
159+
Files: src/emc/tp/ruckig_wrapper.*
160+
Copyright:
161+
2024 杨阳 <mika-net@outlook.com>
162+
License: GPL-2
153163

154164
Files: docs/*
155165
Copyright:
@@ -410,7 +420,7 @@ License: Boost-1.0
410420

411421
Files: debian/linuxcnc-uspace.metainfo.xml
412422
Copyright: 2021 Petter Reinholdtsen <pere@debian.org>
413-
License: MIT
423+
License: Expat
414424

415425
Files: unit_tests/greatest.h
416426
Copyright: 2011-2019 Scott Vokes <vokes.s@gmail.com>
@@ -510,7 +520,7 @@ License: GPL-3+
510520
On Debian systems, the complete text of the GNU General
511521
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
512522

513-
License: MIT
523+
License: Expat
514524
Permission is hereby granted, free of charge, to any person obtaining a copy
515525
of this software and associated documentation files (the "Software"), to deal
516526
in the Software without restriction, including without limitation the rights

src/emc/tp/ruckig_wrapper.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/********************************************************************
2-
* Description: ruckig_wrapper.c
2+
* Description: ruckig_wrapper.cc
33
* Ruckig trajectory planning library wrapper implementation
44
*
55
* This file provides a C wrapper around Ruckig C++ library

0 commit comments

Comments
 (0)