Bug#824922: debian-policy: d/copyright examples give dep5-copyright-license-name-not-unique lintian warning

[Russ Allbery]

Stefan  writes:

> while updating my package I followed the examples under

>   https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

> however those generate the linintian warning

>   dep5-copyright-license-name-not-unique.

> Attached are two patches that should fix this warning:

>   simple.patch, using the current copyright file from xsol.
>   complex.patch, updating the second example

Thanks, I've fixed the examples to avoid this problem and added some notes
that these examples won't be accurate for those packages in the archive.
(I fixed the simple version a bit differently to make it even simpler.)

-- 
Russ Allbery (r...@debian.org)   

Bug#824922: debian-policy: d/copyright examples give dep5-copyright-license-name-not-unique lintian warning

[Stefan]

Package: debian-policy
Severity: normal

Hi,

while updating my package I followed the examples under

https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

however those generate the linintian warning

dep5-copyright-license-name-not-unique.

Attached are two patches that should fix this warning:

simple.patch, using the current copyright file from xsol.
complex.patch, updating the second example

  Stefan

-- System Information:
Debian Release: 7.10
  APT prefers oldstable
  APT policy: (500, 'oldstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-0.bpo.4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
commit b1502623b20e510303274afbb24b2226e8acd484
Author: Stefan Völkel 
Date:   Sat May 21 12:39:46 2016 +0200

xsol

diff --git a/copyright-format/copyright-format-1.0.xml b/copyright-format/copyright-format-1.0.xml
index 217e8dd..9781bc5 100644
--- a/copyright-format/copyright-format-1.0.xml
+++ b/copyright-format/copyright-format-1.0.xml
@@ -1224,10 +1224,21 @@ also delete it here.
 xsol:
 
+License: CC-BY-SA-3.0
+ You are free:
+ to Share (to copy, distribute and transmit the work) and
+ to Remix (to adapt the work) under the following conditions:
+ .
+ Attribution - You must attribute the work in the manner specified by the
+ author or licensor (but not in any way that suggests that they endorse you
+ or your use of the work).
+ .
+ Share Alike - If you alter, transform, or build upon this work, you may
+ distribute the resulting work only under the same, similar or a compatible
+ license.
+ .
+ For more information, see http://creativecommons.org/licenses/by-sa/3.0/]]>
   
 
 
diff --git a/copyright-format/copyright-format-1.0.xml b/copyright-format/copyright-format-1.0.xml
index 9781bc5..119026c 100644
--- a/copyright-format/copyright-format-1.0.xml
+++ b/copyright-format/copyright-format-1.0.xml
@@ -1295,7 +1295,6 @@ Copyright: 2008, John Doe 
2007, Joe Average 
2007, J. Random User 
 License: PSF-2
- [LICENSE TEXT]
 
 Files: debian/*
 Copyright: 2008, Dan Developer 
@@ -1308,7 +1307,6 @@ License: permissive
 Files: debian/patches/theme-diveintomark.patch
 Copyright: 2008, Joe Hacker 
 License: GPL-2+
- [LICENSE TEXT]
 
 Files: planet/vendor/compat_logging/*
 Copyright: 2002, Mark Smith 
@@ -1323,11 +1321,15 @@ License: MIT2
 Files: planet/vendor/feedparser.py
 Copyright: 2007, Mike Smith 
 License: PSF-2
- [LICENSE TEXT]
 
 Files: planet/vendor/htmltmpl.py
 Copyright: 2004, Thomas Brown 
 License: GPL-2+
+
+License: PSF-2
+ [LICENSE TEXT]
+
+License: GPL-2+
  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