-d/copyright: fixed copyright according TODO.

 -d/changelog: removed todo, s/UNRELEASED/unstable/

diff --git a/debian/changelog b/debian/changelog
index 77ee8c21c8c8fd68ed4c22d2f4c8f86d28db828d..3a2d1f43b96b3ad00e63520dd883b5105a15726e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,19 +1,4 @@
-libsereal-encoder-perl (0.35-1) UNRELEASED; urgency=low
-
-  TODO:
-  - (same as -decoder-) have a look at
-    http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#fields
-    + under "Files" it says: "Multiple Files paragraphs are allowed. The last
-      paragraph that matches a particular file applies to it. More general
-      paragraphs should therefore be given first, followed by more specific
-      overrides." - that is, the paragraph for debian/copyright is overridden by
-      debian/* which follows later
-    + under "Copyright", it explains how differing copyright statements may be
-      merged (provided the license is identical)
-      - the statement for lib/Sereal/Decoder.pm is identical to * and should
-        be dropped
-      - consider merging the srl_common.h paragraph into *
-      - consider merging debian/copyright into debian/*
+libsereal-encoder-perl (0.35-1) unstable; urgency=low
 
   * Imported Upstream version 0.35
 

diff --git a/debian/copyright b/debian/copyright
index f33f35bc97e43ea16daa7284b27d72d3cd782fee..812063e8bec79884594e14e78f8e4c7ca014f503 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,22 +7,13 @@ Files: *
 Copyright: 
  2012-2013, Steffen Mueller <smueller@cpan.org> 
  2012-2013, Yves Orton <yves@cpan.org>
+ 2007-2011, Marc Lehmann <schmorp@schmorp.de>
 License: Artistic or GPL-1+
 Comment: 
  Some inspiration and code was taken from Marc Lehmann's
  excellent JSON::XS module due to obvious overlap in
  problem domain
 
-Files: srl_common.h
-Copyright: 2007-2011, Marc Lehmann <schmorp@schmorp.de>
-License: Artistic or GPL-1+
-
-Files: lib/Sereal/Encoder.pm
-Copyright: 
- 2012-2013, Steffen Mueller <smueller@cpan.org>
- 2012-2013, Yves Orton <yves@cpan.org>
-License: Artistic or GPL-1+
-
 Files: inc/Devel/CheckLib.pm
 Copyright: 
  2007, David Cantrell <david@cantrell.org.uk> 
@@ -52,18 +43,14 @@ Comment: portions taken from perlobject.map
  has been copied quite liberally in several other Perl modules. There's
  no mention of a license in this file or in XSTEST distribution.
 
-Files: debian/copyright
-Copyright: 
+Files: debian/*
+Copyright:
  2013, Alexandre Mestiashvili <alex@biotec.tu-dresden.de>
  2012, Dominique Dumont <dod@debian.org>
 License: Artistic or GPL-1+
-Comment: Section describing perlobject.map is taken from 
+Comment: Section in debian/copyright describing perlobject.map is taken from 
  d/copyright of libtext-hunspell-perl.
 
-Files: debian/*
-Copyright: 2013, Alexandre Mestiashvili <alex@biotec.tu-dresden.de>
-License: Artistic or GPL-1+
-
 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.