summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWill Thompson <will@willthompson.co.uk>2012-01-17 17:01:47 +0000
committerWill Thompson <will@willthompson.co.uk>2012-01-17 17:01:47 +0000
commitab3625b497d451c3a9ed1bc9c769eab893a3d537 (patch)
tree3500e8ac3d1e30e326847b9429830a54362e65a8
parent1b3cb496088b1c075a1cf4fd79f7d9dd0b01f822 (diff)
LICENSE: update for bustle-dbus-monitor removal
-rw-r--r--LICENSE12
1 files changed, 3 insertions, 9 deletions
diff --git a/LICENSE b/LICENSE
index 2d01a81..d67d45e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,5 @@
-The majority of this project (all Haskell code, and bustle-pcap.c) is
-licensed under the GNU LGPL Version 2.1 or (at your option) any later
-version.
+All code in this project is licensed under the GNU LGPL Version 2.1 or (at your
+option) any later version.
dbus-core, the Haskell reimplementation of the D-Bus wire protocol used
by the main application, is covered by the GNU GPL version 3. By my
@@ -16,13 +15,8 @@ In summary:
• The Bustle binary probably falls under the terms of the GPL3;
• The Haskell source code is licensed under the LGPL v2.1 or later.
-In simpler news:
-
-bustle-dbus-monitor.c was taken from dbus-1.2.1 and is licensed under
-the GNU GPL Version 2 or (at your option) any later version.
-
dfeet-method.png and dfeet-signal.png were, as their names suggest,
-taken from D-Feet, and are also licensed under the GNU GPL Version 2 or
+taken from D-Feet, and are licensed under the GNU GPL Version 2 or
(at your option) any later version.
The LGPL v2.1, GPL v2 and GPL v3 follow.