[SCM] guayadeque/master: Update copyright file as per DEP-5

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6177eddb3c93d2395dea8a6f04b99fe0ee14a29b
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat May 14 13:01:55 2011 +0200

    Update copyright file as per DEP-5

diff --git a/debian/copyright b/debian/copyright
index c0b4556..53f86e6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,19 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: Guayadeque Music Player
-Maintainer: Juan Rios <anonbeat at gmail.com>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Upstream-Name: Guayadeque Music Player
+Upstream-Contact: Juan Rios <anonbeat at gmail.com>
 Source: http://sourceforge.net/projects/guayadeque/files/
 
+Files: *
 Copyright: 2008-2009 Juan Rios <anonbeat at gmail.com>
 License: GPL-2+
 
-Files: ./src/hmac/*
+Files: src/hmac/*
 Copyright: 2005-2007 Olivier Gay <olivier.gay at a3.epfl.ch>
-License: BSD
-
-Files: ./src/wxsqlite3/*, ./src/wx/*.h
-Copyright: Ulrich Telle
-License: wxWindows
+License: BSD-3-clause
 
-Files: ./src/MD5.*
-Copyright: Public domain
-License: other
+Files: src/MD5.*
+Copyright: No copyright holders
+License: public-domain
  This code implements the MD5 message-digest algorithm.
  The algorithm is due to Ron Rivest. This code is based on the code
  written by Colin Plumb in 1993, no copyright is claimed.
@@ -29,10 +26,10 @@ License: other
  .
  This code is provided "as is" and comes without any warranty!
 
-Files: ./src/curl/*, ./src/wx/curl/*
+Files: src/{,wx/}curl/*
 Copyright: 2004 Casey O'Donnell
-License: wxWidgets, wxWindows
-X-Comment:
+License: wxWindows
+Comment:
  Quoting http://www.wxwidgets.org/about/newlicen.htm:
  "wxWidgets is currently licensed under the "wxWindows Licence"
  pending approval of the "wxWidgets Licence" which will be identical apart
@@ -40,7 +37,7 @@ X-Comment:
  .
  Please see the wxWindows license stanza.
 
-File: ./debian/*
+File: debian/*
 Copyright: 2010 Alessio Treglia <quadrispro at ubuntu.com>
 License: GPL-2+
 
@@ -54,13 +51,38 @@ License: GPL-2+
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License along
+Comment: You should have received a copy of the GNU General Public License along
  with this program; if not, write to the Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-X-Comment: On Debian systems, the complete text of the GNU General Public
+ .
+ On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the project nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+
 License: wxWindows
  This library is free software; you can redistribute it and/or modify it
  under the terms of the GNU Library General Public Licence as published by

-- 
guayadeque packaging