LICENCE: reorganise

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/LICENCE b/LICENCE
index a31a4a1a32d648e088fbfc8af00e6d5dc1cd5e78..9f6080e5d50cf2508c255c92aeef4665367f4950 100644 (file)
--- a/LICENCE
+++ b/LICENCE
@@ -147,17 +147,6 @@ Saul Kravitz, and Ian Jackson.
 I interpet this as a blanket permision.
 
 
-debian/*
------------
-
-debian/init is from an original init script example by Miquel van
-Smoorenburg and Ian Murdock.  Modified by Richard Kettlewell.
-
-debian/rules was once from an example from Joey Hess and is now
-(after most of it was deleted) probably entirely the work of Ian
-Jackson.
-
-
 aes.[ch]
 --------
 
@@ -182,6 +171,45 @@ Original licence:
   EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+sha512.[ch]
+-----------
+
+  Copyright (C) 2005, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+
+  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 3 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.
+
+  Written by David Madore, considerably copypasting from
+  Scott G. Miller's sha1.c
+
+
+u64.h
+-----
+
+  uint64_t-like operations that work even on hosts lacking uint64_t
+
+  Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
+
+  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 3 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.
+
+  Written by Paul Eggert.
+
+
 base91/
 -------
 
@@ -285,45 +313,6 @@ now in the Autoconf Archive, where it has this permission notice:
   exception to the GPL to apply to your modified version as well.
 
 
-sha512.[ch]
------------
-
-  Copyright (C) 2005, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
-
-  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 3 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.
-
-  Written by David Madore, considerably copypasting from
-  Scott G. Miller's sha1.c
-
-
-u64.h
------
-
-  uint64_t-like operations that work even on hosts lacking uint64_t
-
-  Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
-
-  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 3 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.
-
-  Written by Paul Eggert.
-
-
 argparseactionnoyes.py
 ----------------------
 
@@ -342,8 +331,8 @@ argparseactionnoyes.py
   all retrieved 4.11.2019 and rechecked 12.11.2022
 
 
-subdirmk
---------
+subdirmk/
+---------
 
 Copyright 2019-2020 Ian Jackson
 Copyright 2019 Mark Wooding
@@ -363,6 +352,20 @@ Copyright 2019 Mark Wooding
     If not, see https://www.gnu.org/.
 
 
+debian/
+-------
+
+debian/init is from an original init script example by Miquel van
+Smoorenburg and Ian Murdock.  Modified by Richard Kettlewell.
+
+debian/rules was once from an example from Joey Hess and is now
+(after most of it was deleted) probably entirely the work of Ian
+Jackson.
+
+The remainder of debian/ is by the authors of Secnet (with possible
+future changes made by Debian contributors).
+
+
 configure
 ---------