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

[Stefan <bd@bc-bd.org>]

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 <bd@bc-bd.org>
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.</programlisting>
         <literal>xsol</literal>:
 <programlisting><![CDATA[Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: X Solitaire
-Source: ftp://ftp.example.com/pub/games
+Source: ftp://sunsite.unc.edu/pub/Linux/X11/games/
 
 Files: *
-Copyright: Copyright 1998 John Doe <jdoe@example.com>
+Copyright: 1998 Brian Masney <masneyb@newwave.net>
+License: GPL-2+
+
+Files: debian/*
+Copyright: 1998-2006 Josip Rodin <jrodin@jagor.srce.hr>
+           2010-2012 Mònica Ramírez Arceda <monica@debian.org>
+License: GPL-2+
+
+Files: debian/xsol.svg debian/xsol.xpm
+Copyright: 2011 Simó Albert i Beltran <sim6@probeta.net>
+License: CC-BY-SA-3.0
+
 License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
@@ -1250,10 +1261,20 @@ License: GPL-2+
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-Files: debian/*
-Copyright: Copyright 1998 Jane Smith <jsmith@example.net>
-License: GPL-2+
- [LICENSE TEXT]]]></programlisting>
+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/]]></programlisting>
       </para>
     </example>
 

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 <jdoe@example.com>
            2007, Joe Average <joe@example.org>
            2007, J. Random User <jr@users.example.com>
 License: PSF-2
- [LICENSE TEXT]
 
 Files: debian/*
 Copyright: 2008, Dan Developer <dan@debian.example.com>
@@ -1308,7 +1307,6 @@ License: permissive
 Files: debian/patches/theme-diveintomark.patch
 Copyright: 2008, Joe Hacker <hack@example.org>
 License: GPL-2+
- [LICENSE TEXT]
 
 Files: planet/vendor/compat_logging/*
 Copyright: 2002, Mark Smith <msmith@example.org>
@@ -1323,11 +1321,15 @@ License: MIT2
 Files: planet/vendor/feedparser.py
 Copyright: 2007, Mike Smith <mike@example.org>
 License: PSF-2
- [LICENSE TEXT]
 
 Files: planet/vendor/htmltmpl.py
 Copyright: 2004, Thomas Brown <coder@example.org>
 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