[SCM] toonloop/master: Rewrite copyright file using Subversion r153 candidate draft of DEP5 format.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue Jan 11 05:06:57 UTC 2011


The following commit has been merged in the master branch:
commit 6e7989735f69f73def1cd100f4be8e7868cd2927
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Jan 11 05:42:41 2011 +0100

    Rewrite copyright file using Subversion r153 candidate draft of DEP5 format.

diff --git a/debian/copyright b/debian/copyright
index 5b7b51a..5d640d3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,23 +1,41 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-Name: Toonloop
-Contact: Alexandre Quessy <info at toonloop.com>
-	Toonloop discussions <list at toonloop.com>
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=153
+Upstream-Name: Toonloop
+Upstream-Contact: Alexandre Quessy <info at toonloop.com>
+ Toonloop discussions <list at toonloop.com>
 Source: http://www.toonloop.com
-
 Copyright: 2010, Alexandre Quessy
 License: GPL-3+
 
-Files: Makefile.in,
-	./configure,
-	./m4/libtool.m4,
-	./m4/lt*.m4
+Files: */Makefile.in
 Copyright: 1992-2009, Free Software Foundation, Inc.
 License: GAP
+ 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.
 
-Files: ./config.guess,
-	./config.sub,
-	./ltmain.sh,
-	./missing,
+Files: configure
+ m4/libtool.m4
+ m4/lt*.m4
+Copyright: 1992-2009, Free Software Foundation, Inc.
+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.
+
+Files: config.guess
+ config.sub
+ ltmain.sh
+ missing
 Copyright: 1992-2009, Free Software Foundation, Inc.
 License: GPL-2+ with Autoconf exception
  As a special exception to the GNU General Public License, if you
@@ -25,34 +43,42 @@ 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: ./src/v4l2util.cpp,
-	./src/v4l2util.h
+Files: src/v4l2util.cpp
+ src/v4l2util.h
 Copyright: 2008-2009, Société des arts technologiques (SAT)
 License: GPL-3+
 
-Files: ./m4/ax_boost_*.m4
+Files: m4/ax_boost_*.m4
 Copyright: 2008, Daniel Casimiro <dan.casimiro at gmail.com>
-	2008-2009, Michael Tindal
-	2008-2009, Thomas Porschberg <thomas at randspringer.de>
-	2009, Roman Rybalko <libtorrent at romanr.info>
-License: other-GAP-Boost
+ 2008-2009, Michael Tindal
+ 2008-2009, Thomas Porschberg <thomas at randspringer.de>
+ 2009, Roman Rybalko <libtorrent at romanr.info>
+License: GAP
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved. This file is offered as-is,
+ without any warranty.
 
-Files: ./aclocal.m4
+Files: aclocal.m4
 Copyright: 1996-2009, Free Software Foundation, Inc
-	2004, Scott James Remnant <scott at netsplit.com>
+ 2004, Scott James Remnant <scott at netsplit.com>
 License: GAP and 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
+Files: install-sh
 Copyright: 1994, X Consortium
-License: Expat and other-X
+License: Expat 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: ./debian/*
+Files: debian/*
 Copyright: 2010, Alexandre Quessy <alexandre at quessy.net>
-	2010, Jonas Smedegaard <dr at jones.dk>
+ 2010, Jonas Smedegaard <dr at jones.dk>
 License: GPL-3
 
 License: GPL-3+
@@ -65,7 +91,7 @@ License: GPL-3+
  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-Notes:
+Comment:
  Some files differ from above by replacing "this file" and/or "this
  program" with more specific terms.
  .
@@ -84,7 +110,7 @@ License: GPL-3
  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-Notes:
+Comment:
  On Debian systems, the complete text of the GNU General Public License
  (GPL) version 3 can be found in '/usr/share/common-licenses/GPL-3'.
  .
@@ -101,32 +127,13 @@ License: GPL-2+
  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-Notes:
+Comment:
  On Debian systems, the complete text of the GNU General Public License
  (GPL) version 2 can be found in '/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: 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.
-License-Notes:
- Some files differ from above by replacing "this file" and/or "this
- program" with more specific terms.
-
-License: other-GAP-Boost
- Copying and distribution of this file, with or without modification,
- are permitted in any medium without royalty provided the copyright
- notice and this notice are preserved. This file is offered as-is,
- without any warranty.
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the
@@ -146,12 +153,6 @@ License: Expat
  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-Notes:
+Comment:
  Some files differ from above by replacing "The authors or copyright
  holders" with more specific term.
-
-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.

-- 
toonloop packaging



More information about the pkg-multimedia-commits mailing list