finish off apr/apr-util copyright info

diff --git a/debian/copyright b/debian/copyright
index ec54ccccc7252c030ed9a8ac2947fa355a151b3a..50a0a08cff0eb0207edae0f27039ab3dca4537cd 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1332,15 +1332,29 @@ Copyright: 2000 by Martin Pool <mbp@humbug.org.au>
 License: zlib/libpng
 
 Files: libs/apr/file_io/unix/mktemp.c
-Copyright: 1987, 1993 The Regents of the University of California
+ libs/apr/strings/apr_strings.c
+Copyright: 1987-1993 The Regents of the University of California
 License: Apache-2.0 or BSD-4-clause
 
+Files: libs/apr/dso/aix/dso.c
+Copyright: 1992-1998 Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
+ 1996 John W. Eaton <jwe@bevo.che.wisc.edu>
+ 1998 Ralf S. Engelschall <rse@apache.org>
+ 2000 David Reid
+License: Apache-2.0
+
 Files: libs/apr-util/crypto/apr_md5.c
 Copyright: 1991-2, RSA Data Security, Inc.
  2000-2005 The Apache Software Foundation or its licensors
  phk@login.dknet.dk
 License: RSA and Apache-2.0 and Beerware
 
+Files: libs/apr-util/ldap/apr_ldap_url.c
+Copyright: 2000-2005 The Apache Software Foundation or its licensors
+ 1998-2002 The OpenLDAP Foundation
+ 1992-1996 Regents of the University of Michigan
+License: Apache-2.0 and OpenLDAP and BSD-like
+
 Files: libs/miniupnpc/*
 Copyright: 2005-2009, Thomas Bernard
 License: BSD-3-clause
@@ -1801,3 +1815,27 @@ Copyright: 2004 Polycom, Inc
 Comment: Disclaimer: non-comercial use,gital Equipment Corporation, Maynard, Massachusetts. 
 License: patent-mess
 
+License: OpenLDAP
+ /* Portions Copyright 1998-2002 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.
+  * 
+  * 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.
+  * 
+  * 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/
+  * 
+  * This work also contains materials derived from public sources.
+  * 
+  * Additional information about OpenLDAP can be obtained at:
+  *     http://www.openldap.org/
+  */

diff --git a/debian/license-reconcile.yml b/debian/license-reconcile.yml
index 3db6f3248448f56156b23b2db37601bc1adb76cb..4397eafc0e27a4e551ace8f26621ed8b4ebdcac3 100644 (file)
--- a/debian/license-reconcile.yml
+++ b/debian/license-reconcile.yml
@@ -99,6 +99,45 @@ Rules:
    Matches:  The\sRegents\sof\sthe\sUniversity\sof\sCalifornia.\s+All\srights\sreserved.
    Copyright: 1987, 1993 The Regents of the University of California
    License: Apache-2.0 or BSD-4-clause
+  -
+   Glob: libs/apr/strings/apr_strings.c
+   Matches:  The\sASF\slicenses\sthis\sfile\sto\sYou\sunder\sthe\sApache\sLicense,\sVersion\s2.0
+   Matches:  Copyright\s\(c\)\s1987,\s1993
+   Matches:  The\sRegents\sof\sthe\sUniversity\sof\sCalifornia.\s+All\srights\sreserved.
+   Copyright: 1990, 1993 The Regents of the University of California
+   License: Apache-2.0 or BSD-4-clause
+  -
+   Glob: libs/apr/locks/os2/thread_mutex.c
+   Matches: this\swork\sfor\sadditional\sinformation\sregarding\scopyright\sownership.
+   Matches: The\sASF\slicenses\sthis\sfile\sto\sYou\sunder\sthe\sApache\sLicense,\sVersion\s2.0
+   License: Apache-2.0
+   Copyright: Ryan Bloom
+   Justification: silly hack to shut up the 'ownership' problem
+  -
+   Glob: libs/apr/dso/aix/dso.c
+   Matches: Copyright\s\(c\)\s1992,1993,1995,1996,1997,1988
+   Matches: Jens-Uwe\sMager,\sHelios\sSoftware\sGmbH,\sHannover,\sGermany.
+   Copyright: 1992-1998 Jens-Uwe Mager, Helios Software GmbH, Hannover, Germany.
+  -
+   Glob: libs/apr/build/NWGNUtail.inc
+   Matches: NLM_COPYRIGHT\s=\sLicensed\sto\sthe\sApache\sSoftware\sFoundation\s\(ASF\)\sunder\sone\sor\smore
+   Copyright: The Apache Software Foundation or its licensors
+  -
+   Glob: libs/apr/include/apr_fnmatch.h
+   Matches: Copyright\s\(c\)\s1992,\s1993
+   Matches:  The\sRegents\sof\sthe\sUniversity\sof\sCalifornia.
+   Copyright: 1992, 1993 The Regents of the University of California.
+  -
+   Glob: libs/apr-util/ldap/apr_ldap_url.c
+   Matches: Copyright\s2000-2005\sThe\sApache\sSoftware\sFoundation\sor\sits\slicensors
+   Copyright: 2000-2005 The Apache Software Foundation or its licensors
+   Matches: Copyright\s1998-2002\sThe\sOpenLDAP\sFoundation
+   Copyright: 1998-2002 The OpenLDAP Foundation
+   Matches: Copyright\s\(c\)\s1992-1996\sRegents\sof\sthe\sUniversity\sof\sMichigan.
+   Copyright: 1992-1996 Regents of the University of Michigan.
+   Matches: http://www.OpenLDAP.org/license.html\sor\sin\sfile\sLICENSE\sin\sthe
+   License: Apache-2.0 and OpenLDAP and BSD-like
+   Justification: silly hack to shut up the 'by' problem
   -
    Glob: libs/js/*
    Matches: Version:\sMPL\s1.1/GPL\s2.0/LGPL\s2.1
@@ -150,13 +189,6 @@ Rules:
    Matches: Copyright\s(c)\s2007-2012,\sAnthony\sMinessale\sII
    Matches: IN\sNO\sEVENT\sSHALL\sTHE\sCOPYRIGHT\sOWNER
    Copyright: 2007-2012, Anthony Minessale II
-  -
-   Glob: libs/apr/locks/os2/thread_mutex.c
-   Matches: this\swork\sfor\sadditional\sinformation\sregarding\scopyright\sownership.
-   Matches: The\sASF\slicenses\sthis\sfile\sto\sYou\sunder\sthe\sApache\sLicense,\sVersion\s2.0
-   License: Apache-2.0
-   Copyright: Ryan Bloom
-   Justification: silly hack to shut up the 'ownership' problem
   -
    Glob: src/mod/endpoints/mod_khomp/*
    Matches: The\scontents\sof\sthis\sfile\sare\ssubject\sto\sthe\sMozilla\sPublic\sLicense\sVersion\s1.1