Mercurial Mercurial > openindiana-welcome / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added missing licensing information and bumped version
authorGuido Berhoerster <guido+openindiana@berhoerster.name>
Wed, 15 Sep 2010 19:23:39 +0200
changeset 3 b2df77d0b9c5
parent 2 69134f6c0bf5
child 4 650b320bc714
added missing licensing information and bumped version
COPYING file | annotate | diff | comparison | revisions
configure.ac file | annotate | diff | comparison | revisions 
--- a/COPYING	Wed Sep 15 19:21:56 2010 +0200
+++ b/COPYING	Wed Sep 15 19:23:39 2010 +0200
@@ -1,17 +1,29 @@
 The files data/pixmaps/oiLogo.png, data/pixmaps/aboutOI.png,
-data/html/images/oi-logo.png are distributed under the following terms:
+data/html/images/oi-logo.png, file html/C/index.html are distributed under the
+following terms:
 
-Copyright 2010 Alasdair Lumsden.
-
-FIXME
+    Copyright (c) 2010 Alasdair Lumsden. All rights reserved.
 
-
-The file html/C/index.html is distributed under the following terms:
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
 
-Copyright 2010 Alasdair Lumsden.
-
-FIXME
-
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
 
 The file src/openindiana-about.py is distributed under the following terms:
 
@@ -35,21 +47,28 @@
 Unless otherwise noted, all remaining files are distributed under the following
 terms:
 
-    Copyright (C) 2010  Guido Berhoerster
+    Copyright (c) 2010 Guido Berhoerster. All rights reserved.
 
-    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.
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions
+    are met:
+    1. Redistributions of source code must retain the above copyright
+       notice, this list of conditions and the following disclaimer.
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
 
-    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.
+    THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+    ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+    ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+    OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+    HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+    SUCH DAMAGE.
 
 
 		    GNU GENERAL PUBLIC LICENSE
--- a/configure.ac	Wed Sep 15 19:21:56 2010 +0200
+++ b/configure.ac	Wed Sep 15 19:23:39 2010 +0200
@@ -2,7 +2,7 @@
 
 AC_PREREQ([2.63])
 AC_INIT([openindiana-welcome],
-        [0.1],
+        [0.1.1],
         [https://bugs.launchpad.net/openindiana],
         [openindiana-welcome],
         [http://openindiana.org/])
openindiana-welcome