From bde823191e842d136a7a73176eaf50eb12fa6f6e Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Tue, 9 Jun 2015 22:28:28 +0100
Subject: [PATCH] debian/copyright: consolidate permissive licenses

---
 debian/changelog |  1 +
 debian/copyright | 16 +++++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11a761170..006cd01a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ ikiwiki (3.20150330) UNRELEASED; urgency=medium
   * Populate pagectime from either mtime or inode change time,
     whichever is older, again for more reproducible builds
   * debian: build the docwiki with LC_ALL=C.UTF-8 and TZ=UTC
+  * debian/copyright: consolidate permissive licenses
 
  -- Joey Hess <id@joeyh.name>  Tue, 28 Apr 2015 12:24:08 -0400
 
diff --git a/debian/copyright b/debian/copyright
index e14398acd..1940441ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,9 +8,7 @@ License: GPL-2+
 Files: templates/* underlays/basewiki/* doc/ikiwiki/directive/*
  ikiwiki.setup po/underlays/*
 Copyright: © 2006-2010 Joey Hess <joey@ikiwiki.info>
-License: other
- Redistribution and use in source and compiled forms, with or without
- modification, are permitted under any circumstances. No warranty.
+License: permissive
 
 Files: IkiWiki/Plugin/bzr.pm
 Copyright: © 2008 Jelmer Vernooij <jelmer@samba.org>
@@ -176,9 +174,7 @@ Copyright: 2007 Damyan Ivanov <dam@modsodtsys.com>
            2007 Daniel Nylander <po@danielnylander.se>
            2009 Fernando González de Requena <fgrequena@gmail.com>
            2010 Sebastian Kuhnert <mail@sebastian-kuhnert.de>
-License: other
- Redistribution and use in source and compiled forms, with or without
- modification, are permitted under any circumstances. No warranty.
+License: permissive
 
 Files: doc/smileys/*
 Copyright: (c) 2000 - 2004 by Jürgen Hermann <jh@web.de>
@@ -230,9 +226,7 @@ Files:
  underlays/openid-selector/ikiwiki/login-selector/verisign.png
 Copyright:
  © 2014 Simon McVittie
-License: other
- Redistribution and use in source and compiled forms, with or without
- modification, are permitted under any circumstances. No warranty.
+License: permissive
 
 Files: underlays/jquery/*
 Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
@@ -284,6 +278,10 @@ Comment:
 Copyright: none
 License: public-domain
 
+License: permissive
+ Redistribution and use in source and compiled forms, with or without
+ modification, are permitted under any circumstances. No warranty.
+
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
-- 
2.39.2