[DRE-commits] [SCM] ruby-systemtimer.git branch, master, updated. upstream/1.2.3-5-g6ed8fbb

[Praveen Arimbrathodiyil]

The following commit has been merged in the master branch:
commit 659bb4e6c36ed676da0c95fdbd780020249617ee
Author: Praveen Arimbrathodiyil <pravi.a at gmail.com>
Date:   Wed Jan 18 20:05:32 2012 +0530

    update copyright file

diff --git a/debian/copyright b/debian/copyright
index e90933c..337deb0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,73 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://dep.debian.net/deps/dep5/
 Upstream-Name: SystemTimer
-Source: FIXME <http://example.com/>
+Source: https://github.com/ph7/system-timer
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
- 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.
- .
- 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 package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
- .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+Copyright: David Vollbracht  <http://davidvollbracht.com>, Philippe Hanrigou <http://ph7spot.com>
+License: Ruby's License
 
 Files: debian/*
-Copyright: 2012  <>
-License:
- [LICENSE TEXT]
+Copyright: 2012 Praveen Arimbrathodiyil <pravi.a at gmail.com>
+License: Ruby's License
+
+License: Ruby's License
+ Ruby is copyrighted free software by Yukihiro Matsumoto <matz at netlab.co.jp>.
+ You can redistribute it and/or modify it under either the terms of the GPL
+ (see COPYING.txt file), or the conditions below:
+ .
+   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.
+ .
+ On Debian systems, the full text of the GNU General Public License 
+ can be found in the file `/usr/share/common-licenses/GPL'.

-- 
ruby-systemtimer.git