The following commit has been merged in the master branch:
commit 6ef077e8a09aabbe96fd77e94a93cf57752de848
Author: Jérémy Lal <kapouer at melix.org>
Date: Mon May 14 14:22:25 2012 +0200
Update copyright, move to MIT License (Expat) and format 1.0
diff --git a/debian/copyright b/debian/copyright
index 7507815..7ced176 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,89 +1,37 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=173
-Upstream-Name: ruby-net-ldap
-Upstream-Contact: Francis Cianfrocca <garbagecat10 at gmail.com>
-Source: http://rubygems.org/ruby-net-ldap
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: net-ldap
+Upstream-Contact: Ruby LDAP <ruby-ldap at googlegroups.com>
+Source: http://rubyldap.com
Files: *
-Copyright: Copyright 2011 Francis Cianfrocca <garbagecat10 at gmail.com>
-License: GPL-2+ or custom license
- You can redistribute Net::LDAP and/or modify it under either
- the terms of the GPL:
- .
- 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'.
- .
- 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.
+Copyright: 2006–2011 Francis Cianfrocca <garbagecat10 at gmail.com> and other contributors.
+License: Expat
+Comment: Notice of License Change
+ Versions prior to 0.2 were under Ruby's dual license with the GNU GPL.
+ With this release (0.2), Net::LDAP is now under the MIT license.
Files: debian/*
-Copyright: Copyright 2011 Ondřej Surý <ondrej at debian.org>
-License: GPL-2+
+Copyright:
+ 2011 Ondřej Surý <ondrej at debian.org>
+ 2012 Jérémy Lal <kapouer at melix.org>
+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:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ 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.
--
ruby-net-ldap.git