From 96b4f4ddd44edbcde7d3c7d4ad9c0c9f141ab93f Mon Sep 17 00:00:00 2001 From: Alexandre Mestiashvili Date: Tue, 14 May 2013 11:53:47 +0200 Subject: [PATCH] -d/copyright: fixed copyright according TODO. -d/changelog: removed todo, s/UNRELEASED/unstable/ --- debian/changelog | 17 +---------------- debian/copyright | 21 ++++----------------- 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/debian/changelog b/debian/changelog index 77ee8c2..3a2d1f4 100644 --- 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 f33f35b..812063e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,22 +7,13 @@ Files: * Copyright: 2012-2013, Steffen Mueller 2012-2013, Yves Orton + 2007-2011, Marc Lehmann 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 -License: Artistic or GPL-1+ - -Files: lib/Sereal/Encoder.pm -Copyright: - 2012-2013, Steffen Mueller - 2012-2013, Yves Orton -License: Artistic or GPL-1+ - Files: inc/Devel/CheckLib.pm Copyright: 2007, David Cantrell @@ -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 2012, Dominique Dumont 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 -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. -- 2.30.2