[Pkg-voip-commits] r5160 - in /asterisk/trunk/debian: changelog copyright

paravoid at alioth.debian.org paravoid at alioth.debian.org
Fri Jan 11 19:45:28 UTC 2008


Author: paravoid
Date: Fri Jan 11 19:45:28 2008
New Revision: 5160

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5160
Log:
* Update debian/copyright (packaging copyright, formatting etc.)

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/copyright

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5160&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Fri Jan 11 19:45:28 2008
@@ -1,8 +1,8 @@
 asterisk (1:1.4.17~dfsg-3) UNRELEASED; urgency=low
 
-  * Update debian/copyright with the packaging copyright.
-
- -- Faidon Liambotis <paravoid at debian.org>  Fri, 11 Jan 2008 21:37:00 +0200
+  * Update debian/copyright (packaging copyright, formatting etc.)
+
+ -- Faidon Liambotis <paravoid at debian.org>  Fri, 11 Jan 2008 21:45:01 +0200
 
 asterisk (1:1.4.17~dfsg-2) unstable; urgency=low
 

Modified: asterisk/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/copyright?rev=5160&op=diff
==============================================================================
--- asterisk/trunk/debian/copyright (original)
+++ asterisk/trunk/debian/copyright Fri Jan 11 19:45:28 2008
@@ -1,10 +1,13 @@
 This package was debianized by Mark Purcell <msp at debian.org> on
 Fri Apr 19 19:58:40 EST 2002
 
-Asterisk downloaded from http://www.asterisk.org
-Bristuff downloaded from http://www.junghanns.net/asterisk/
-
-Upstream Authors: Asterisk: Mark Spencer <markster at linux-support.net>
+It is now maintained by the Debian VoIP Team
+<pkg-voip-maintainers at lists.alioth.debian.org>
+
+Asterisk was downloaded from http://www.asterisk.org/
+Bristuff was downloaded from http://www.junghanns.net/asterisk/
+
+Upstream Authors: Asterisk: Digium, Inc.
 		  Bristuff: Klaus-Peter Junghanns <kpj at junghanns.net> 
 
 Debian asterisk-xxx.dfsg.tar.gz
@@ -19,7 +22,8 @@
 
  * The contrib/firmware/iax/iaxy.bin binary firmware without source has been removed.
 
-Copyright:
+Copyright
+=========
 
 Copyright (C) 2001-2004 Digium and others....
 
@@ -40,28 +44,28 @@
    On Debian GNU/Linux systems, the complete text of the GNU General
    Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-    Asterisk is distributed under GNU General Public License.  The GPL also
-  must apply to all loadable modules as well, except as defined below.
-
-    Digium, Inc. (formerly Linux Support Services) retains copyright to all
-  of the core Asterisk system, and therefore can grant, at its sole discretion,
-  the ability for companies, individuals, or organizations to create proprietary
-  or Open Source (but non-GPL'd) modules which may be dynamically linked at
-  runtime with the portions of Asterisk which fall under our copyright
-  umbrella, or are distributed under more flexible licenses than GPL
-
-    If you wish to use our code in other GPL programs, don't worry -- there
-  is no requirement that you provide the same exemption in your GPL'd
-  products (although if you've written a module for Asterisk we would
-  strongly encourage you to make the same excemption that we do).
-
-    Specific permission is also granted to OpenSSL and OpenH323 to link to
-  Asterisk.
-
-    If you have any questions, whatsoever, regarding our licensing policy,
-  please contact us.
-
-    The 'Asterisk' name and logos are trademarks owned by Digium, Inc.,
+   Asterisk is distributed under GNU General Public License.  The GPL also
+   must apply to all loadable modules as well, except as defined below.
+
+   Digium, Inc. (formerly Linux Support Services) retains copyright to all
+   of the core Asterisk system, and therefore can grant, at its sole discretion,
+   the ability for companies, individuals, or organizations to create proprietary
+   or Open Source (but non-GPL'd) modules which may be dynamically linked at
+   runtime with the portions of Asterisk which fall under our copyright
+   umbrella, or are distributed under more flexible licenses than GPL
+
+   If you wish to use our code in other GPL programs, don't worry -- there
+   is no requirement that you provide the same exemption in your GPL'd
+   products (although if you've written a module for Asterisk we would
+   strongly encourage you to make the same excemption that we do).
+
+   Specific permission is also granted to OpenSSL and OpenH323 to link to
+   Asterisk.
+
+   If you have any questions, whatsoever, regarding our licensing policy,
+   please contact us.
+
+   The 'Asterisk' name and logos are trademarks owned by Digium, Inc.,
    and use of them is subject to our trademark licensing policies. If you
    wish to use these trademarks for purposes other than simple
    redistribution of Asterisk source code obtained from Digium, you
@@ -129,12 +133,37 @@
 
  Bristuff:
 
-    * Copyright (C) 2004, 2005 Junghanns.NET GmbH
-    *
-    * Klaus-Peter Junghanns <kpj at junghanns.net>
-    *
-    * This program is free software and may be modified and
-    * distributed under the terms of the GNU Public License.
+    Copyright (C) 2004, 2005 Junghanns.NET GmbH
+
+    Klaus-Peter Junghanns <kpj at junghanns.net>
+
+    This program is free software and may be modified and
+    distributed under the terms of the GNU General Public License.
+
+ The packaging Debian (debian/ directory) is:
+
+    Copyright (c) Kilian Krause <kilian at debian.org>
+    Copyright (c) Mark Purcell <msp at debian.org>
+    Copyright (c) Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+    Copyright (c) Faidon Liambotis <paravoid at debian.org>
+ 
+    This package 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 of the License, or
+    (at your option) any later version.
+ 
+    This package 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.
+ 
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+    MA 02110-1301, USA.
+  
+    On Debian GNU/Linux systems, the complete text of the GNU General
+    Public License can be found in `/usr/share/common-licenses/GPL'.
 
 Other portions of code:
 
@@ -189,7 +218,7 @@
 channels/DialTone.h:  * Copyright (C) 1999, Mark Spencer
 channels/Makefile:# Copyright (C) 1999-2005, Mark Spencer
 codecs/codec_ilbc.c: * The iLBC code is from The IETF code base and is copyright The Internet Society (2004)
-doc/README.backtrace:Copyright 2004 Free Software Foundation, Inc.
+doc/README.backtrace:Copyright 2004 Free Software Foundation, Inc.
 editline/: * Copyright (c) 1992, 1993
  *      The Regents of the University of California.  All rights reserved.
 editline/editline.3:.\" Copyright (c) 1997-1999 The NetBSD Foundation, Inc.
@@ -227,27 +256,3 @@
 include/asterisk/poll-compat.h:		Copyright (c) 1995-2002 Brian M. Clapper
 include/asterisk/res_odbc.h: * Copyright (C) 2004 - 2005, Anthony Minessale II
 include/asterisk/slinfactory.h: * Copyright (C) 2005, Anthony Minessale II
-
-The packaging Debian (debian/ directory) is:
-   (c) Kilian Krause <kilian at debian.org>
-   (c) Mark Purcell <msp at debian.org>
-   (c) Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-   (c) Faidon Liambotis <paravoid at debian.org>
-
-   This package 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 of the License, or
-   (at your option) any later version.
-
-   This package 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.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-   MA 02110-1301, USA.
- 
-   On Debian GNU/Linux systems, the complete text of the GNU General
-   Public License can be found in `/usr/share/common-licenses/GPL'.




More information about the Pkg-voip-commits mailing list