more updates for trail merge

diff --git a/debian/changelog b/debian/changelog
index 3bc2a7e298435c2f51e285348474b2411841ebb2..789a0b967eb5e44f27bfc52f422e953f8d574bb2 100644 (file)
--- 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.
     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
 
 
  -- Joey Hess <joeyh@debian.org>  Wed, 08 Feb 2012 16:07:00 -0400
 

diff --git a/debian/copyright b/debian/copyright
index 8fddb682b74d6bee7d721d60ee2b2b6b8af5c2ea..ee52c0eda5f43d80bd34934a879b6472cec37b88 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -157,6 +157,10 @@ Files: IkiWiki/Plugin/osm.pm
 Copyright: © 2011 Blars Blarson, Antoine Beaupré
 License: GPL-2
 
 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+
 Files: doc/logo/*
 Copyright: © 2006 Recai Oktaş <roktas@debian.org>
 License: GPL-2+