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

js at users.alioth.debian.org js at users.alioth.debian.org
Sat Mar 3 14:23:06 UTC 2012


The following commit has been merged in the master branch:
commit ccc02a20609633d4d7120c0d3e20aab34558a59f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Mar 3 15:13:00 2012 +0100

    Update copyright file: Rewrite using copyright format 1.0.

diff --git a/debian/copyright b/debian/copyright
index ae0273f..bef6b18 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,16 @@
-Format: http://bzr.debian.org/scm/loggerhead/dep/dep5/trunk/annotate/137/dep5.mdwn
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: IceS
 Upstream-Contact: The IceS Development Team <team at icecast.org>
 Source: http://downloads.xiph.org/releases/ices/
+
+Files: *
 Copyright: 2001-2002, Michael Smith <msmith at xiph.org>
- 2001-2004, The IceS Development Team <team at icecast.org>
+  2001-2004, The IceS Development Team <team at icecast.org>
 License: GPL-2
 
 Files: */Makefile.in
 Copyright: 1994-2002, 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.
+License: GAP~Makefile.in
 
 Files: compile
  config.guess
@@ -36,37 +30,16 @@ Copyright: 1999-2000, the icecast team <team at icecast.org>
 License: LGPL-2+
 
 Files: src/avl/*
-Copyright: 1995, Sam Rushing <rushing at nightmare.com>
- 1995-1997, Sam Rushing <rushing at nightmare.com>
-License:
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose and without fee is hereby granted,
- provided that the above copyright notice appear in all copies and that
- both that copyright notice and this permission notice appear in
- supporting documentation, and that the name of Sam Rushing not be used
- in advertising or publicity pertaining to distribution of the software
- without specific, written prior permission.
- .
- SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
- USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
- OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THIS SOFTWARE.
+Copyright: 1995-1997, Sam Rushing <rushing at nightmare.com>
+License: MIT~Rushing
 
 Files: configure
 Copyright:  1996-2001, 2003, Free Software Foundation, Inc
-License: GAP
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
+License: GAP~configure
 
 Files: aclocal.m4
 Copyright: 1996-2002, 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.
 
 Files: src/resample.h
 Copyright: 2002, Simon Hosie <gumboot at clear.net.nz>
@@ -131,3 +104,39 @@ Comment:
  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: 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~configure
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+
+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.
+ .
+ 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: MIT~Rushing
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for any purpose and without fee is hereby granted,
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in
+ supporting documentation, and that the name of Sam Rushing not be used
+ in advertising or publicity pertaining to distribution of the software
+ without specific, written prior permission.
+ .
+ SAM RUSHING DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ EVENT SHALL SAM RUSHING BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
+ USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THIS SOFTWARE.

-- 
ices2 packaging



More information about the pkg-multimedia-commits mailing list