License information (2/2)

diff --git a/README.md b/README.md
index 88e32e11fd7b586a73734a6054e449c9b71aaab7..9401d37d3dd1ea562c3ed9c391ee1d48c3793861 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,26 +2,38 @@
 
 Automatically select a display configuration based on connected devices
 
-Stefan Tomanek <[stefan.tomanek@wertarbyte.de](stefan.tomanek@wertarbyte.de)>
-
 ## Branch information
 
-The original wertarbyte/autorandr tree seems unmaintained, with lots of open
-pull requests and issues. I forked it and merged what I thought were the most
-important changes. I will maintain this branch until wertarbyte finds the time
-to maintain his branch again.
+The original [wertarbyte/autorandr](https://github.com/wertarbyte/autorandr)
+tree seems unmaintained, with lots of open pull requests and issues. I forked
+it and merged what I thought were the most important changes. I will maintain
+this branch until @wertarbyte finds the time to maintain his branch again.
 
 ## License information and authors
 
-autorandr was originally written by Stefan Tomanek and not published under any
-Open Source license. He did so far not respond to requests regarding the code's
-license. In this fork, all code has been reimplemented by various authors that
+Stefan Tomanek came up with and wrote the initial version of autorandr. He
+currently does not maintain it, and did not express his opinion concerning an
+OSS license in two independent requests. To resolve the licensing issue, all
+non-trivial code in this fork has been reimplemented by various authors that
 have agreed to release their code under the terms of the GNU General Public
 License (version 3).
 
-Note that this license only applies to versions of autorandr from this fork
-that are committed after issue #7 is closed, and versions derived from that
-one. In particular, wertarbyte's original repository is still not OSS.
+This license will apply to versions of autorandr from this fork that are
+committed after issue #7 has been resolved, and versions derived from that one.
+**In particular, wertarbyte's original repository is still not OSS, and the current
+version in this repository is neither.**
+
+Contributors to this version of autorandr are:
+
+* Alexander Wirt
+* Chris Dunder
+* Maciej Sitarz
+* Matthew R Johnson
+* Phillip Berndt
+* Timo Bingmann
+* Tomasz Bogdal
+* stormc
+* tachylatus
 
 ## How to use
 

diff --git a/autorandr b/autorandr
index 22ee12ec5d0eb1da69ffb2e1ac659727fbd88068..1b7c16e44f36af62ddcd9eaaf60e8d77ef424b8e 100755 (executable)
--- a/autorandr
+++ b/autorandr
@@ -7,7 +7,24 @@
 # original version and from authors that did not consent with OSS licensing this
 # program.
 #
-# THIS IS _NOT_ OSS CODE YET!
+#
+#
+# THE FOLLOWING LICENCE AGREEMENT IS PRELIMINARY AND INVALID UNTIL ISSUE #7 AT
+#  https://github.com/phillipberndt/autorandr/issues/7
+# HAS BEEN RESOLVED!
+#
+# 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
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 XRANDR=/usr/bin/xrandr