Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hoffie merged 2 commits into from
Feb 1, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a991b5
Build: debian/control: Use GPL-2+, not GPL-2
hoffie Jan 30, 2022
cf760d9
Docs: debian/control: Properly show Volker's copyright
hoffie Jan 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions distributions/debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,19 @@ Upstream-Contact: The Jamulus Development Team
Source: https://github.com/jamulussoftware/jamulus/

Files: *
Copyright: 2004-2022 The Jamulus Development Team
License: GPL-2
Copyright:
2021-2022 The Jamulus Development Team and contributors
2004-2021 Volker Fischer and contributors
License: GPL-2+

Files: debian/*
Copyright:
2020 Tormod Volden <debian.tormod@gmail.com>
2020 Olivier Humbert <trebmuh@tuxfamily.org>
2019 Marc Landolt jr <debian@marclandolt.ch>
License: GPL-2
License: GPL-2+

License: GPL-2
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
Expand Down
2 changes: 1 addition & 1 deletion tools/update-copyright-notices.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

@pljones pljones Jan 31, 2022

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

@hoffie hoffie Jan 31, 2022

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

@pljones pljones Jan 31, 2022

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

@hoffie hoffie Jan 31, 2022

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

@pljones pljones Feb 1, 2022

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.

done

sed -re 's/(Copyright:\s*[0-9]{4}-)[0-9]{4}/\1'"${YEAR}"'/' -i distributions/debian/copyright
sed -re 's/^( [0-9]{4}-)[0-9]{4}( The Jamulus)/\1'"${YEAR}"'\2/' -i distributions/debian/copyright