[SCM] serd/master: Re-licensed under ISC license terms, update debian/copyright.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bca39e3d8222dca5599eef03a69e4c9dbce98de4
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue May 3 13:01:52 2011 +0200

    Re-licensed under ISC license terms, update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index c4b2ddd..d97145b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,11 +3,11 @@ Upstream-Name: Serd
 Upstream-Contact: David Robillard <d at drobilla.net>
 Source: http://svn.drobilla.net/serd/trunk/
 Copyright: 2011 David Robillard <http://drobilla.net>
-License: BSD-2-clause
+License: ISC
 
 Files: *
 Copyright: 2011 David Robillard <http://drobilla.net>
-License: BSD-2-clause
+License: ISC
 
 Files: waf
 Copyright: 2005-2010 Thomas Nagy
@@ -15,29 +15,22 @@ License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2011 Alessio Treglia <alessio at debian.org>
-License: BSD-2-clause
+License: ISC
 
-License: BSD-2-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.
+License: ISC
+ Copyright 2011 David Robillard <http://drobilla.net>
  .
- 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.
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
  .
- THIS SOFTWARE IS PROVIDED ``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
- AUTHOR 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.
+ THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without

-- 
serd packaging