[DRE-commits] [SCM] ruby-liquid.git branch, master, updated. upstream/2.2.2-9-gc137d90

Fri Oct 21 22:31:25 UTC 2011

The following commit has been merged in the master branch:
commit 6db26bf4664417c76ecaa4c994775bb6d106dd88
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Fri Oct 21 23:36:18 2011 +0200

    fill in copyright according to DEP5

diff --git a/debian/copyright b/debian/copyright
index ac6fa48..5f73cc5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,84 @@
-FIXME. fill-in with DEP5 copyright file. http://dep.debian.net/deps/dep5/
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
 Upstream-Name: liquid
-Source: FIXME (URL where source can be downloaded)
+Source: http://www.liquidmarkup.org/
 
 Files: *
-Copyright: Copyright 1998 John Doe <jdoe at example.com>
-License: GPL-2+
- 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.
+Copyright: Copyright 2005, 2006 Tobias Lütke
+License: Expat
+
+Files: lib/module_ex.rb
+Copyright: Copyright 2007 by Domizio Demichelis
+License: Ruby or GPL-2
+
+Files: debian/*
+Copyright: Copyright 2011 Cédric Boutillier <cedric.boutillier at gmail.com>
+License: Expat
+ 
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
  .
- 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.
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
  .
- 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
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+License: Ruby
+ 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
+ version 2 (see the file GPL), 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) give non-standard binaries non-standard names, with
+           instructions on where to get the original software distribution.
+        d) make other distribution arrangements with the author.
+   3. You may distribute the software in object code or binary form,
+      provided that you do at least ONE of the following:
+        a) distribute the binaries 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 binaries 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 these terms.
  .
- 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'.
+      For the list of those files and their copying conditions, see the
+      file LEGAL.
+   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.
 
-Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
-License:
- [LICENSE TEXT]
+License: GPL-2
+ On Debian systems, the complete text of the GNU General Public License can be
+ found in `/usr/share/common-licenses/GPL-2'.

-- 
ruby-liquid.git

