Switch to GPLv3+

fnevgeny · AndreasBilke · commit 2a2c9b71467d · 2020-12-18T20:26:34.000+01:00
diff --git a/LICENSE.txt b/LICENSE.txt
diff --git a/make_release.sh b/make_release.sh
@@ -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,
diff --git a/src/classes/action/action_mapping.vala b/src/classes/action/action_mapping.vala
@@ -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,
diff --git a/src/classes/action/link_action.vala b/src/classes/action/link_action.vala
@@ -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,
diff --git a/src/classes/action/movie.vala b/src/classes/action/movie.vala
@@ -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,
diff --git a/src/classes/config_file_reader.vala b/src/classes/config_file_reader.vala
@@ -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,
diff --git a/src/classes/dbus_server.vala b/src/classes/dbus_server.vala
@@ -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,
diff --git a/src/classes/drawings/drawing.vala b/src/classes/drawings/drawing.vala
@@ -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,
diff --git a/src/classes/drawings/storage.vala b/src/classes/drawings/storage.vala
@@ -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,
diff --git a/src/classes/metadata/pdf.vala b/src/classes/metadata/pdf.vala
@@ -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,
diff --git a/src/classes/metadata/xml.vala b/src/classes/metadata/xml.vala
@@ -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,
diff --git a/src/classes/options.vala b/src/classes/options.vala
@@ -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,
diff --git a/src/classes/presentation_controller.vala b/src/classes/presentation_controller.vala
@@ -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,
diff --git a/src/classes/renderer/cache.vala b/src/classes/renderer/cache.vala
@@ -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,
diff --git a/src/classes/renderer/pdf.vala b/src/classes/renderer/pdf.vala
@@ -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,
diff --git a/src/classes/timer_label.vala b/src/classes/timer_label.vala
@@ -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,
diff --git a/src/classes/view/behaviour/base.vala b/src/classes/view/behaviour/base.vala
@@ -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,
diff --git a/src/classes/view/behaviour/pdf_link.vala b/src/classes/view/behaviour/pdf_link.vala
@@ -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,
diff --git a/src/classes/view/markdown.vala b/src/classes/view/markdown.vala
@@ -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,
diff --git a/src/classes/view/pdf.vala b/src/classes/view/pdf.vala
@@ -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,
diff --git a/src/classes/view/transition_manager.vala b/src/classes/view/transition_manager.vala
@@ -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,
diff --git a/src/classes/view/video.vala b/src/classes/view/video.vala
@@ -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,
diff --git a/src/classes/window/fullscreen.vala b/src/classes/window/fullscreen.vala
@@ -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,
diff --git a/src/classes/window/overview.vala b/src/classes/window/overview.vala
@@ -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,
diff --git a/src/classes/window/presentation.vala b/src/classes/window/presentation.vala
@@ -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,
diff --git a/src/classes/window/presenter.vala b/src/classes/window/presenter.vala
@@ -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,
diff --git a/src/display_backend.c b/src/display_backend.c
@@ -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,
diff --git a/src/display_backend.h b/src/display_backend.h
@@ -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,
diff --git a/src/interfaces/controllable.vala b/src/interfaces/controllable.vala
@@ -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,
diff --git a/src/pdfpc.vala b/src/pdfpc.vala
@@ -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,
@@ -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");
         }

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`#`
`7`	`7`	`# This program is free software; you can redistribute it and/or modify`
`8`	`8`	`# it under the terms of the GNU General Public License as published by`
`9`		`-# the Free Software Foundation; either version 2 of the License, or`
	`9`	`+# the Free Software Foundation; either version 3 of the License, or`
`10`	`10`	`# (at your option) any later version.`
`11`	`11`	`#`
`12`	`12`	`# This program is distributed in the hope that it will be useful,`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`* This program is free software; you can redistribute it and/or modify`
`9`	`9`	`* it under the terms of the GNU General Public License as published by`
`10`		`- * the Free Software Foundation; either version 2 of the License, or`
	`10`	`+ * the Free Software Foundation; either version 3 of the License, or`
