From 223c6d487ae05e50998f2cd50997befa5eafb321 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 18 Mar 2012 14:38:20 -0400 Subject: more updates for trail merge --- debian/changelog | 1 + debian/copyright | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3bc2a7e29..789a0b967 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ ikiwiki (3.20120203) UNRELEASED; urgency=low Previous links. Trails can easily be added to existing inlines by setting trail=yes in the inline. Thanks to Simon McVittie for his persistance developing this feature. + * Add build-affected hook. Used by trail. -- Joey Hess Wed, 08 Feb 2012 16:07:00 -0400 diff --git a/debian/copyright b/debian/copyright index 8fddb682b..ee52c0eda 100644 --- a/debian/copyright +++ b/debian/copyright @@ -157,6 +157,10 @@ Files: IkiWiki/Plugin/osm.pm Copyright: © 2011 Blars Blarson, Antoine Beaupré License: GPL-2 +Files: IkiWiki/Plugin/trail.pm +Copyright: 2009-2012 Simon McVittie +License: GPL-2+ + Files: doc/logo/* Copyright: © 2006 Recai Oktaş License: GPL-2+ -- cgit v1.2.3