From d16865cb0581dc48a520d799775342981a66d183 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sat, 3 Oct 2015 14:34:56 +0300 Subject: [PATCH] license openssl exception added --- LICENSE | 17 +++++++++++++++-- README.md | 4 ++-- Telegram/Deploy.sh | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index 70566f2d0e..77e1f6119f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,17 @@ -GNU GENERAL PUBLIC LICENSE +Telegram Desktop is licensed under the GNU General Public License +version 3 with the addition of the following special exception: + +In addition, as a special exception, the copyright holders give +permission to link the code of portions of this program with the OpenSSL +library. +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. + + GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 Copyright (C) 2007 Free Software Foundation, Inc. @@ -671,4 +684,4 @@ into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read -. \ No newline at end of file +. diff --git a/README.md b/README.md index 152906b8ea..c9f43ea9d1 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ This is the complete source code and the build instructions for the alpha version of the official desktop client for the [Telegram][telegram] messenger, based on the [Telegram API][telegram_api] and the [MTProto][telegram_proto] secure protocol. -The source code is published under GPLv3, the license is available [here][license]. +The source code is published under GPLv3 with OpenSSL exception, the license is available [here][license]. ## Supported systems @@ -23,7 +23,7 @@ The source code is published under GPLv3, the license is available [here][licens * OpenAL Soft ([LGPL](http://kcat.strangesoft.net/openal.html)) * Opus codec ([BSD license](http://www.opus-codec.org/license/)) * FFmpeg ([LGPL](https://www.ffmpeg.org/legal.html)) -* Open Sans font ([Apache License](http://www.apache.org/licenses/LICENSE-2.0.html)) +* Open Sans font ([Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0.html)) ## Build instructions diff --git a/Telegram/Deploy.sh b/Telegram/Deploy.sh index d01a68def7..f5e4a4df46 100755 --- a/Telegram/Deploy.sh +++ b/Telegram/Deploy.sh @@ -45,7 +45,7 @@ elif [ "$BuildTarget" == "mac" ]; then WinDeployPath="./../../tother/tsetup/$AppVersionStrMajor/$AppVersionStrFull" WinUpdateFile="tupdate$AppVersion" WinSetupFile="tsetup.$AppVersionStrFull.exe" - WinPortableFile="tportable.$AppVersionStr.zip" + WinPortableFile="tportable.$AppVersionStrFull.zip" WinRemoteFolder="tsetup" DropboxPath="./../../../Dropbox/Telegram/deploy/$AppVersionStrMajor" DropboxDeployPath="$DropboxPath/$AppVersionStrFull"