Updated and integrated licenses

stefonarch · stefonarch · commit af271460a539 · 2024-08-29T22:37:49.000+02:00
diff --git a/AUTHORS b/AUTHORS
@@ -4,10 +4,14 @@ Upstream Authors:
 
 Copyright:
     Copyright (c) 2010-2012 Razor team
-    Copyright (c) 2012-2017 LXQt team
+    Copyright (c) 2012-2024 LXQt team
 
-License: GPL-2 and LGPL-2.1+
-The full text of the licenses can be found in the 'LICENSE' file.
+This project is dual-licensed under the GNU General Public License version 2 (GPL-2.0) and the GNU Lesser General Public License version 2.1 or later (LGPL-2.1+).
+
+You may choose to use, distribute, or modify this code under the terms of either license.
+
+- GNU General Public License version 2 (GPL-2.0): see LICENSE
+- GNU Lesser General Public License version 2.1 (LGPL-2.1): see COPYING.LESSER
 
 The lxqt-config-cursor component is based on the "qt-xcurtheme" project
 and is licensed under GPL 2, GPL 3, LGPL-2, LGPL-2.1 and WTFPL 2.
diff --git a/COPYING.LESSER b/COPYING.LESSER
diff --git a/lxqt-config-file-associations/mimetypeitemmodel.cpp b/lxqt-config-file-associations/mimetypeitemmodel.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) Christian Surlykke
+* Copyright (c) 2015 Christian Surlykke
 *
 * This file is part of the LXQt project. <https://lxqt-project.org>
 * It is distributed under the LGPL 2.1 or later license.
diff --git a/lxqt-config-file-associations/mimetypeitemmodel.h b/lxqt-config-file-associations/mimetypeitemmodel.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) Christian Surlykke
+* Copyright (c) 2015 Christian Surlykke
 *
 * This file is part of the LXQt project. <https://lxqt-project.org>
 * It is distributed under the LGPL 2.1 or later license.
