[libpdf-fromhtml-perl] 02/02: Removed the removing of inc/, added it to d/copyright

[Robin Sheat]

This is an automated email from the git hooks/post-receive script.

eythian-guest pushed a commit to branch master
in repository libpdf-fromhtml-perl.

commit 83d2075f2764051d1413df0b9e4876d235c0d2be
Author: Robin Sheat <robin at catalyst.net.nz>
Date:   Fri Aug 21 14:09:51 2015 +1200

    Removed the removing of inc/, added it to d/copyright
---
 debian/changelog | 14 +-------------
 debian/copyright | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2280a9a..687b405 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,4 @@
-libpdf-fromhtml-perl (0.31-1) UNRELEASED; urgency=low
-
-  TODO:
-  if you remove inc/ (which is a bit overkill IMO, the only thing missing was
-  a copyright/license paragraph in d/copyright, ready for copypaste (modulo
-  adjusting years) at
-  https://pkg-perl.alioth.debian.org/copyright.html#module__install ) then you
-  need to create a new tarball and gbp-import-orig it to get it into the
-  pristine-tar branch and to bump the version (to 0.31+dfsg-1 or whatever
-  uscan with Files-Excluded creates) in d/changelog. -- currently inc/ is
-  still in the .orig.tar.gz in pristine-tar (and hence still missing in
-  d/copyright since we also distribute the tarball) and dpkg-source whines
-  during build because it's missing in git
+libpdf-fromhtml-perl (0.31-1) unstable; urgency=low
 
   * Initial Release. Closes: #784297
 
diff --git a/debian/copyright b/debian/copyright
index cefa54a..1078d1d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,12 +2,17 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://metacpan.org/release/PDF-FromHTML
 Upstream-Contact: 唐鳳 <cpan at audreyt.org>
 Upstream-Name: PDF-FromHTML
-Files-Excluded: inc/*
 
 Files: *
 Copyright: 2004-2010 唐鳳 <cpan at audreyt.org>
 License: CC0
 
+Files: inc/Module/*
+Copyright: 2002-2012, Adam Kennedy <adamk at cpan.org>
+ 2002-2012, Audrey Tang <autrijus at autrijus.org>
+ 2002-2012, Brian Ingerson <ingy at cpan.org>
+License: Artistic or GPL-1+
+
 Files: debian/*
 Copyright: 2015, Robin Sheat <robin at catalyst.net.nz>
 License: CC0
@@ -135,3 +140,20 @@ License: CC0
   d. Affirmer understands and acknowledges that Creative Commons is not a
      party to this document and has no duty or obligation with respect to
      this CC0 or use of the Work.
+
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
+
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
+

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libpdf-fromhtml-perl.git