From: Joey Hess <joey@kitenet.net>
Date: Sun, 18 Mar 2012 18:38:20 +0000 (-0400)
Subject: more updates for trail merge
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=223c6d487ae05e50998f2cd50997befa5eafb321;p=ikiwiki.git

more updates for trail merge
---

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 <joeyh@debian.org>  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 <http://smcv.pseudorandom.co.uk/>
+License: GPL-2+
+
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+