[SCM] ardour/master: Update copyright file.

Tue Oct 21 02:17:02 UTC 2014

The following commit has been merged in the master branch:
commit 18b98a2c68c22d83f27bae5f57e84924c29df26b
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Oct 21 04:12:18 2014 +0200

    Update copyright file.

diff --git a/debian/copyright b/debian/copyright
index 0a515e3..7862a79 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,19 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Ardour
 Upstream-Contact: Paul Davis <pbd at op.net>
 Source: http://ardour.org/download
 Copyright: 1998-2010, Paul Davis
+
+Files: *
+Copyright: 1998-2010, Paul Davis
+License: GPL-2+
+
+Files: debian/*
+Copyright:
+ 2006-2009 Free Ekanayaka <freee at debian.org>
+ 2009-2014 Adrian Knoth <adi at drcomp.erfurt.thur.de>
+ 2010-2014 Jonas Smedegaard <dr at jones.dk>
+ 2011-2014 Jaromír Mikeš <mira.mikes at seznam.cz>
 License: GPL-2+
 
 Files: ./libs/glibmm2/*
@@ -45,55 +56,6 @@ Files: ./libs/surfaces/control_protocol/*
 Copyright: 2006, Paul Davis <pbd at op.net>
 License: LGPL-2+
 
-Files: Makefile.in
-Copyright: 1994-2009
-License: other-GAP-FSF-notice
-
-Files: configure
-Copyright: 1992-2008, Free Software Foundation, Inc
-License: other-GAP-FSF
- and GPL-2+ with Libtool exception
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program or library that is built
- using GNU Libtool, you may include this file under the same
- distribution terms that you use for the rest of that program.
-
-Files: config.guess
-	config.sub
-Copyright: 1992-2008, Free Software Foundation, Inc.
-License: GPL-2+ with Autoconf exception
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program that contains a configuration
- script generated by Autoconf, you may include it under the same
- distribution terms that you use for the rest of that program.
-
-Files: install-sh
-Copyright: 1994, X Consortium
-License: Expat and other-nopromo-X
-
-Files: libtool.m4
-Copyright: 1996-2001, 2003-2005, 2008, Free Software Foundation, Inc
-License: GPL-2+ with Libtool exception
- As a special exception to the GNU General Public License, if you
- distribute this file as part of a program or library that is built
- 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,14 +313,12 @@ License: LGPL-2+
 Files: ./libs/pbd/pbd/xml++.h
 	./libs/pbd/xml++.cc
 Copyright: 2000, Ari Johnson, and
-License: LGPL
- FIXME
+License: LGPL-2+
 
 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
@@ -377,10 +337,6 @@ Copyright: 2006, Paul Davis
 	Erik de Castro Lopo
 License: GPL-2+
 
-Files: ./libs/glibmm2/scripts/ltmain.sh
-Copyright: 1996-2001, 2003-2007, 2008 Free Software Foundation, Inc
-License: GPL-2+
-
 Files: ./gtk2_ardour/utils.cc
 Copyright: 2000, Greg Ercolano <erco at 3dsite.com>
 	2003, Paul Davis
@@ -506,17 +462,15 @@ License: other-noncommercial-Watson
 
 Files: ./libs/surfaces/powermate/interface.cc
 Copyright: Harrison Audio, LLC, 2007
-License: NONE
- FIXME
+License: UNKNOWN
 
 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>
+Copyright: Laurent de Soras <laurent at ohmforce.com>
 License: UNKNOWN
- FIXME
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify it
@@ -595,20 +549,6 @@ License: LGPL-2.1
  License along with this program.  If not, see
  <http://www.gnu.org/licenses/>.
 
-License: other-GAP-FSF
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
-
-License: other-GAP-FSF-notice
- This Makefile.in is free software; the Free Software Foundation gives
- unlimited permission to copy and/or distribute it, with or without
- modifications, as long as this notice is preserved.
- .
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
- implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
@@ -635,12 +575,6 @@ License: other-nopromo-Chris
  used in advertising or otherwise to promote the sale, use or other
  dealings in this Software without prior written authorization.
 
-License: other-nopromo-X
- Except as contained in this notice, the name of the X Consortium shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from the X Consortium.
-
 License: other-Apple
  IMPORTANT:  This Apple software is supplied to you by Apple Computer,
  Inc. ("Apple") in consideration of your agreement to the following

-- 
ardour Debian packaging

