[game-data-packager] 10/11: d/copyright: Use Comment for dual-license grant

Simon McVittie smcv at debian.org
Sun Dec 31 16:59:27 UTC 2017


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

smcv pushed a commit to branch master
in repository game-data-packager.

commit 6128103200d40b660a868c6723c745f519518457
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Dec 31 16:05:53 2017 +0000

    d/copyright: Use Comment for dual-license grant
    
    This avoids lintian warnings about a license being redefined.
    
    Signed-off-by: Simon McVittie <smcv at debian.org>
---
 debian/changelog    | 2 ++
 debian/copyright    | 3 ++-
 debian/copyright.in | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e0b8bf..22a1ccf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ game-data-packager (56) UNRELEASED; urgency=medium
     - d/rules: Use dh_missing --fail-missing instead of dh_install
       --fail-missing [smcv]
     - d/control: Wrap and sort Suggests [smcv]
+    - d/copyright: Use Comment for dual-license grant to avoid lintian
+      warnings about a license being redefined [smcv]
 
  -- Simon McVittie <smcv at debian.org>  Thu, 21 Dec 2017 22:43:38 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 5fd1c5c..364c5f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -214,6 +214,7 @@ Copyright:
  © 2007-2014 Jakub Steiner <jimmac at novell.com>
   Lapo Calamandrei <calamandrei at gmail.com>
 License: CC-BY-SA-3.0-US or LGPL-3
+Comment:
  This work is licenced under the terms of either the GNU LGPL v3 or
  Creative Commons Attribution-Share Alike 3.0 United States License.
  .
@@ -223,7 +224,7 @@ License: CC-BY-SA-3.0-US or LGPL-3
  .
  When attributing the artwork, using "GNOME Project" is enough.
  Please link to http://www.gnome.org where available.
-Comment:
+ .
  On Debian GNU/Linux systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-3'.
  See below for the complete text of the CC-BY-SA-3.0-US license.
diff --git a/debian/copyright.in b/debian/copyright.in
index 1baadfd..19c8894 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -212,6 +212,7 @@ Copyright:
  © 2007-2014 Jakub Steiner <jimmac at novell.com>
   Lapo Calamandrei <calamandrei at gmail.com>
 License: CC-BY-SA-3.0-US or LGPL-3
+Comment:
  This work is licenced under the terms of either the GNU LGPL v3 or
  Creative Commons Attribution-Share Alike 3.0 United States License.
  .
@@ -221,7 +222,7 @@ License: CC-BY-SA-3.0-US or LGPL-3
  .
  When attributing the artwork, using "GNOME Project" is enough.
  Please link to http://www.gnome.org where available.
-Comment:
+ .
  On Debian GNU/Linux systems, the complete text of the GNU Lesser General
  Public License can be found in `/usr/share/common-licenses/LGPL-3'.
  See below for the complete text of the CC-BY-SA-3.0-US license.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/game-data-packager.git



More information about the Pkg-games-commits mailing list