summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorBrandon Philips <brandon@ifup.org>2012-08-29 17:42:24 -0700
committerLennart Poettering <lennart@poettering.net>2012-09-03 15:02:54 -0700
commit0630da04e575213229f695bdc3dc90aa92ca4f55 (patch)
tree994eb4304bbe934c392152ae5e913925d77d49c5 /doc
parent9fcc28e0e8f84968d1fb8b6d544a42efb13803ec (diff)
LICENSE: change license to MITHEADmaster
In the spirit of 70df7aaa lets change the license again, this time to MIT! Context: On 23:15 Tue 10 Apr 2012, Lennart Poettering wrote: > On Mon, 09.04.12 14:51, Brandon Philips (brandon@ifup.org) wrote: > > I am working on a daemon and it would be great to use libdaemon. > > However, the project is Apache licensed and I have no idea how they > > interact. Is it at all possible to dual license LGPL/BSD or LGPL/Apache? > > > > https://github.com/racker/virgo > > heya. I am not such a big fan of the BSD licenses myself, but I guess in > this case it is OK. Yea :-/ > The only major other contributor seems to be Diego Pettenò who should be > OK with such a change. I'll ask him. Great, thank you. > Would you be OK with MIT as well? Yes, the MIT license works too.
Diffstat (limited to 'doc')
-rw-r--r--doc/Makefile.am26
-rw-r--r--doc/README.html.in29
-rw-r--r--doc/style.css27
3 files changed, 51 insertions, 31 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index eb8470d..140ad1a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,19 +2,23 @@
#
# Copyright 2003-2008 Lennart Poettering
#
-# libdaemon 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, either version 2.1 of the
-# License, or (at your option) any later version.
+# 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:
#
-# libdaemon 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.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
#
-# You should have received a copy of the GNU Lesser General Public
-# License along with libdaemon. If not, see
-# <http://www.gnu.org/licenses/>.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
dist_html_DATA = README.html style.css
EXTRA_DIST = README.html.in
diff --git a/doc/README.html.in b/doc/README.html.in
index 9de74bb..2c2cccd 100644
--- a/doc/README.html.in
+++ b/doc/README.html.in
@@ -26,18 +26,29 @@
<h2><a name="license">License</a></h2>
-<p>This program 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, either version 2.1 of the
-License, or (at your option) any later version.</p>
-
-<p>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
-Lesser General Public License for more details.</p>
+<p>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:</p>
+
+<p>The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.</p>
+
+<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.</p>
<h2><a name="news">News</a></h2>
+<div class="news-date">Sun Aug 29 2012: </div>
+<p class="news-text"><a href="@PACKAGE_URL@libdaemon-0.14.tar.gz">Version 0.15</a> license change from LGPL to MIT</p>
+
<div class="news-date">Sun Oct 18 2009: </div>
<p class="news-text"><a href="@PACKAGE_URL@libdaemon-0.14.tar.gz">Version 0.14</a> released; changes include: add <tt>daemon_set_verbosity()</tt> call; numerous updates</p>
diff --git a/doc/style.css b/doc/style.css
index 4d5a95a..15efaec 100644
--- a/doc/style.css
+++ b/doc/style.css
@@ -3,19 +3,24 @@
Copyright 2003-2008 Lennart Poettering
- libdaemon 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, either version 2.1 of the
- License, or (at your option) any later version.
+ 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:
- libdaemon 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.
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
- You should have received a copy of the GNU Lesser General Public
- License along with libdaemon. If not, see
- <http://www.gnu.org/licenses/>.
***/
body { color: black; background-color: white; }