* debian/rules:

    + Removed call to dh_installexamples.
  * debian/copyright:
    + Add license for files in inc/.
    + Use machine-interpretable format.
  * Bump debhelper compat level to 6.

diff --git a/debian/changelog b/debian/changelog
index 223e418..32a8afb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,22 @@
 liburi-template-perl (0.13-1) unstable; urgency=low
 
   * New upstream version.
-  * debian/rules: use rules.MakeMaker.noxs to match new build system.
+  * debian/rules:
+    + Use rules.MakeMaker.noxs to match new build system.
+    + Removed call to dh_installexamples.
   * debian/control:
     + Added DM-Upload-Allowed: yes.
     + Build-Depends: Dropped libmodule-build-perl.
     + Build-Depends-Indep: Added libjson-perl for test suite.
     + Standards-Version: 3.7.3 (no changes).
     + Maintainer: Updated email address.
+  * debian/copyright:
+    + Add license for files in inc/.
+    + Use machine-interpretable format.
+  * Bump debhelper compat level to 6.
   * Removed lintian override, lintian is fixed.
 
- -- Ian Beckwith <ianb@erislabs.net>  Sat, 01 Mar 2008 01:54:13 +0000
+ -- Ian Beckwith <ianb@erislabs.net>  Tue, 04 Mar 2008 17:27:06 +0000
 
 liburi-template-perl (0.06-1) unstable; urgency=low
 

diff --git a/debian/compat b/debian/compat
index 7ed6ff8..1e8b314 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+6

diff --git a/debian/control b/debian/control
index 74d6ff2..373191c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: liburi-template-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 6)
 Build-Depends-Indep: perl (>= 5.8.8-7), liburi-perl, libjson-perl
 Maintainer: Ian Beckwith <ianb@erislabs.net>
 Standards-Version: 3.7.3

diff --git a/debian/copyright b/debian/copyright
index f89b392..1f7c1fd 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,32 +1,30 @@
-This package was debianized by Ian Beckwith <ianb@nessie.mcc.ac.uk> on
-Mon, 23 Apr 2007 20:53:24 +0100.
-
-It was downloaded from
-<http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/URI-Template-0.06.tar.gz>.
-
-Upstream Author: Brian Cassidy <brian.cassidy@nald.ca>.
-
-License:
-
-       Copyright 2007 by Brian Cassidy
-
-       This library is free software; you can redistribute it and/or modify it
-       under the same terms as Perl itself.
-
- Those terms are (from /usr/share/doc/perl/copyright):
-
-       This program is free software; you can redistribute it and/or modify
-       it under the terms of either:
-
-       a) the GNU General Public License as published by the Free Software
-       Foundation; either version 1, or (at your option) any later
-       version, or
-
-       b) the "Artistic License" which comes with Perl.
+This package was downloaded from http://search.cpan.org/dist/URI-Template/
+
+Files: *
+Copyright: Copyright 2007, 2008 by Brian Cassidy
+License: GPL-1+ | Artistic
+   This library is free software; you can redistribute it and/or
+   modify it under the same terms as Perl itself.
+
+Files: inc/*
+Copyright: Copyright 2002, 2003, 2004, 2005, 2006 by
+    Audrey Tang <autrijus@autrijus.org>
+    Brian Ingerson <ingy@cpan.org>
+    Adam Kennedy <adamk@cpan.org>
+License: Artistic | GPL-1+
+ All rights reserved.  You can redistribute and/or modify
+ this bundle under the same terms as Perl itself.
+ .
+ [These files are from the Module::Install module; although they lack
+  explicit copyright and license notices, it is assumed that the license
+  and copyright of that package applies to them.]
+
+Files: debian/*
+Copyright: Copyright 2007, 2008 Ian Beckwith <ianb@erislabs.net>
+License: GPL-1+ | Artistic
+   This library is free software; you can redistribute it and/or
+   modify it under the same terms as Perl itself.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL' and
 the Artistic Licence in `/usr/share/common-licenses/Artistic'.
-
-The Debian packaging is (C) 2004-2007, Ian Beckwith <ianb@nessie.mcc.ac.uk> and
-is licensed under the same terms as Perl itself (see above).

diff --git a/debian/rules b/debian/rules
index 0db9c08..22152d9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -58,7 +58,6 @@ binary-arch:
 binary-indep: build install
        dh_testdir
        dh_testroot
-       dh_installexamples
        dh_installdocs README
        dh_installchangelogs Changes
        dh_perl