`11`	`11`	`* (at your option) any later version.`
`12`	`12`	`*`
`13`	`13`	`* This program is distributed in the hope that it will be useful,`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`* This program is free software; you can redistribute it and/or modify`
`10`	`10`	`* it under the terms of the GNU General Public License as published by`
`11`		`- * the Free Software Foundation; either version 2 of the License, or`
	`11`	`+ * the Free Software Foundation; either version 3 of the License, or`
`12`	`12`	`* (at your option) any later version.`
`13`	`13`	`*`
`14`	`14`	`* This program is distributed in the hope that it will be useful,`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`*`
`12`	`12`	`* This program is free software; you can redistribute it and/or modify`
`13`	`13`	`* it under the terms of the GNU General Public License as published by`
`14`		`- * the Free Software Foundation; either version 2 of the License, or`
	`14`	`+ * the Free Software Foundation; either version 3 of the License, or`
`15`	`15`	`* (at your option) any later version.`
`16`	`16`	`*`
`17`	`17`	`* This program is distributed in the hope that it will be useful,`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`*`
`18`	`18`	`* This program is free software; you can redistribute it and/or modify`
`19`	`19`	`* it under the terms of the GNU General Public License as published by`
`20`		`- * the Free Software Foundation; either version 2 of the License, or`
	`20`	`+ * the Free Software Foundation; either version 3 of the License, or`
`21`	`21`	`* (at your option) any later version.`
`22`	`22`	`*`
`23`	`23`	`* This program is distributed in the hope that it will be useful,`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`*`
`10`	`10`	`* This program is free software; you can redistribute it and/or modify`
`11`	`11`	`* it under the terms of the GNU General Public License as published by`
`12`		`- * the Free Software Foundation; either version 2 of the License, or`
	`12`	`+ * the Free Software Foundation; either version 3 of the License, or`
`13`	`13`	`* (at your option) any later version.`
`14`	`14`	`*`
`15`	`15`	`* This program is distributed in the hope that it will be useful,`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`*`
`13`	`13`	`* This program is free software; you can redistribute it and/or modify`
`14`	`14`	`* it under the terms of the GNU General Public License as published by`
`15`		`- * the Free Software Foundation; either version 2 of the License, or`
	`15`	`+ * the Free Software Foundation; either version 3 of the License, or`
`16`	`16`	`* (at your option) any later version.`
`17`	`17`	`*`
`18`	`18`	`* This program is distributed in the hope that it will be useful,`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`*`
`17`	`17`	`* This program is free software; you can redistribute it and/or modify`
`18`	`18`	`* it under the terms of the GNU General Public License as published by`
`19`		`- * the Free Software Foundation; either version 2 of the License, or`
	`19`	`+ * the Free Software Foundation; either version 3 of the License, or`
`20`	`20`	`* (at your option) any later version.`
`21`	`21`	`*`
`22`	`22`	`* This program is distributed in the hope that it will be useful,`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`* This program is free software; you can redistribute it and/or modify`
`12`	`12`	`* it under the terms of the GNU General Public License as published by`
`13`		`- * the Free Software Foundation; either version 2 of the License, or`
	`13`	`+ * the Free Software Foundation; either version 3 of the License, or`
`14`	`14`	`* (at your option) any later version.`
`15`	`15`	`*`
`16`	`16`	`* This program is distributed in the hope that it will be useful,`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`* This program is free software; you can redistribute it and/or modify`
`15`	`15`	`* it under the terms of the GNU General Public License as published by`
`16`		`- * the Free Software Foundation; either version 2 of the License, or`
	`16`	`+ * the Free Software Foundation; either version 3 of the License, or`
`17`	`17`	`* (at your option) any later version.`
`18`	`18`	`*`
`19`	`19`	`* This program is distributed in the hope that it will be useful,`