[DRE-commits] [ruby-rbpdf] 08/25: improve debian/copyright

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-rbpdf.

commit c6a04dab39f5a29191361d6147d14cdbce0de68b
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Mon Feb 8 19:04:05 2016 -0200

    improve debian/copyright
---
 debian/copyright | 55 ++++++++++++++++++++-----------------------------------
 1 file changed, 20 insertions(+), 35 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 86194dd..cbdf954 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,33 +3,36 @@ Upstream-Name: rbpdf
 Source: https://github.com/naitoh/rbpdf
 Files-Excluded: rbpdf-font/lib/fonts/ttf2ufm
 Comment:
- The released license file on Github mentions only the Expat license
- (listed as MIT-LICENSE).  However, individual files are derived from
- the TCPDF sources, and were originally licensed as LGPL-2.1(+).  I
- have marked those files as LGPL and the remainder as Expat.  One of
- the LGPL files has no version, but from looking at the sourceforge
- page it seems clear that the intent was to license under LGPL-2.1+.
- The font licenses are another mess.  The tool to create metric files
- is missing.  Most of the fonts are included hard-coded.  It's hard to
- track the licenses or to figure out what font came from where.
+ see upstream clarification about licensing on
+ https://github.com/naitoh/rbpdf/commit/2907b8c53c36bb7c9732c6748b5a306aa7564326
+ (not part of any release so far)
 
-
-Files: lib/fonts/*
+Files: *
+Copyright: © Jun NAITOH
 License: Expat
-Comment: no
 
-Files: lib/core/rmagick.rb
-Copyright: 2006 4ssoM LLC <www.4ssoM.com>
-License: Expat
+Files: lib/barcode/*
+Copyright: © Karim Mribti <barcode at mribti.com>,
+             Nicola Asuni <info at tecnick.com>,
+             Sam Michaels <swampgas at swampgas.org>
+License: LGPL-2.1+
 
 Files: lib/rbpdf.rb lib/htmlcolors.rb lib/unicode_data.rb
-Copyright: 2004-2008 Nicola Asuni, Ed Moss
+Copyright: © 2004-2008 Nicola Asuni, Ed Moss
 License: LGPL-2.1+
 
+Files: example/rails/app/controllers/*.rb
+Copyright: © Jun NAITOH
+License: LGPL-2.1+
+
+Files: rbpdf-font/*
+Copyright: © Jun NAITOH
+License: Expat
+
 Files: debian/*
 Copyright: 2015 Klee Dienes <klee at debian.org>
+           2015 Antonio Terceiro <terceiro at debian.org>
 License: Expat
-Comment: The Debian packaging is licensed under the same terms as the original package.
 
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining
@@ -68,21 +71,3 @@ License: LGPL-2.1+
  .  
  On Debian systems, the complete text of the GNU Lesser General Public
  License can be found in "/usr/share/common-licenses/LGPL-2.1".
-
-License: LGPL-2.1+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- .  
- On Debian systems, the complete text of the GNU Lesser General Public
- License can be found in "/usr/share/common-licenses/LGPL-2.1".

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rbpdf.git