[SCM] gmidimonitor/master: debian/copyright

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 70a71f1fe6f9662e3e799d8c85a9f8691163c728
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu May 19 20:33:33 2011 +0200

    debian/copyright
    
    - Update copyright, licensing information.
    - Update to DEP-5 rev.174.

diff --git a/debian/copyright b/debian/copyright
index be5966c..6fc16d5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,25 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
 Upstream-Name: GMIDImonitor
+Upstream-Contact: Nedko Arnaudov <nedko at arnaudov.name>
 Source: http://home.gna.org/gmidimonitor/
 
 Files: *
-Copyright: 2005-2008 Nedko Arnaudov <nedko at arnaudov.name>
-License: GPL-2.0+
+Copyright: 2005-2011 Nedko Arnaudov <nedko at arnaudov.name>
+License: GPL-2
+
+Files list.h
+License: GPL-2
+Copyright: No copyright holders
+
+Files: waf
+Copyright: 2005-2010 Thomas Nagy
+License: BSD-3-clause
 
 Files: debian/*
 Copyright: 2011 TANIGUCHI Takaki <takaki at debian.org>
-License: GPL-2.0+
+License: GPL-2+
 
-License: GPL-2.0+
+License: GPL-2
  This package 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
@@ -20,9 +29,35 @@ License: GPL-2.0+
  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
+Comment: You should have received a copy of the GNU General Public License
  along with this program. If not, see <http://www.gnu.org/licenses/>
  .
  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. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR "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.

-- 
gmidimonitor packaging