[DRE-commits] [SCM] ruby-omniauth-ldap.git branch, master, updated. debian/1.0.3-1-2-g35fc7fe

[Ondřej Surý]

The following commit has been merged in the master branch:
commit f61a29be9f16766c33cfb8d00c41d6e8e985c889
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon Apr 15 15:46:28 2013 +0200

    Update copyright to include copyright for ruby-net-ldap borrowed file

diff --git a/debian/copyright b/debian/copyright
index d745ea9..4cb2a21 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,90 @@ Files: *
 Copyright: 2011 by Ping Yu and Intridea, Inc.
 License: Expat
 
+Files: ./lib/omniauth-ldap/adaptor.rb
+Copyright: 2011 by Ping Yu and Intridea, Inc.
+           2006–2011 Francis Cianfrocca <garbagecat10 at gmail.com> and other contributors.
+License: Expat
+
 Files: debian/*
 Copyright: 2013 Ondřej Surý <ondrej at debian.org>
 License: Expat
 
+License: GPL-2
+ 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; version 2 dated June, 1991.
+ .
+ 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'.
+
+License: Ruby
+  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.
+
 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

-- 
ruby-omniauth-ldap.git