[Pkg-openldap-devel] [openldap] 01/01: Update OpenLDAP copyright and license

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 8bd0ada445fa7dd31c95fd59b1a72dbc2b10efdd
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sat May 14 21:12:42 2016 -0700

    Update OpenLDAP copyright and license
---
 debian/changelog |  1 +
 debian/copyright | 30 ++++++++++++++----------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5f30ab..2aa0656 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ openldap (2.4.44+dfsg-1) UNRELEASED; urgency=medium
   * Create the pidfile directory when starting slapd, but not when running the 
     init script in other modes.
   * Remove support for enabling the obsolete LDAPv2 protocol via debconf.
+  * debian/copyright: Update the OpenLDAP copyright and license.
 
   [ Helmut Grohne ]
   * Fix policy 8.2 violation (Closes: #330695)
diff --git a/debian/copyright b/debian/copyright
index 6c08a89..b52383e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,43 +11,41 @@ versions stripped of the literal RFC or Internet-Draft text.
 
 Copyright:
 
-Copyright 1998-2007 The OpenLDAP Foundation
+Copyright 1998-2016 The OpenLDAP Foundation
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted only as authorized by the OpenLDAP
-Public License.  A copy of this license is available at
-http://www.OpenLDAP.org/license.html or in file LICENSE in the
-top-level directory of the distribution (included at the end of
-this file).
+Public License.
+
+A copy of this license is available in the file LICENSE in the
+top-level directory of the distribution or, alternatively, at
+<http://www.OpenLDAP.org/license.html>.
 
 OpenLDAP is a registered trademark of the OpenLDAP Foundation.
 
 Individual files and/or contributed packages may be copyright by
-other parties and subject to additional restrictions.
+other parties and/or subject to additional restrictions.
 
 This work is derived from the University of Michigan LDAP v3.3
 distribution.  Information concerning this software is available
-at: http://www.umich.edu/~dirsvcs/ldap/
+at <http://www.umich.edu/~dirsvcs/ldap/ldap.html>.
 
 This work also contains materials derived from public sources.
 
-Additional Information about OpenLDAP can be obtained at:
-    http://www.openldap.org/
-
-or by sending e-mail to:
-    info at OpenLDAP.org
+Additional information about OpenLDAP can be obtained at
+<http://www.openldap.org/>.
 
 ---
 
 The OpenLDAP Public License
-  Version 2.7, 7 September 2001
+  Version 2.8, 17 August 2003
 
 Redistribution and use of this software and associated documentation
 ("Software"), with or without modification, are permitted provided
 that the following conditions are met:
 
-1. Redistributions of source code must retain copyright statements
+1. Redistributions in source form must retain copyright statements
    and notices,
 
 2. Redistributions in binary form must reproduce applicable copyright
@@ -79,8 +77,8 @@ POSSIBILITY OF SUCH DAMAGE.
 The names of the authors and copyright holders must not be used in
 advertising or otherwise to promote the sale, use or other dealing
 in this Software without specific, written prior permission.  Title
-to copyright in this Software shall at all times remain with
-copyright holders.
+to copyright in this Software shall at all times remain with copyright
+holders.
 
 ---
 Noted above is that various files can be copyrighted individually.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git