Merge branch 'buildsystems'

diff --combined debian/copyright
index cda6f170a971aa08b84221ad4207ae3f92558cc0,ffb117c90fd243d468e6b886b46b5524cb87c38b..7b123367c1693098ce60ea7e447e751348c6cf88
--- 1/debian/copyright
--- 2/debian/copyright
+++ b/debian/copyright
@@@ -7,7 -7,7 +7,7 @@@ License: GPL-2
  Files: examples/*, autoscripts/*
  Copyright: 1997-2008 Joey Hess <joeyh@debian.org>
  Licence: other
 - These files are in are in the public domain.
 + These files are in the public domain.
   .
   Pedants who belive I cannot legally say that code I have written is in
   the public domain may consider them instead to be licensed as follows:
@@@ -54,3 -54,7 +54,7 @@@ License: GPL-2
  Files: dh_bugfiles
  Copyright: Modestas Vainius <modestas@vainius.eu>
  License: GPL-2+
+ 
+ Files: Debian/Debhelper/Buildsystem*, Debian/Debhelper/Dh_Buildsystems.pm
+ Copyright: © 2008-2009 Modestas Vainius
+ License: GPL-2+