r37669 - in /desktop/experimental/ekiga/debian: changelog copyright

[dedu-guest at users.alioth.debian.org]

Author: dedu-guest
Date: Thu May  9 07:01:32 2013
New Revision: 37669

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37669
Log:
* Add license exception in debian/copyright
* Upload to unstable

Modified:
    desktop/experimental/ekiga/debian/changelog
    desktop/experimental/ekiga/debian/copyright

Modified: desktop/experimental/ekiga/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/changelog?rev=37669&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/changelog [utf-8] (original)
+++ desktop/experimental/ekiga/debian/changelog [utf-8] Thu May  9 07:01:32 2013
@@ -1,9 +1,16 @@
+ekiga (4.0.1-2) unstable; urgency=low
+
+  * Add license exception in debian/copyright
+  * Upload to unstable
+
+ -- Eugen Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>  Wed, 08 May 2013 21:13:35 +0100
+
 ekiga (4.0.1-1) experimental; urgency=low
 
   [ Eugen Dedu ]
   * New upstream stable release
   * Really add ekiga-plugin-evolution package (Closes: 520830)
-  
+
   [ Kilian Krause ]
   * Add missing ${shlibs:Depends} to ekiga-plugin-evolution
   * Fix debhelper build-depends (upgrade to >=9) due to compat level

Modified: desktop/experimental/ekiga/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/ekiga/debian/copyright?rev=37669&op=diff
==============================================================================
--- desktop/experimental/ekiga/debian/copyright [utf-8] (original)
+++ desktop/experimental/ekiga/debian/copyright [utf-8] Thu May  9 07:01:32 2013
@@ -1,7 +1,7 @@
 This package was debianized by Sander Smeenk <ssmeenk at debian.org> on
-Fri, 24 Jan 2003 19:27:09 +0100.  Since then, it was enhanced by
-Kilian Krause <kk at verfaction.de>.  Finally, it was enhanced by Eugen
-Dedu <Eugen.Dedu at pu-pm.univ-fcomte.fr>, who actually maintains it.
+Fri, 24 Jan 2003 19:27:09 +0100.  Since then, it has been enhanced by
+Kilian Krause <kk at verfaction.de> and Eugen Dedu
+<Eugen.Dedu at pu-pm.univ-fcomte.fr>, who currently maintain it.
 
 It was downloaded from:
         http://ftp.gnome.org/pub/GNOME/sources/ekiga/
@@ -11,18 +11,13 @@
 
 Copyright:
 
-  Ekiga is Copyright (C) 2000-2009 Damien Sandras.
+  Ekiga is Copyright (C) 2000-2012 Damien Sandras.
 
   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 of the License, or
   (at your option) any later version, which are available in
   /usr/share/common-licenses on Debian systems.
-
-  An exemption is provided by upstream to allow linking this program with
-  OPAL and PTLib libraries, both covered by a MPL license.
-
-  Additionally the following parts are covered by LGPL: lib/pixops.
 
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -34,3 +29,14 @@
   GNU/Linux distribution in directory /usr/share/common-licenses; if
   not, write to the Free Software Foundation, Inc., 51 Franklin St,
   Fifth Floor, Boston, MA 02110-1301, USA.
+
+  Ekiga is licenced under the GPL licence and as a special exception,
+  you have permission to link or otherwise combine this program with
+  the programs OPAL, OpenH323 and PTLIB, and distribute the
+  combination, without applying the requirements of the GNU GPL to the
+  OPAL, OpenH323 and PTLIB programs, as long as you do follow the
+  requirements of the GNU GPL for all the rest of the software thus
+  combined.
+
+  Additionally the following parts are covered by LGPL: lib/pixops.
+