[debian-edu-commits] debian-edu/italc.git (#126) - master (branch) updated: debian/1_2.0.0-4-8-g64d2a1a

[Mike Gabriel]

The branch, master has been updated
       via  64d2a1a4a538015e8507c0a8bc53515d48505c26 (commit)
      from  0c91e99f723c593edcc94722ab3dc55e0f232a83 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 64d2a1a4a538015e8507c0a8bc53515d48505c26
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Aug 12 14:24:26 2013 +0200

    Update and review and explicitly add OpenSSL exception.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 +-
 debian/copyright |   19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index b6fc1b5..7c93490 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ italc (1:2.0.1-1) UNRELEASED; urgency=low
   * /debian/italc-client.lintian-overrides:
     + Silence lintian about a false-positive spelling error report.
   * /debian/copyright:
-    + Update and review.
+    + Update and review and explicitly add OpenSSL exception.
 
  -- Mike Gabriel <sunweaver at debian.org>  Mon, 12 Aug 2013 12:10:34 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 9f0ffe8..9a7b421 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -141,7 +141,7 @@ Files:
  lib/src/VncView.cpp
 Copyright:
  2004-2013, Tobias Doerffel <tobydox at users.sf.net>
-License: GPL-2+
+License: GPL-2+-with-OpenSSL
 
 Files:
  ica/win32/ultravnc-italc.cpp
@@ -582,10 +582,11 @@ License: GPL-2+
  On Debian systems, the complete text of the GNU General Public
  License, can be found in /usr/share/common-licenses/GPL-2.
 
-License: GPL-2
+License: GPL-2+-with-OpenSSL
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
- version 2 as published by the Free Software Foundation.
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
  .
  This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -596,6 +597,17 @@ License: GPL-2
  along with this program; if not, write to the Free Software
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  .
+ In addition, as a special exception, Tobias Doerffel gives permission to link
+ the code of its release of iTALC with the OpenSSL project's "OpenSSL" library
+ (or modified versions of the "OpenSSL" library that use the same license as the
+ original version), and distribute the linked executables.
+ .
+ You must comply with the GNU General Public License version 2 in all respects
+ for all of the code used other than the "OpenSSL" code.  If you modify this
+ file, you may extend this exception to your version of the file, but you are
+ not obligated to do so.  If you do not wish to do so, delete this exception
+ statement from your version of this file.
+ .
  On Debian systems, the complete text of the GNU General Public
  License, can be found in /usr/share/common-licenses/GPL-2.
 
@@ -641,3 +653,4 @@ License: BSD-3
  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
+


hooks/post-receive
-- 
italc.git (Debian package italc)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "italc.git" (Debian package italc).