[SCM] guayadeque/master: Update debian/copyright.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 2cf410c9a4e7f0d51bc58e5a254204ef14f52130
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 11 16:15:08 2012 +0100

    Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 53f86e6..3609d4f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=204
 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+
+Copyright: 2008-2012 Juan Rios <anonbeat at gmail.com>
+License: GPL-3+
 
 Files: src/hmac/*
 Copyright: 2005-2007 Olivier Gay <olivier.gay at a3.epfl.ch>
@@ -38,13 +38,13 @@ Comment:
  Please see the wxWindows license stanza.
 
 File: debian/*
-Copyright: 2010 Alessio Treglia <quadrispro at ubuntu.com>
-License: GPL-2+
+Copyright: 2012 Alessio Treglia <quadrispro at ubuntu.com>
+License: GPL-3+
 
-License: GPL-2+
+License: GPL-3+
  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 version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
  (at your option) any later version.
  .
  This program is distributed in the hope that it will be useful,
@@ -56,7 +56,7 @@ Comment: You should have received a copy of the GNU General Public License along
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  .
  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 version 3 can be found in `/usr/share/common-licenses/GPL-3'.
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
@@ -121,34 +121,6 @@ License: wxWindows
  accordingly.
  .
  4. If you write modifications of your own for this library, it is your
- choice whether to permit this exception to apply to your modifications. 
+ choice whether to permit this exception to apply to your modifications.
  If you do not wish that, you must delete the exception notice from such
  code and/or adjust the licensing conditions notice accordingly.
-
-License: BSD
- Copyright (c) The Regents of the University of California.
- All rights reserved.
- .
- 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 University 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 REGENTS 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 REGENTS 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.

-- 
guayadeque packaging