[SCM] ruby-hdfeos5 branch, master, updated. upstream/1.1-21-g716193a

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 6204872309567816e478ad367bff5c62f5a92cd9
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Jul 5 01:15:09 2013 +0900

    Update copyright format 1.0
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/copyright b/debian/copyright
index f03b49c..de1e848 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,80 +1,33 @@
-This work was packaged for Debian by:
-
-    Youhei SASAKI <uwabami at gfd-dennou.org> on Wed, 17 Mar 2010 16:51:58 +0900
-
-It was downloaded from: http://ruby.gfd-dennou.org/products/ruby-hdfeos5/
-
-Upstream Authors: M. Horikawa and T. Horinouchi
-
-Copyright (C) 2010 M. Horikawa, T. Horinouch and Dennou-Ruby Project
-
-License: Ruby's 
-
-Ruby's License:
-
-  Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.jp>.
-  You can redistribute it and/or modify it under either the terms of the GPL
-  (/usr/share/common-licenses/GPL-2), or the conditions below, which is 
-  idential to Ruby's license(http://www.ruby-lang.org/en/LICENSE.txt):
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-	  modifications to Usenet or an equivalent medium, or by allowing
-	  the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-	  with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-          together with instructions (in the manual page or equivalent)
-          on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-          the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. You may modify and include the part of the software into any other
-     software (possibly commercial).  But some files in the distribution
-     are not written by the author, so that they are not under this terms.
-
-     They are gc.c(partly), utils.c(partly), regex.[ch], st.[ch] and some
-     files under the ./missing directory.  See each file for the copying
-     condition.
-
-  5. The scripts and library files supplied as input to or produced as 
-     output from the software do not automatically fall under the
-     copyright of the software, but belong to whomever generated them, 
-     and may be sold commercially, and may be aggregated with this
-     software.
-
-  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Youhei SASAKI <uwabami at gfd-dennou.org>
-
-and is licensed under the GPL version 2, see
-"/usr/share/common-licenses/GPL-2".
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ruby-hdfeos5
+Source: http://ruby.gfd-dennou.org/products/ruby-hdfeos5/
+
+Files: *
+Copyright: 2010-2012 M. Horikawa, T. Horinouch and GFD Dennou Club
+License: BSD-2-Clause
+
+Files: debian/*
+Copyright: 2010-2013 Youhei SASAKI <uwabami at gfd-dennou.org>
+License: BSD-2-Clause
+
+License: BSD-2-Clause
+ 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 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 HOLDERS 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.

-- 
Ruby interface of HDF-EOS5 library