[Scummvm-git-logs] scummvm master -> 7ef9247637b412b36301fbf0b65e776c79025b43

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
7ef9247637 BACKENDS: Restore original Cabal license header when quoting it


Commit: 7ef9247637b412b36301fbf0b65e776c79025b43
    https://github.com/scummvm/scummvm/commit/7ef9247637b412b36301fbf0b65e776c79025b43
Author: Donovan Watteau (contrib at dwatteau.fr)
Date: 2022-11-05T22:04:30+01:00

Commit Message:
BACKENDS: Restore original Cabal license header when quoting it

Our derivate work remains GPLv3+, since the original allowed it thanks
to its GPLv2+ license, but when we quote the original license we can't
(and shouldn't) change the fact that it was GPLv2+.

Changed paths:
    backends/audiocd/audiocd-stream.cpp
    backends/audiocd/audiocd-stream.h
    backends/audiocd/linux/linux-audiocd.cpp
    backends/audiocd/linux/linux-audiocd.h
    backends/audiocd/macosx/macosx-audiocd.cpp
    backends/audiocd/macosx/macosx-audiocd.h
    backends/audiocd/win32/win32-audiocd.cpp
    backends/audiocd/win32/win32-audiocd.h


diff --git a/backends/audiocd/audiocd-stream.cpp b/backends/audiocd/audiocd-stream.cpp
index dc2ebb6438e..7f1c5ea78be 100644
--- a/backends/audiocd/audiocd-stream.cpp
+++ b/backends/audiocd/audiocd-stream.cpp
@@ -27,7 +27,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 3 of the License, or
+ * the Free Software Foundation, either version 2 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/backends/audiocd/audiocd-stream.h b/backends/audiocd/audiocd-stream.h
index dc0fa7b1a01..f50c4ed8552 100644
--- a/backends/audiocd/audiocd-stream.h
+++ b/backends/audiocd/audiocd-stream.h
@@ -27,7 +27,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 3 of the License, or
+ * the Free Software Foundation, either version 2 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/backends/audiocd/linux/linux-audiocd.cpp b/backends/audiocd/linux/linux-audiocd.cpp
index b8fe861cd79..6f837e78e7f 100644
--- a/backends/audiocd/linux/linux-audiocd.cpp
+++ b/backends/audiocd/linux/linux-audiocd.cpp
@@ -27,7 +27,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 3 of the License, or
+ * the Free Software Foundation, either version 2 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/backends/audiocd/linux/linux-audiocd.h b/backends/audiocd/linux/linux-audiocd.h
index 6a8a44aceed..3e7f0264df8 100644
--- a/backends/audiocd/linux/linux-audiocd.h
+++ b/backends/audiocd/linux/linux-audiocd.h
@@ -27,7 +27,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 3 of the License, or
+ * the Free Software Foundation, either version 2 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/backends/audiocd/macosx/macosx-audiocd.cpp b/backends/audiocd/macosx/macosx-audiocd.cpp
index c05a0f549f0..511c43f2b34 100644
--- a/backends/audiocd/macosx/macosx-audiocd.cpp
+++ b/backends/audiocd/macosx/macosx-audiocd.cpp
@@ -27,7 +27,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 3 of the License, or
+ * the Free Software Foundation, either version 2 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/backends/audiocd/macosx/macosx-audiocd.h b/backends/audiocd/macosx/macosx-audiocd.h
index 030bd9e01b3..2401366bc8f 100644
--- a/backends/audiocd/macosx/macosx-audiocd.h
+++ b/backends/audiocd/macosx/macosx-audiocd.h
@@ -27,7 +27,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 3 of the License, or
+ * the Free Software Foundation, either version 2 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/backends/audiocd/win32/win32-audiocd.cpp b/backends/audiocd/win32/win32-audiocd.cpp
index 848de684906..87b66e426fe 100644
--- a/backends/audiocd/win32/win32-audiocd.cpp
+++ b/backends/audiocd/win32/win32-audiocd.cpp
@@ -27,7 +27,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 3 of the License, or
+ * the Free Software Foundation, either version 2 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/backends/audiocd/win32/win32-audiocd.h b/backends/audiocd/win32/win32-audiocd.h
index c07993fd05f..95f21aa56e5 100644
--- a/backends/audiocd/win32/win32-audiocd.h
+++ b/backends/audiocd/win32/win32-audiocd.h
@@ -27,7 +27,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 3 of the License, or
+ * the Free Software Foundation, either version 2 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,