Skip to content

Switch to GPLv3+ #567

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.

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
merged 1 commit into from
Dec 18, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
899 changes: 617 additions & 282 deletions LICENSE.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion make_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#
# This program 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
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/action/action_mapping.vala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/action/link_action.vala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/action/movie.vala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/config_file_reader.vala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/dbus_server.vala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/drawings/drawing.vala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/drawings/storage.vala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/metadata/pdf.vala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/metadata/xml.vala
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/options.vala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/presentation_controller.vala
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/renderer/cache.vala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/renderer/pdf.vala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/timer_label.vala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/view/behaviour/base.vala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/view/behaviour/pdf_link.vala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/view/markdown.vala
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/view/pdf.vala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/view/transition_manager.vala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/view/video.vala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/window/fullscreen.vala
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/window/overview.vala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/window/presentation.vala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/classes/window/presenter.vala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/display_backend.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/display_backend.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
2 changes: 1 addition & 1 deletion src/interfaces/controllable.vala
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down
4 changes: 2 additions & 2 deletions src/pdfpc.vala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* This program 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
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
Expand Down Expand Up @@ -155,7 +155,7 @@ namespace pdfpc {
private void print_version() {
GLib.print("pdfpc v4.5pre\n"
+ "Copyright (C) 2010-2020 see CONTRIBUTORS\n\n"
+ "License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl-2.0.html>.\n"
+ "License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>.\n"
+ "This is free software: you are free to change and redistribute it.\n"
+ "There is NO WARRANTY, to the extent permitted by law.\n");
}
Expand Down