aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog1
-rw-r--r--debian/copyright4
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 006cd01a3..d78dbd69f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ ikiwiki (3.20150330) UNRELEASED; urgency=medium
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
+ * debian/copyright: turn comments on provenance into Comment
-- Joey Hess <id@joeyh.name> Tue, 28 Apr 2015 12:24:08 -0400
diff --git a/debian/copyright b/debian/copyright
index 1940441ae..514910f26 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -180,13 +180,13 @@ Files: doc/smileys/*
Copyright: (c) 2000 - 2004 by Jürgen Hermann <jh@web.de>
(c) 1999, 2000 Martin Pool <mbp@humbug.org.au>
License: GPL-2+
- Smileys were copied from Moin Moin.
+Comment: Smileys were copied from Moin Moin.
Files: doc/smileys/neutral.png
doc/smileys/question.png
Copyright: (c) 2002 phpBB Group
License: GPL-2
- These smileys were copied from phpBB.
+Comment: These smileys were copied from phpBB.
Files: doc/tips/integrated_issue_tracking_with_ikiwiki.mdwn
Copyright: © 2007 Joey Hess <joeyh@ikiwiki.info>, LinuxWorld.com