Skip to content

debian/control: Fix License header & show Volker's copyright#2325

Merged
hoffie merged 2 commits intojamulussoftware:masterfrom
hoffie:debian-control-license-and-corrados
Feb 1, 2022
Merged

debian/control: Fix License header & show Volker's copyright#2325
hoffie merged 2 commits intojamulussoftware:masterfrom
hoffie:debian-control-license-and-corrados

Conversation

@hoffie
Copy link
Copy Markdown
Member

@hoffie hoffie commented Jan 30, 2022

Short description of changes

@trebmuh pointed out in #2321 (comment) that we should probably keep Volker listed as Copyright holder in the debian/control file for the past years. I struggled what years to put in, but came up with the following:

Copyright:
 2021-2022 The Jamulus Development Team and contributors
 2004-2021 Volker Fischer and contributors

I hope that this addresses all concerns.
2004 was the begin of Jamulus according to main.cpp.
2021 was when Volker left and the Jamulus Development Team took over.
and contributors hopefully covers the fact that both in previous times and nowadays lots of code is provided by individual contributors. That would hopefully cover @pljones's early contributions, as well as @corrados' recent contribution.

This PR also fixes the License: field, which stated GPL-2, while it should be GPL-2 or later according to the file header (e.g. src/main.cpp). The proper tag for that is GPL-2+.

Context: Fixes an issue?

#2321 (comment)

Does this change need documentation? What needs to be documented and how?

No.
CHANGELOG: SKIP

Status of this Pull Request

Ready.

What is missing until this pull request can be merged?

/

Checklist

  • I've verified that this Pull Request follows the general code principles
  • I tested my code and it does what I want
  • My code follows the style guide
  • I waited some time after this Pull Request was opened and all GitHub checks completed without errors.
  • I've filled all the content above

@hoffie hoffie added this to the Release 3.8.2 milestone Jan 30, 2022
@hoffie hoffie requested review from pljones and trebmuh January 30, 2022 23:19
@trebmuh
Copy link
Copy Markdown
Member

trebmuh commented Jan 31, 2022

LGTM

@@ -10,4 +10,4 @@ for file in $(find android ios linux mac src windows -regex '.*\.\(cpp\|h\|mm\)'
sed -re 's/(\*.*Copyright.*[^-][0-9]{4})(\s*-\s*\b[0-9]{4})?\s*$/\1-'"${YEAR}"'/' -i "${file}"
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here and line 6 are also brought into question, perhaps?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean the regexp? I've adjusted the other instance because it's a different format (multi-line value in debian/control)

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just meant does the same reasoning - splitting the Copyright line - also apply to the file headers on the source, as well as the debian copyright message. I'm not sure most of them credit the contributors (although I've tended to add myself).

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, yeah.
I've also thought about those multiple times, but didn't come to a good solution.

Yes, most contributors are missing.

  • We could add everyone based on git history, but this will get out of hands. src/utils.cpp would show 33 author lines, from a quick glance (git log --format='format:%an' src/util.cpp | sort -u | wc -).
  • Listing only Volker tends to become less valid over time.
  • Dropping authors altogether and listing them somewhere else instead (src/utils.cpp does) would also imply to drop Volker's name, which does not sound nice to me.
  • Maybe a compromise would be Volker Fischer, The Jamulus Development Team and contributors?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably worth raising as a separate issue for now.

Copy link
Copy Markdown
Member

@softins softins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me

@hoffie hoffie merged commit 691cc9c into jamulussoftware:master Feb 1, 2022
@hoffie hoffie mentioned this pull request Feb 1, 2022
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants