[SCM] calf/master: Rewrite copyright file using format 1.0.

js at users.alioth.debian.org js at users.alioth.debian.org
Thu Apr 5 09:37:42 UTC 2012


The following commit has been merged in the master branch:
commit 3e06d79c9729a0f31c5c4754aaae993c159b9bc8
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Apr 5 11:34:47 2012 +0200

    Rewrite copyright file using format 1.0.

diff --git a/debian/copyright b/debian/copyright
index b17835e..a40627e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,33 +1,37 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-Name: Calf
-Maintainer: Krzysztof Foltman <wdev at foltman.com>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Calf
+Upstream-Contact: Krzysztof Foltman <wdev at foltman.com>
 Source: http://calf.sourceforge.net/
 
+Files: *
 Copyright: 2001-2009, Krzysztof Foltman <wdev at foltman.com>
-License: LGPL-2+
+License: LGPL-2+~Lesser
 
-Files: ./aclocal.m4,
-	Makefile.in
+Files: */Makefile.in
 Copyright: 1994-2009, Free Software Foundation, Inc.
-License: other-GAP
+License: GAP~Makefile.in
 
-Files: ./src/calf/lv2_data_access.h,
-	./src/calf/lv2_polymorphic_port.h,
-	./src/calf/lv2_uri_map.h
+Files: src/calf/lv2_string_port.h
+Copyright: 2008, Krzysztof Foltman <wdev at foltman.com>
+License: LGPL-2+~Lesser~header
+
+Files: src/calf/lv2_data_access.h
+ src/calf/lv2_polymorphic_port.h
+ src/calf/lv2_uri_map.h
 Copyright: 2008, Dave Robillard <dave at drobilla.net>
-License: LGPL-2+
+License: LGPL-2+~Lesser~header
 
-Files: ./src/calf/jackhost.h,
-	./src/calf/preset_gui.h,
-	./src/jackhost.cpp,
-	./src/preset_gui.cpp
+Files: src/calf/jackhost.h
+ src/calf/preset_gui.h
+ src/jackhost.cpp
+ src/preset_gui.cpp
 Copyright: 2007, Krzystof Foltman <wdev at foltman.com>
 License: GPL-2+
 
-Files: ./config.guess,
-	./config.sub,
-	./depcomp,
-	./missing
+Files: config.guess
+ config.sub
+ depcomp
+ missing
 Copyright: 1992-2006, Free Software Foundation, Inc.
 License: GPL-2+ with Autoconf exception
  As a special exception to the GNU General Public License, if you
@@ -35,88 +39,108 @@ License: GPL-2+ with Autoconf exception
  script generated by Autoconf, you may include it under the same
  distribution terms that you use for the rest of that program.
 
-Files: ./configure
+Files: configure
 Copyright: 1992-1996,1998-2009, Free Software Foundation, Inc.
-License: other-GAP-configure
+License: GAP~configure
+
+Files: aclocal.m4
+Copyright: 1996-2009, Free Software Foundation, Inc.
+License: GAP
 
-Files: ./src/calf/lv2_contexts.h
+Files: src/calf/lv2_contexts.h
 Copyright: 2007-2008, Dave Robillard <dave at drobilla.net>
-License: GPL-2+
+License: GPL-2+~header
 
-Files: ./ltmain.sh
-Copyright: 1996-2001, 2003-2008 Free Software Foundation, Inc
+Files: ltmain.sh
+Copyright: 1996-2001,2003-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: ./src/calf/lv2_event.h
+Files: src/calf/lv2_event.h
 Copyright: 2006-2007, Lars Luthman <lars.luthman at gmail.com>
-	2008, Dave Robillard <dave at drobilla.net>
-License: LGPL-2+
+  2008, Dave Robillard <dave at drobilla.net>
+License: LGPL-2+~Lesser~header
 
-Files: ./src/calf/metadata.h
+Files: src/calf/metadata.h
 Copyright: 2007-2008, Krzysztof Foltman <wdev at foltman.com>
-	2008, Thor Harald Johansen <thj at thj.no>
-License: LGPL-2+
+  2008, Thor Harald Johansen <thj at thj.no>
+License: LGPL-2+~Lesser
 
-Files: ./src/calf/lv2-midiport.h
+Files: src/calf/lv2-midiport.h
 Copyright: 2006, Lars Luthman <lars.luthman at gmail.com>
-License: LGPL-2+
+License: LGPL-2+~Lesser
 
-Files: ./src/calf/modules_dev.h
+Files: src/calf/modules_dev.h
 Copyright: 2008, Thor Harald Johansen <thj at thj.no>
