[Mapbender-commits] r4148 - trunk/mapbender/license

[svn_mapbender at osgeo.org]

Author: arnulf
Date: 2009-06-24 20:15:52 -0400 (Wed, 24 Jun 2009)
New Revision: 4148

Modified:
   trunk/mapbender/license/licence_reference.txt
   trunk/mapbender/license/license.txt
   trunk/mapbender/license/license_js.txt
Log:
generic file license.txt updated

Modified: trunk/mapbender/license/licence_reference.txt
===================================================================
--- trunk/mapbender/license/licence_reference.txt	2009-06-24 18:31:20 UTC (rev 4147)
+++ trunk/mapbender/license/licence_reference.txt	2009-06-25 00:15:52 UTC (rev 4148)
@@ -1,6 +1,5 @@
 <!-- 
-Licensing: See the GNU General Public License for more details.
-http://www.gnu.org/copyleft/gpl.html
-or:
-mapbender/licence/ 
--->
+Copyright 2009, Open Source Geospatial Foundation. All rights reserved.
+This program is dual licensed under the GNU General Public License and Simplified BSD license:
+http://svn.osgeo.org/mapbender/trunk/mapbender/license/license.txt
+-->
\ No newline at end of file

Modified: trunk/mapbender/license/license.txt
===================================================================
--- trunk/mapbender/license/license.txt	2009-06-24 18:31:20 UTC (rev 4147)
+++ trunk/mapbender/license/license.txt	2009-06-25 00:15:52 UTC (rev 4148)
@@ -1,21 +1,45 @@
-#   Copyright 2009 Open Source Geospatial Foundation
-# 
-#   The program is dual licensed under the GNU General Public License: 
-#    http://svn.mapbender.org/trunk/mapbender/gpl.txt
-#   and Simplified BSD license:
-#    http://svn.osgeo.org/mapbender/trunk/mapbender/license/simplified_bsd.txt
+# Copyright 2009, Open Source Geospatial Foundation. All rights reserved.
 #
-#   This file is part of Mapbender.
+# This program is dual licensed under the GNU General Public License: 
+# http://svn.mapbender.org/trunk/mapbender/gpl.txt
+# and Simplified BSD license:
+# http://svn.osgeo.org/mapbender/trunk/mapbender/license/simplified_bsd.txt
 #
-#   Mapbender 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
-#   (at your option) any later version.
+# This file is part of Mapbender.
 #
-#   Mapbender 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.
+#######################  GNU General Public License  ########################
+# Mapbender 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
+# (at your option) any later version.
 #
-#   You should have received a copy of the GNU General Public License
-#   along with Mapbender.  If not, see <http://www.gnu.org/licenses/>.
+# Mapbender 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 Mapbender.  If not, see <http://www.gnu.org/licenses/>.
+#
+#######################    Simplified BSD License    ########################
+# Redistribution and use in source and binary forms, with or without 
+# modification, are permitted provided that the following conditions are met:
+#    * Redistributions of source code must retain the above copyright 
+#      notice, this list of conditions and the following disclaimer.
+#    * 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 SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT
+# HOLDER 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.
+#
+# http://opensource.org/licenses/bsd-license.php
\ No newline at end of file

Modified: trunk/mapbender/license/license_js.txt
===================================================================
--- trunk/mapbender/license/license_js.txt	2009-06-24 18:31:20 UTC (rev 4147)
+++ trunk/mapbender/license/license_js.txt	2009-06-25 00:15:52 UTC (rev 4148)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Open Source Geospatial Foundation, 
- * Dual licensed under the GNU General Public License and Simplified BSD license.  
+/* Copyright (c) 2009, Open Source Geospatial Foundation
+ * This program is dual licensed under the GNU General Public License and Simplified BSD license.  
  * http://svn.osgeo.org/mapbender/trunk/mapbender/license/license.txt
- */
+ */
\ No newline at end of file