diff --git a/lxqt-config-input/keyboardlayoutconfig.cpp b/lxqt-config-input/keyboardlayoutconfig.cpp
@@ -1,6 +1,6 @@
 /*
- * <one line to give the library's name and an idea of what it does.>
- * Copyright (C) 2014  <copyright holder> <email>
+ * Copyright (C) 2014 LXQt Team
+ * This file is part of the LXQt project. <https://lxqt-project.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/lxqt-config-input/keyboardlayoutconfig.h b/lxqt-config-input/keyboardlayoutconfig.h
@@ -1,6 +1,6 @@
 /*
- * <one line to give the library's name and an idea of what it does.>
- * Copyright (C) 2014  <copyright holder> <email>
+ * Copyright (C) 2014  LXQt Team
+ * This file is part of the LXQt project. <https://lxqt-project.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/lxqt-config-input/keyboardlayoutinfo.h b/lxqt-config-input/keyboardlayoutinfo.h
@@ -1,6 +1,6 @@
 /*
- * <one line to give the library's name and an idea of what it does.>
- * Copyright (C) 2014  <copyright holder> <email>
+ * Copyright (C) 2014  LXQt Team
+ * This file is part of the LXQt project. <https://lxqt-project.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/lxqt-config-input/lxqt-config-input.cpp b/lxqt-config-input/lxqt-config-input.cpp
@@ -1,5 +1,7 @@
 /*
     Copyright (C) 2013-2014  Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+    Copyright (c) 2015-2024 LXQt Team.
+    This file is part of the LXQt project. <https://lxqt-project.org>
 
     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
diff --git a/lxqt-config-input/lxqt-config-input.h b/lxqt-config-input/lxqt-config-input.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) LXQt contributors.
+* Copyright (c) 2015-2024 LXQt Team.
 *
 * This file is part of the LXQt project. <https://lxqt-project.org>
 * It is distributed under the LGPL 2.1 or later license.
diff --git a/lxqt-config-input/selectkeyboardlayoutdialog.cpp b/lxqt-config-input/selectkeyboardlayoutdialog.cpp
@@ -1,6 +1,7 @@
 /*
  * <one line to give the library's name and an idea of what it does.>
- * Copyright (C) 2014  <copyright holder> <email>
+ * Copyright (C) 2014  LXQt Project
+ * This file is part of the LXQt project. <https://lxqt-project.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/lxqt-config-input/selectkeyboardlayoutdialog.h b/lxqt-config-input/selectkeyboardlayoutdialog.h
@@ -1,6 +1,6 @@
 /*
- * <one line to give the library's name and an idea of what it does.>
- * Copyright (C) 2014  <copyright holder> <email>
+ * Copyright (C) 2014 -2024 LXQt Team
+ * This file is part of the LXQt project. <https://lxqt-project.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/lxqt-config-monitor/LICENSE b/lxqt-config-monitor/LICENSE
diff --git a/lxqt-config-monitor/monitorsettingsdialog.cpp b/lxqt-config-monitor/monitorsettingsdialog.cpp
@@ -1,6 +1,6 @@
 /*
+    Copyright (C) 2013  Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
     Copyright (C) 2014  P.L. Lucas <selairi@gmail.com>
-    Copyright (C) 2013  <copyright holder> <email>
 
     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
diff --git a/lxqt-config-monitor/monitorsettingsdialog.h b/lxqt-config-monitor/monitorsettingsdialog.h
@@ -1,6 +1,6 @@
 /*
+    Copyright (C) 2013  Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
     Copyright (C) 2014  P.L. Lucas <selairi@gmail.com>
-    Copyright (C) 2013  <copyright holder> <email>
 
     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
diff --git a/lxqt-config-monitor/timeoutdialog.cpp b/lxqt-config-monitor/timeoutdialog.cpp
@@ -1,6 +1,6 @@
 /*
- * <one line to give the library's name and an idea of what it does.>
- * Copyright (C) 2014  PCMan <email>
+ *
+ * Copyright (C) 2014  Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/lxqt-config-monitor/timeoutdialog.h b/lxqt-config-monitor/timeoutdialog.h
@@ -1,6 +1,5 @@
 /*
- * <one line to give the library's name and an idea of what it does.>
- * Copyright (C) 2014  PCMan <email>
+ * Copyright (C) 2013  Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/src/main.cpp b/src/main.cpp
@@ -1,5 +1,4 @@
 /* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
  *
  * LXQt - a lightweight, Qt based, desktop toolset
  * https://lxqt-project.org
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -1,5 +1,4 @@
 /* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
  *
  * LXQt - a lightweight, Qt based, desktop toolset
  * https://lxqt-project.org
diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -1,5 +1,4 @@
 /* BEGIN_COMMON_COPYRIGHT_HEADER
- * (c)LGPL2+
  *
  * LXQt - a lightweight, Qt based, desktop toolset
  * https://lxqt-project.org

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`-* Copyright (c) Christian Surlykke`
	`2`	`+* Copyright (c) 2015 Christian Surlykke`
`3`	`3`	`*`
`4`	`4`	`* This file is part of the LXQt project. <https://lxqt-project.org>`
`5`	`5`	`* It is distributed under the LGPL 2.1 or later license.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/*`
`2`		`- * <one line to give the library's name and an idea of what it does.>`
`3`		`- * Copyright (C) 2014 <copyright holder> <email>`
	`2`	`+ * Copyright (C) 2014 LXQt Team`
	`3`	`+ * This file is part of the LXQt project. <https://lxqt-project.org>`
`4`	`4`	`*`
`5`	`5`	`* This library is free software; you can redistribute it and/or`
`6`	`6`	`* modify it under the terms of the GNU Lesser General Public`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`-* Copyright (c) LXQt contributors.`
	`2`	`+* Copyright (c) 2015-2024 LXQt Team.`
`3`	`3`	`*`
`4`	`4`	`* This file is part of the LXQt project. <https://lxqt-project.org>`
`5`	`5`	`* It is distributed under the LGPL 2.1 or later license.`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`/*`
`2`	`2`	`* <one line to give the library's name and an idea of what it does.>`
`3`		`- * Copyright (C) 2014 <copyright holder> <email>`
	`3`	`+ * Copyright (C) 2014 LXQt Project`
	`4`	`+ * This file is part of the LXQt project. <https://lxqt-project.org>`
`4`	`5`	`*`
`5`	`6`	`* This library is free software; you can redistribute it and/or`
`6`	`7`	`* modify it under the terms of the GNU Lesser General Public`
-Original file line number
+Diff line change
@@ @@ -1,6 +1,6 @@ @@
 /*
 +    Copyright (C) 2013  Hong Jen Yee (PCMan) <[email protected]>
     Copyright (C) 2014  P.L. Lucas <[email protected]>
 -    Copyright (C) 2013  <copyright holder> <email>
     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
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * <one line to give the library's name and an idea of what it does.>`
`3`		`- * Copyright (C) 2014 PCMan <email>`
	`2`	`+ * Copyright (C) 2013 Hong Jen Yee (PCMan) <[email protected]>`
`4`	`3`	`*`
`5`	`4`	`* This library is free software; you can redistribute it and/or`
`6`	`5`	`* modify it under the terms of the GNU Lesser General Public`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`/* BEGIN_COMMON_COPYRIGHT_HEADER`
`2`		`- * (c)LGPL2+`
`3`	`2`	`*`
`4`	`3`	`* LXQt - a lightweight, Qt based, desktop toolset`
`5`	`4`	`* https://lxqt-project.org`