diff --git a/debian/copyright b/debian/copyright index 50a0a08cff..fa7ea1de43 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1381,13 +1381,9 @@ Copyright: 2001-2010, NLnet Labs 1999 WIDE Project License: BSD-3-clause -Files: libs/ldns/compat/b32_ntop.c -Copyright: 1996, 1998 Internet Software Consortium. - 1995 International Business Machines, Inc. -License: BSD-style - Files: libs/ldns/compat/b32_pton.c libs/ldns/compat/strlcpy.c + libs/ldns/compat/b32_ntop.c libs/ldns/compat/b64_ntop.c libs/ldns/compat/inet_pton.c Copyright: 1996, 1998 Internet Software Consortium. diff --git a/debian/license-reconcile.yml b/debian/license-reconcile.yml index 4397eafc0e..cd7793f29a 100644 --- a/debian/license-reconcile.yml +++ b/debian/license-reconcile.yml @@ -4,9 +4,6 @@ Rules: Glob: libs/ldns/* Matches: NLnet\s*Labs,?\s*(20\d\d(|\s*-\s*20\d\d)|All\sright\sreserved) Copyright: 2004-2010, NLnet Labs - - - Glob: libs/ldns/compat/b32_ntop.c - License: BSD-style - Glob: libs/miniupnpc/* Matches: Thomas\sBERNARD @@ -106,13 +103,6 @@ Rules: 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 @@ -184,11 +174,6 @@ Rules: Matches: 1988-1996\sSam\sLeffler..Copyright\s\(c\)\s1991-1996\sSilicon\sGraphics,\sInc. Copyright: 1991-1996 Sam Leffler Copyright: 1991-1996 Silicon Graphics, Inc - - - Glob: libs/freetdm/src/ftdm_io.c - Matches: Copyright\s(c)\s2007-2012,\sAnthony\sMinessale\sII - Matches: IN\sNO\sEVENT\sSHALL\sTHE\sCOPYRIGHT\sOWNER - Copyright: 2007-2012, Anthony Minessale II - Glob: src/mod/endpoints/mod_khomp/* Matches: The\scontents\sof\sthis\sfile\sare\ssubject\sto\sthe\sMozilla\sPublic\sLicense\sVersion\s1.1