[SCM] guayadeque packaging branch, master, updated. upstream/0.2.5-2-g5b44904

[quadrispro-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5b449042a7d13f2f0ebfb75b7ec7d29fa0c8a6cd
Author: Alessio Treglia <quadrispro at ubuntu.com>
Date:   Wed May 5 00:51:08 2010 +0200

    Fix debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 2abac0c..87bdaa6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,10 +6,29 @@ Source: http://sourceforge.net/projects/guayadeque/files/
 Copyright: 2008-2009 Juan Rios <anonbeat at gmail.com>
 License: GPL-2+
 
+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
 
+Files: ./src/MD5.*
+Copyright: Public domain
+License: other
+ 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.
+ This code is in the public domain; do with it what you wish.
+ .
+ This version implements the MD5 algorithm for the free GUI toolkit wxWidgets.
+ Basic functionality, like MD5 hash creation out of strings and files, or
+ to verify strings and files against a given MD5 hash, was added
+ by Kai Krahn.
+ .
+ This code is provided "as is" and comes without any warranty!
+
 Files: ./src/curl/*, ./src/wx/curl/*
 Copyright: 2004 Casey O'Donnell
 License: wxWidgets, wxWindows
@@ -83,3 +102,33 @@ License: wxWindows
  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.
+X-Comment: On Debian systems, the complete text of the Berkeley software
+ distribution license can be found in `/usr/share/common-licenses/BSD'.

-- 
guayadeque packaging