Change the license: GPLv3 -> MIT

grwlf · Jul 23, 2023 · f829234 · f829234
1 parent 5dd459a
commit f829234
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 684 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,9 +1,9 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 
 PROJECT( XKB-SWITCH )
-SET(MAJOR_VERSION 1)
-SET(MINOR_VERSION 8)
-SET(RELEASE_VERSION 5)
+SET(MAJOR_VERSION 2)
+SET(MINOR_VERSION 0)
+SET(RELEASE_VERSION 0)
 SET(XKBSWITCH_VERSION ${MAJOR_VERSION}.${MINOR_VERSION}.${RELEASE_VERSION})
 ADD_DEFINITIONS(-DXKBSWITCH_VERSION="${XKBSWITCH_VERSION}")
 

diff --git a/COPYING b/COPYING
diff --git a/README.md b/README.md
@@ -1,10 +1,11 @@
 
 XKB-SWITCH
-===========
-by J. Bromley, S. Mironov, Alexei Rad'kov
+==========
+
+by Jay Bromley, Sergei Mironov, Alexei Rad'kov
 
 xkb-switch is a C++ program that allows to query and change the XKB layout state.
-Originally ruby-based code written by J.Broomley.
+Originally ruby-based code written by Jay Bromley.
 
 * XKeyboard.cpp  Implementation for XKB query/set class
 * XKbSwitch.cpp  Main program
@@ -13,7 +14,20 @@ Originally ruby-based code written by J.Broomley.
 The C++ class has no special dependencies on anything outside of
 X-related libraries, so it can be easily used with other software.
 
-Xkb-switch is licensed under the GNU GPLv3, see COPYING for details.
+Older versions of Xkb-switch were licensed under the GNU GPLv3, the current
+version is licensed under the MIT license. See COPYING for details.
+
+
+<!-- vim-markdown-toc GFM -->
+
+* [Installing](#installing)
+* [Usage](#usage)
+* [VIM integration](#vim-integration)
+* [Layout groups](#layout-groups)
+* [Bugs or Problems](#bugs-or-problems)
+* [Licensing notice](#licensing-notice)
+
+<!-- vim-markdown-toc -->
 
 Installing
 ----------
@@ -126,6 +140,15 @@ References:
 * <https://0x64616c.livejournal.com/914.html>
   - Old LJ post by Mitya describing minimalistic X11 kb test application
 
-Regards,
-Sergey.
+Licensing notice
+----------------
 
+In response to the [request](https://github.com/grwlf/xkb-switch/issues/69) I
+decided to re-license the project under the more permissive MIT license. Older
+versions of the software remain under the GPL license we used previously. This
+[StackExchange
+question](https://softwareengineering.stackexchange.com/questions/105912/can-you-change-code-distributed-under-the-mit-license-and-re-distribute-it-unde)
+includes some information regarding this kind of situations.
+I included the top-3 contributors into the MIT license text. Please contact me
+either directly or via the mentioned Github issue if you have any questions or
+suggestions regarding this decision.
diff --git a/src/Utils.hpp b/src/Utils.hpp
@@ -2,6 +2,7 @@
  * C++ exceptions that wraps X11 errors.
  *
  * Copyright (C) 2008 by Jay Bromley <jbromley@gmail.com>
+ * Copyright (C) 2010-2023 by Sergei Mironov
  *
  * This file is part of Xkb-switch.
  * Xkb-switch is free software: you can redistribute it and/or modify

diff --git a/src/XKbSwitch.cpp b/src/XKbSwitch.cpp
@@ -1,7 +1,7 @@
 /*
  * Plain launcher program for Jay Bromley's Xkeyboard library.
  *
- * Copyright (C) 2010 by Sergey Mironov <ierton@gmail.com>
+ * Copyright (C) 2010-2023 by Sergei Mironov
  *
  * This file is part of Xkb-switch.
  * Xkb-switch is free software: you can redistribute it and/or modify

diff --git a/src/XKbSwitchApi.cpp b/src/XKbSwitchApi.cpp
@@ -2,6 +2,7 @@
  * XKb Switch API for using in vim libcall()
  *
  * Copyright (C) 2013 by Alexei Rad'kov
+ * Copyright (C) 2010-2023 by Sergei Mironov
  *
  * 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

diff --git a/src/XKeyboard.cpp b/src/XKeyboard.cpp
@@ -2,6 +2,7 @@
  * Implementation of a class to get keyboard layout information and change layouts
  *
  * Copyright (C) 2008 by Jay Bromley <jbromley@gmail.com>
+ * Copyright (C) 2010-2023 by Sergei Mironov
  *
  * 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

diff --git a/src/XKeyboard.hpp b/src/XKeyboard.hpp
@@ -2,6 +2,7 @@
  * Interface for a class to get keyboard layout information and change layouts
  *
  * Copyright (C) 2008 by Jay Bromley <jbromley@gmail.com>
+ * Copyright (C) 2010-2023 by Sergei Mironov
  *
  * This file is part of Xkb-switch.
  * Xkb-switch is free software: you can redistribute it and/or modify