[Pkg-voip-commits] r10489 - in /libexosip2/trunk/debian: changelog copyright

[msp at alioth.debian.org]

Author: msp
Date: Wed Jun 25 12:12:22 2014
New Revision: 10489

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10489
Log:
* Upload to unstable - coordinated through debian-release 
* Fix "missing license in debian/copyright" - updated (Closes: #736244)

Modified:
    libexosip2/trunk/debian/changelog
    libexosip2/trunk/debian/copyright

Modified: libexosip2/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/libexosip2/trunk/debian/changelog?rev=10489&op=diff
==============================================================================
--- libexosip2/trunk/debian/changelog	(original)
+++ libexosip2/trunk/debian/changelog	Wed Jun 25 12:12:22 2014
@@ -1,3 +1,10 @@
+libexosip2 (4.1.0-2) unstable; urgency=low
+
+  * Upload to unstable - coordinated through debian-release 
+  * Fix "missing license in debian/copyright" - updated (Closes: #736244)
+
+ -- Mark Purcell <msp at debian.org>  Wed, 25 Jun 2014 22:01:01 +1000
+
 libexosip2 (4.1.0-1) experimental; urgency=low
 
   * New upstream release

Modified: libexosip2/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-voip/libexosip2/trunk/debian/copyright?rev=10489&op=diff
==============================================================================
--- libexosip2/trunk/debian/copyright	(original)
+++ libexosip2/trunk/debian/copyright	Wed Jun 25 12:12:22 2014
@@ -3,29 +3,47 @@
 
 It was downloaded from http://savannah.nongnu.org/projects/eXosip
 
-Copyright Holder: Copyright (C) 2002,2003,2004,2005  Aymeric MOIZARD  - jack at atosc.org
+Copyright (C) 2001-2012 Aymeric MOIZARD amoizard at antisip.com
 
 License:
 
-   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.
+  eXosip 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.
+  
+  eXosip 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
 
+  In addition, as a special exception, the copyright holders give
+  permission to link the code of portions of this program with the
+  OpenSSL library under certain conditions as described in each
+  individual source file, and distribute linked combinations
+  including the two.
+  You must obey the GNU General Public License in all respects
+  for all of the code used other than OpenSSL.  If you modify
+  file(s) with this exception, you may extend this exception to your
+  version of the file(s), but you are not obligated to do so.  If you
+  do not wish to do so, delete this exception statement from your
+  version.  If you delete this exception statement from all source
+  files in the program, then also delete it here.
+
 On Debian systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
-src/inet_ntop.c
+tools/sip_reg.c:
+ * SIP Registration Agent -- by ww at styx.org
+ * 
+ * This program is Free Software, released under the GNU General
+ * Public License v2.0 http://www.gnu.org/licenses/gpl
 
+src/inet_ntop.c:
 /* Copyright (c) 1996 by Internet Software Consortium.
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -42,7 +60,6 @@
 an extension of the license statements of these source files, this file
 may not be changed except with permission from all copyright holders
 of source files in this program which reference this file.
-
 
   LICENSE ISSUES
   ==============