From 64ea54d4feaf2f34ef84b1477a3ccff24244811d Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Mon, 11 Jan 2016 20:39:47 +0100 Subject: [PATCH] Cherry-picking upstream version 0.6.0+20160108 Modification of treatment of double-width character (e.g. Japanese) https://github.com/lxde/qtermwidget/pull/55#issuecomment-170615897 Fixed copyright No full stop in short descriptions, see lintian warning: 'description-synopsis-might-not-be-phrased-properly' Fixed descriptions in debian/control --- debian/changelog | 15 +++++++++++++++ debian/control | 6 +++--- debian/copyright | 15 ++++++++------- debian/rules | 1 - 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 05cc9b9..48d510a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +qtermwidget (0.6.0+20160108-1) unstable; urgency=medium + + [ Alf Gaida ] + * Cherry-picking upstream version 0.6.0+20160108, Modification + of treatment of double-width character (e.g. Japanese) + https://github.com/lxde/qtermwidget/pull/55#issuecomment-170615897 + * Fixed copyright + * No full stop in short descriptions, see lintian warning: + 'description-synopsis-might-not-be-phrased-properly' + + [ Peter Mattern ] + * Fixed descriptions in debian/control + + -- Alf Gaida Mon, 11 Jan 2016 20:41:00 +0100 + qtermwidget (0.6.0+20151225-1) unstable; urgency=medium * Cherry-picking upstream version 0.6.0+201501225. diff --git a/debian/control b/debian/control index d41867e..bad2c75 100644 --- a/debian/control +++ b/debian/control @@ -19,7 +19,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, qtermwidget5-data (= ${source:Version}), Pre-Depends: ${misc:Pre-Depends} -Description: Terminal emulator widget for Qt 5 - shared libraries. +Description: Terminal emulator widget for Qt 5 (shared libraries) QTermWidget is a Unicode-enabled, embeddable Qt widget that can be used as built-in console or terminal emulation widget. . @@ -30,7 +30,7 @@ Architecture: any Section: libdevel Depends: ${misc:Depends}, libqtermwidget5-0 (= ${binary:Version}), -Description: Terminal emulator widget for Qt 5 - development files. +Description: Terminal emulator widget for Qt 5 (development files) QTermWidget is a Unicode-enabled, embeddable Qt widget that can be used as built-in console or terminal emulation widget. . @@ -39,7 +39,7 @@ Description: Terminal emulator widget for Qt 5 - development files. Package: qtermwidget5-data Architecture: all Depends: ${misc:Depends}, -Description: Terminal emulator widget for Qt 5 - data files. +Description: Terminal emulator widget for Qt 5 (data files) QTermWidget is a Unicode-enabled, embeddable Qt widget that can be used as built-in console or terminal emulation widget. . diff --git a/debian/copyright b/debian/copyright index d300fbc..1a5fc65 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,10 +3,10 @@ Upstream-Name: qtermwidget Source: https://github.com/qterminal/qtermwidget Files: * -Copyright: Copyright (C) 2000 by Stephan Kulow - Copyright (C) 2008 e_k (e_k@users.sourceforge.net) - Copyright 2007-2008 by Robert Knight - Copyright 1997,1998 by Lars Doelle +Copyright: 2000 Stephan Kulow + 2008 e_k + 2007-2008 Robert Knight + 1997,1998 Lars Doelle License: GPL-2+ Files: lib/kprocess.* @@ -14,16 +14,17 @@ Files: lib/kprocess.* lib/qtermwidget.* lib/TerminalCharacterDecoder.* src/main.cpp -Copyright: Copyright (C) 2007 Oswald Buddenhagen - Copyright (C) 2008 e_k (e_k@users.sourceforge.net) +Copyright: 2007 Oswald Buddenhagen + 2008 e_k (e_k@users.sourceforge.net) License: LGPL-2+ Files: debian/* -Copyright: 2012-2015 Alf Gaida +Copyright: 2012-2016 Alf Gaida 2012 Thorsten Wohlfarth 2012 Henson Sturgill 2015 ChangZhuo Chen (陳昌倬) 2015 Andrew Lee (李健秋) + 2016 Peter Mattern License: GPL-2+ License: LGPL-2+ diff --git a/debian/rules b/debian/rules index 54d66fb..1f88e7d 100755 --- a/debian/rules +++ b/debian/rules @@ -7,4 +7,3 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed dh ${@} --buildsystem cmake \ --parallel \ --fail-missing -