Update d.copyright

2 files changed, 33 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index 3f948da..a6ef50f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,5 +17,6 @@ python-pyepics (3.4.1+ds-1) unstable; urgency=medium
 
   [ Neil Williams ]
   * Bump debhelper support and standards version
+  * Update d.copyright
 
  -- Neil Williams <codehelp@debian.org>  Wed, 02 Mar 2022 12:12:59 +0000
diff --git a/debian/copyright b/debian/copyright
index de4b57a..f779730 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,12 +13,18 @@ Copyright: Matthew Newville <newville@cars.uchicago.edu>,
  Angus Gratton <angus.gratton@anu.edu.au>
 License: EPICS
 
+Files: doc/sphinx/theme/epicsdoc/*
+Copyright: 2007-2011 by the Sphinx team
+License: BSD-2-clause
+
 Files: epics/devices/ordereddict.py epics/wx/ordereddict.py
 Copyright: 2009 Raymond Hettinger
-License: BSD-2
+License: Expat
 
 Files: debian/*
-Copyright: 2020-2021, Andrius Merkys <merkys@debian.org>; 2021 Sebastien Delafond <seb@debian.org>
+Copyright: 2020-2021, Andrius Merkys <merkys@debian.org>
+           2021 Sebastien Delafond <seb@debian.org>
+           2022 Neil Williams <codehelp@debian.org>
 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
@@ -36,7 +42,30 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-License: BSD-2
+License: Expat
+ By obtaining, using, and/or copying this software and/or its
+ associated documentation, you agree that you have read, understood,
+ and will comply with the following terms and conditions:
+ .
+ Permission to use, copy, modify, and distribute this software and
+ its associated documentation for any purpose and without fee is
+ hereby granted, provided that the above copyright notice appears in
+ all copies, and that both that copyright notice and this permission
+ notice appear in supporting documentation, and that the name of
+ Secret Labs AB or the author not be used in advertising or publicity
+ pertaining to distribution of the software without specific, written
+ prior permission.
+ .
+ SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD
+ TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANT-
+ ABILITY AND FITNESS.  IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR
+ BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
+ DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
+ WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ OF THIS SOFTWARE.
+
+License: BSD-2-clause
  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