perfsonar development work

Author: roman
Date: 2009-01-13 09:16:59 -0500 (Tue, 13 Jan 2009)
New Revision: 4863

Added:
   branches/GEANT2-JAVA-RRD-MA-STABLE/doc/Collaboration.txt
   branches/GEANT2-JAVA-RRD-MA-STABLE/doc/License.txt
   
branches/GEANT2-JAVA-RRD-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.0.pdf
Modified:
   branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/copyright
Log:
doc files added



Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/doc/Collaboration.txt (from rev 
4862, trunk/geant2-java-rrd-ma/doc/Collaboration.txt)

Copied: branches/GEANT2-JAVA-RRD-MA-STABLE/doc/License.txt (from rev 4862, 
trunk/geant2-java-rrd-ma/doc/License.txt)

Added: 
branches/GEANT2-JAVA-RRD-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.0.pdf


Property changes on: 
branches/GEANT2-JAVA-RRD-MA-STABLE/doc/perfSONAR-MDM-3.1_Admin_Guide_1.0.pdf
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/copyright
===================================================================
--- branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/copyright  2009-01-12 
13:56:12 UTC (rev 4862)
+++ branches/GEANT2-JAVA-RRD-MA-STABLE/packaging/deb/copyright  2009-01-13 
14:16:59 UTC (rev 4863)
@@ -9,22 +9,28 @@
 
 License:
 
-    This package 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.
- 
-    This package 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 package; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ Copyright (c) 2008, DANTE on behalf of the GEANT2 NRENs
+ All rights reserved.
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+    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.
+     * Neither the name of the DANTE or GEANT2 nor the
+       names of its contributors may be used to endorse or promote products
+       derived from this software without specific prior written permission.
 
-The Debian packaging is (C) 2008, Roman Lapacz 
<>
 and
-is licensed under the GPL, see above.
+    THIS SOFTWARE IS PROVIDED BY DANTE ``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 DANTE or the GEANT2 NRENS 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.
+