Adjusted license information

See https://github.com/phillipberndt/autorandr/issues/7
and https://github.com/wertarbyte/autorandr/issues/24, where the
original author wrote:

> After a while, I finally got around to this - licence should be GPLv3,
> so feel free to package :-)

diff --git a/README.md b/README.md
index 9401d37d3dd1ea562c3ed9c391ee1d48c3793861..02242716bdff312f6e192304f9133c0c65e33d60 100644 (file)
--- a/README.md
+++ b/README.md
@@ -5,23 +5,14 @@ Automatically select a display configuration based on connected devices
 ## Branch information
 
 The original [wertarbyte/autorandr](https://github.com/wertarbyte/autorandr)
-tree seems unmaintained, with lots of open pull requests and issues. I forked
+tree is 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
 
-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).
-
-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.**
+autorandr is available under the terms of the GNU General Public License
+(version 3).
 
 Contributors to this version of autorandr are:
 
@@ -30,6 +21,7 @@ Contributors to this version of autorandr are:
 * Maciej Sitarz
 * Matthew R Johnson
 * Phillip Berndt
+* Stefan Tomanek
 * Timo Bingmann
 * Tomasz Bogdal
 * stormc

diff --git a/autorandr b/autorandr
index 8dfa9dda420bf1149c83dd356b7a663bfec01962..2cdbea950f18407c62a004637c921053153742ac 100755 (executable)
--- a/autorandr
+++ b/autorandr
@@ -4,12 +4,6 @@
 #
 # Copyright (c) 2013 Stefan Tomanek <stefan.tomanek@wertarbyte.de>
 #
-#
-#
-# 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