[SCM] ardour3/master: wrap-and-sort -a -s

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

The following commit has been merged in the master branch:
commit e49d6819a862e85366a5e0fa24b64bf6674e5c32
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Fri Aug 23 14:42:54 2013 +0200

    wrap-and-sort -a -s

diff --git a/debian/copyright b/debian/copyright
index 3afe1d0..990a357 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,18 @@
-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:
+ 2013 Adrian Knoth <adi at drcomp.erfurt.thur.de>
+ 2013 Jaromír Mikeš <mira.mikes at seznam.cz>
 License: GPL-2+
 
 Files: ./libs/glibmm2/*
@@ -506,6 +516,23 @@ License: 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/>.
 
+License: LGPL
+ This library is free software; you can redistribute it and/or modify it
+ under the terms of the GNU Lesser General Public License as published
+ by the Free Software Foundation.
+ .
+ This library is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
+ General Public License for more details.
+ .
+ On Debian GNU systems, the complete text of the GNU Lesser General
+ Public License (LGPL) can be found in '/usr/share/common-licenses/LGPL'.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program.  If not, see
+ <http://www.gnu.org/licenses/>.
+
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or modify it
  under the terms of the GNU Lesser General Public License as published
@@ -562,10 +589,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
@@ -648,41 +671,6 @@ License: other-Apple
  STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
 
-License: other-noncommercial-Watson
- Permission to use, copy, modify, and distribute this software for any
- NON-COMMERCIAL purpose and without fee is hereby granted, provided that
- the above copyright notice and this permission notice appear in all
- copies, and that the name of Gray Watson not be used in advertising or
- publicity pertaining to distribution of the document or software
- without specific, written prior permission.
-
-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.
-
 License: GPL
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU General Public License as published by the

-- 
ardour3 packaging