[SCM] ardour3/master: Improve debian/copyright

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

The following commit has been merged in the master branch:
commit a2e5fa1e17a463a8333f0a6cfe67bc31ab018d52
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Mon Apr 22 22:32:50 2013 +0200

    Improve debian/copyright
    
    Note that the updated file does not reflect the current source tree but
    a yet-to-be-merged branch I've prepared for upstream.
    
    We'd have to recreate the DFSG-orig tarball from this branch or simply
    wait for ardour-3.2.

diff --git a/debian/copyright b/debian/copyright
index 3579239..3afe1d0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -78,21 +78,6 @@ License: GPL-2+ with Libtool exception
  using GNU Libtool, you may include this file under the same
  distribution terms that you use for the rest of that program.
 
-Files: ltoptions.m4
-	ltsugar.m4
-	ltversion.m4
-	lt~obsolete.m4
-Copyright: 2004, Free Software Foundation, Inc
-	2004-2005, 2007 Free Software Foundation, Inc
-	2004-2005, 2007-2008, Free Software Foundation, Inc
-License: UNKNOWN
- FIXME
-
-Files: missing
-Copyright: 1996-1997, 1999-2000, 2002-2006
-License: GPL
- FIXME
-
 Files: ./libs/gtkmm2ext/auto_spin.cc
 	./libs/gtkmm2ext/choice.cc
 	./libs/gtkmm2ext/click_box.cc
@@ -351,13 +336,6 @@ Files: ./libs/pbd/pbd/xml++.h
 	./libs/pbd/xml++.cc
 Copyright: 2000, Ari Johnson, and
 License: LGPL
- FIXME
-
-Files: ./gtk2_ardour/canvas-imageframe.c
-	./gtk2_ardour/canvas-imageframe.h
-Copyright: 1998, The Free Software Foundation
-License: UNKNOWN
- FIXME
 
 Files: ./libs/ardour/cycle_timer.cc
 Copyright: 2002, Andrew Morton
@@ -499,34 +477,13 @@ Files: ./libs/vamp-plugins/AmplitudeFollower.cpp
 Copyright: 2006, Dan Stowell
 License: Expat and other-nopromo-Chris
 
-Files: ./libs/pbd/dmalloc.cc
-Copyright: 1995, Gray Watson
-License: other-noncommercial-Watson
- FIXME
-
-Files: ./libs/surfaces/powermate/interface.cc
-Copyright: Harrison Audio, LLC, 2007
-License: NONE
- FIXME
-
 Files: tools/session_exchange.py
 Copyright: 2004-2005 Taybin Rutkin
 License: GPL
 
 Files: ./libs/pbd/pbd/fastlog.h
 Copyright: unknown. Code by Laurent de Soras <laurent at ohmforce.com>
-License: UNKNOWN
- FIXME
-
-Files: autowaf.py
-Copyright:
- 2008 David Robillard
- 2008 Nedko Arnaudov
-License: GPL-2+
-
-Files: waf
-Copyright: Thomas Nagy, 2005-2010
-License: BSD-3-clause
+License: WTFPL-2
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify it
@@ -544,7 +501,7 @@ License: GPL-2+
  .
  On Debian GNU systems, the complete text of the GNU General Public
  License (GPL) version 2 or later can be found in
- '/usr/share/common-licenses/GPL'.
+ '/usr/share/common-licenses/GPL-2'.
  .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -562,7 +519,7 @@ License: LGPL-2.1+
  .
  On Debian GNU systems, the complete text of the GNU Lesser General
  Public License (LGPL) version 2.1 or later can be found in
- '/usr/share/common-licenses/LGPL'.
+ '/usr/share/common-licenses/LGPL-2.1'.
  .
  You should have received a copy of the GNU Lesser General Public
  License along with this program.  If not, see
@@ -581,7 +538,7 @@ License: LGPL-2+
  .
  On Debian GNU systems, the complete text of the GNU Library General
  Public License (LGPL - later renamed GNU Lesser General Public License)
- version 2 or later can be found in '/usr/share/common-licenses/LGPL'.
+ version 2 or later can be found in '/usr/share/common-licenses/LGPL-2'.
  .
  You should have received a copy of the GNU Library General Public
  License along with this program.  If not, see
@@ -599,7 +556,7 @@ License: LGPL-2.1
  .
  On Debian GNU systems, the complete text of the GNU Lesser General
  Public License (LGPL) version 2.1 can be found in
- '/usr/share/common-licenses/LGPL'.
+ '/usr/share/common-licenses/LGPL-2.1'.
  .
  You should have received a copy of the GNU Lesser General Public
  License along with this program.  If not, see
@@ -742,8 +699,12 @@ License: GPL
  .
  On Debian GNU systems, the complete text of the GNU General Public
  License (GPL) version 1 or later can be found in
- '/usr/share/common-licenses/GPL'.
+ '/usr/share/common-licenses/GPL-1'.
  .
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+License: WTFPL-2
+ This work is free. You can redistribute it and/or modify it under the
+ terms of the Do What The Fuck You Want To Public License, Version 2,
+ as published by Sam Hocevar. See http://www.wtfpl.net/ for more details.

-- 
ardour3 packaging