-License: LGPL-2+
+License: LGPL-2+~Lesser
 
-Files: ./src/calf/lv2_ui.h
+Files: src/calf/lv2_ui.h
 Copyright: 2000-2002, Paul Barton-Davis
-	2000-2002, Richard W.E. Furse
-	2000-2002, Stefan Westerfeld
-	2006, Dave Robillard <dave at grobilla.net>
-	2006, Steve Harris
-	2006-2008 Lars Luthman <lars.luthman at gmail.com>
-License: LGPL-2.1+
-
-Files: ./install-sh
+  2000-2002, Richard W.E. Furse
+  2000-2002, Stefan Westerfeld
+  2006, Dave Robillard <dave at grobilla.net>
+  2006, Steve Harris
+  2006-2008 Lars Luthman <lars.luthman at gmail.com>
+License: LGPL-2.1+~header
+
+Files: install-sh
 Copyright: 1994, X Consortium
-License: Expat and other-X
+License: Expat~X with X exception
+ 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.
 
-Files: ./src/calf/lv2_progress.h
+Files: src/calf/lv2_progress.h
 Copyright: none (work is in public domain)
 License: PD
  This work is in public domain.
+ .
+ This file 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.
 
 Files: debian/*
-Copyright: 2004-2010, Jonas Smedegaard <dr at jones.dk>
-	2009, Adrian Knoth <adi at drcomp.erfurt.thur.de>
+Copyright: 2009, Adrian Knoth <adi at drcomp.erfurt.thur.de>
+  2010,2012, Jonas Smedegaard <dr at jones.dk>
 License: GPL-2+
 
-License: LGPL-2+
- This program 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; either
- version 2 of the License, or (at your option) any later version.
+License: LGPL-2+~Lesser
+ This program 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; either version 2 of the License, or
+ (at your option) any later version.
  .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
+ This program 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.
+Comment:
+ The 'GNU Lesser General Public License' has no version 2, so actual
+ licensing is assumed to be the 'GNU Library General Public License'.
  .
- Some files differ from above by using the alternate expression "This
- header" instead of "This program" but otherwise identical license and
- disclaimer.
+ On Debian systems the 'GNU Library General Public License' version 2 is
+ located in '/usr/share/common-licenses/LGPL-2'.
  .
- On Debian systems, the complete text of the GNU Lesser General
- Public License (LGPL, formerly named GNU Library General Public
- License) version 2 can be found in
- '/usr/share/common-licenses/LGPL-2'.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this program.  If not, see
+ You should have received a copy of the 'GNU Library General Public
+ License' along with this program.  If not, see
  <http://www.gnu.org/licenses/>.
 
-License: LGPL-2.1+
+License: LGPL-2+~Lesser~header
+ This header 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; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This header 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.
+
+License: LGPL-2.1+~header
  This header 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; either version 2.1 of the License,
@@ -126,53 +150,67 @@ License: LGPL-2.1+
  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.
+Comment:
+ On Debian systems the 'GNU Lesser General Public License' version 2.1
+ is located in '/usr/share/common-licenses/LGPL-2.1'.
  .
- On Debian systems, the complete text of the GNU Lesser General
- Public License (LGPL, formerly named GNU Library General Public
- License) version 2.1 can be found in
- '/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
+ 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: GPL-2+
- 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 Free Software Foundation; either version 2, or (at
- your option) any later version.
+ 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
+ Free Software Foundation; either version 2, or (at your option) any
+ later version.
  .
  This program 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
  General Public License for more details.
+Comment:
+ On Debian systems the 'GNU General Public License' version 2 is located
+ in '/usr/share/common-licenses/GPL-2'.
  .
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License (GPL) version 2 can be found at
- /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/>.
+
+License: GPL-2+~header
+ This header 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, or (at your option) any
+ later version.
  .
- You should have received a copy of the GNU General Public License along
- with this program.  If not, see <http://www.gnu.org/licenses/>.
+ This header 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
+ General Public License for more details.
 
-License: other-GAP
- This file 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.
+License: GAP
+ This file 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.
+ 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: GAP~Makefile.in
+ 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.
  .
- Some files differ from above by using the alternate expression "This
- Makefile.in" instead of "This file" but otherwise identical license and
- disclaimer.
+ 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: other-GAP-configure
+License: GAP~configure
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
 
-License: Expat
+License: Expat~X
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
  "Software"), to deal in the Software without restriction, including
@@ -187,13 +225,7 @@ License: Expat
  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-License: other-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.
+ IN NO EVENT SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list