X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=COPYING;h=4191b661db76a1189bb14430a8aef7649a0e2721;hb=ef1a13e0de71e01d19a9d1b2d4abdac5e34eb9bc;hp=160836ea08e2f557fe5c10128f2c82ecef0d3625;hpb=54461f0fd185f7da122b78707f97bd8fe03bc823;p=lttng-ust.git

diff --git a/COPYING b/COPYING
index 160836ea..4191b661 100644
--- a/COPYING
+++ b/COPYING
@@ -1,16 +1,52 @@
-UST - LTTng Userspace Tracer
-Copyright (C) 2009  Pierre-Marc Fournier, Mathieu Desnoyers and others.
+LTTng UST - Userspace Tracer
 
-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 2
-of the License, or (at your option) any later version.
+Copyright (C) 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+Copyright (C) 2010 Pierre-Marc Fournier, Nils Carlson, David Goulet and others.
+
+
+* This library is licensed under the LGPL v2.1 license, except when
+  specified otherwise.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; only
+version 2.1 of the License.
+
+This library 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
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+
+
+* System headers are MIT-licensed (BSD style):
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+
+* liblttng-ust-ctl/ustctl.c is GPL v2. It is only used by the
+  lttng-sessiond program.
+
+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; version 2 of the License only.
 
 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, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+You should have received a copy of the GNU General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.