[Chinese-commits] [qterm] 01/01: Fixes for new release 1:0.7.1-1.

Tue Jan 3 20:40:43 UTC 2017

This is an automated email from the git hooks/post-receive script.

hosiet-guest pushed a commit to branch master
in repository qterm.

commit d7647d0451984806b7efd4fd2b9811e68235963a
Author: Boyuan Yang <073plan at gmail.com>
Date:   Tue Jan 3 19:26:50 2017 +0800

    Fixes for new release 1:0.7.1-1.
---
 debian/changelog                                   |  9 +++--
 debian/control                                     |  2 +-
 debian/copyright                                   | 38 ++++++++++++++++++--
 .../3aeae9dfc6a56c2911a0e31fb27cd16ce276930e.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 5 files changed, 85 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cbb193..eac01d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,12 @@
 qterm (1:0.7.1-1) unstable; urgency=medium
 
-  * Team upload.
+  * New maintainer. (Closes: #841821)
   * ACK previous NMU. Thanks!
   * New upstream release.
     - Switch to new upstream.
     - Add support to OpenSSL 1.1.0. (Closes: #828524)
   * Put package under Debian Chinese Team.
-    - Remove LI Daobing from maintainer list. (Closes: #841821)
+    - Remove LI Daobing from maintainer list.
       Thank you for all your contribution!
     - Add myself onto uploaders list.
   * Switch from cdbs to dh/debhelper buildsystem.
@@ -15,8 +15,11 @@ qterm (1:0.7.1-1) unstable; urgency=medium
   * Bump standard version to 3.9.8.
   * Remove obsolete menu file.
   * Remove obsolete xpm icons.
+  * Add a patch to cherry-pick upstream license change.
+    - Fixes gpl-openssl license issue.
+    - Update d/copyright file.
 
- -- Boyuan Yang <073plan at gmail.com>  Thu, 22 Dec 2016 18:54:59 +0800
+ -- Boyuan Yang <073plan at gmail.com>  Tue, 03 Jan 2017 20:25:40 +0800
 
 qterm (1:0.5.12-1.2) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 5a74802..50adeb8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Chinese Team <chinese-developers at lists.alioth.debian.org>
 Uploaders:
  Boyuan Yang <073plan at gmail.com>,
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 10~),
  cmake,
  qtbase5-dev,
  qttools5-dev,
diff --git a/debian/copyright b/debian/copyright
index 56659fe..044b7ed 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,7 @@ Copyright: kingson <xiaokiangwang at yahoo.com.cn>
            hooey <hephooey at hotmail.com>
            2001-2004, The QTerm Developers
            2003-2016 Xiaoqiang Wang <xiaoqiangwang at gmail.com>
-License: GPL-2+
+License: GPL-2+ with OpenSSL exception
 
 Files: debian/*
 Copyright: 2002-2003 Anthony Fok <foka at debian.org>
@@ -29,7 +29,7 @@ Files: src/osdmessage.*
 Copyright: 2004 by Enrico Ros <eros.kde at email.it>
 License: GPL-2+  
 
-Files: ssh/ssh/crc32.*
+Files: src/ssh/crc32.*
 Copyright: 2003 Markus Friedl
 License: BSD-2-Clause
  Redistribution and use in source and binary forms, with or without
@@ -69,3 +69,37 @@ License: GPL-2+
  .
  On Debian systems, the complete text of version 2 of the GNU General
  Public License may be found in /usr/share/common-licenses/GPL-2.
+
+License: GPL-2+ with OpenSSL exception
+ 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.
+ .
+ In addition, as a special exception, the author of this
+ program gives permission to link the code of its
+ release with the OpenSSL project's "OpenSSL" library (or
+ with modified versions of it that use the same license as
+ the "OpenSSL" library), and distribute the linked
+ executables. You must obey the GNU General Public
+ License in all respects for all of the code used other
+ than "OpenSSL".  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.
+ .
+ This program 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 systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-2'.
diff --git a/debian/patches/3aeae9dfc6a56c2911a0e31fb27cd16ce276930e.patch b/debian/patches/3aeae9dfc6a56c2911a0e31fb27cd16ce276930e.patch
new file mode 100644
index 0000000..fef43a5
--- /dev/null
+++ b/debian/patches/3aeae9dfc6a56c2911a0e31fb27cd16ce276930e.patch
@@ -0,0 +1,41 @@
+From: hephooey <hephooey at users.noreply.github.com>
+Date: Sun, 1 Jan 2017 15:13:18 -0500
+Subject: [PATCH] License update
+Forwarded: not-needed
+
+Upstream has updated the license for the whole project after 0.7.1
+release. Thought the patch is not useful to binary package, this patch
+is shipped to indicate that the project conforms to DFSG requirement.
+
+Commit url: https://github.com/qterm/qterm/commit/3aeae9dfc6a56c2911a0e31fb27cd16ce276930e
+
+This patch shall be removed in next release.
+
+---
+ COPYRIGHT | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/COPYRIGHT b/COPYRIGHT
+index 94a9ed0..f07735b 100644
+--- a/COPYRIGHT
++++ b/COPYRIGHT
+@@ -1,3 +1,16 @@
++QTerm 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
+ 
+-- 
+2.11.0
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9745edd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+3aeae9dfc6a56c2911a0e31fb27cd16ce276930e.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/chinese/qterm.git

