diff --git a/debian/changelog b/debian/changelog index fda3a74..6800eb9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,52 +1,55 @@ -qtermwidget (0.14.1-0ubuntu3) focal; urgency=medium +qtermwidget (0.14.1-3ubuntu1) focal; urgency=medium - * Update symbols from build logs. + * debian/control: Add Breaks/Replaces on qtermwidget-l10n to + qtermwidget5-data. Fixes upgrade from 0.14.1-0ubuntu3 or earlier. + (LP: #1864170) - -- apt-ghetto Wed, 04 Dec 2019 19:26:46 +0100 + -- Rik Mills Tue, 25 Feb 2020 16:24:33 +0000 -qtermwidget (0.14.1-0ubuntu2) disco; urgency=medium +qtermwidget (0.14.1-3) unstable; urgency=medium - * Update symbols from build logs. + * Bumped Standards-Version to 4.5.0, no changes needed + * Removed the not existing package qtermwidget-l10n from recommends, + thanks @wxl, nice finding. - -- Simon Quigley Sat, 09 Mar 2019 13:02:19 -0600 + -- Alf Gaida Sun, 23 Feb 2020 22:16:09 +0100 -qtermwidget (0.14.1-0ubuntu1) disco; urgency=medium +qtermwidget (0.14.1-2) unstable; urgency=medium - * New upstream release. - * Remove memory management patch which causes crashes. - * Run wrap-and-sort. + * Switched to gbp + * Bumped Standards-Version to 4.4.1, no changes needed + * Fixed one symbol for ia64 + * Added Rules-Requires-Root: no to make lintian happy - -- Simon Quigley Sat, 09 Mar 2019 12:42:15 -0600 + -- Alf Gaida Sun, 27 Oct 2019 00:04:08 +0200 -qtermwidget (0.14.0-0ubuntu2) disco; urgency=medium +qtermwidget (0.14.1-1) unstable; urgency=medium - * Add Breaks/Replaces on qtermwidget-l10n. + * Cherry-picking upstream release: 0.14.1. - -- Simon Quigley Sat, 26 Jan 2019 10:17:31 -0600 + -- Alf Gaida Tue, 26 Feb 2019 01:00:03 +0100 -qtermwidget (0.14.0-0ubuntu1) disco; urgency=medium +qtermwidget (0.14.0-1) unstable; urgency=medium - * New upstream release. - - Bump build dependencies. - * Bump Standards-version to 4.3.0, no changes needed. - * Bump debhelper compat to 12, no changes needed. - * Add qtermwidget-l10n package. - * Update symbols from build logs. + * Cherry-picking upstream release: 0.14.0. + * Bumped Standards to 4.3.0, no changes needed + * Dropped d/compat, use debhelper-compat = 12, no changes needed + * Fixed years in d/copyright + * Bumped minimum version lxqt-build-tools (>= 0.6.0~) + * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure + * Added Build-Depends-Package field to symbols + * Installed new translations in the data package. + * Added two new symbols + * Added d/upstream/metadata - -- Simon Quigley Fri, 25 Jan 2019 23:43:05 -0600 + -- Alf Gaida Sun, 27 Jan 2019 15:29:16 +0100 -qtermwidget (0.9.0-1ubuntu2) cosmic; urgency=medium +qtermwidget (0.9.0-2) unstable; urgency=medium - * Update symbols from build logs. + * Recommend fonts-hack instead of fonts-hack-ttf (Closes: #907279) + * Bumped Standards to 4.2.1, no changes needed - -- Simon Quigley Tue, 10 Jul 2018 22:29:14 -0500 - -qtermwidget (0.9.0-1ubuntu1) cosmic; urgency=medium - - * Update the maintainer and Vcs-* for maintaining in Lubuntu. - * Add patch reworking memory management of filter-related objects. - - -- Simon Quigley Tue, 10 Jul 2018 22:19:52 -0500 + -- Alf Gaida Sun, 16 Sep 2018 14:16:19 +0200 qtermwidget (0.9.0-1) unstable; urgency=medium diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 48082f7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/debian/control b/debian/control index e68321a..b016be9 100644 --- a/debian/control +++ b/debian/control @@ -1,28 +1,28 @@ Source: qtermwidget -Maintainer: Lubuntu Developers -Uploaders: Simon Quigley -XSBC-Original-Maintainer: LXQt Packaging Team +Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + ChangZhuo Chen (陳昌倬) , + Andrew Lee (李健秋) Section: libs Priority: optional -Build-Depends: cmake, - debhelper (>= 12), +Build-Depends: debhelper-compat (= 12), + cmake, libutf8proc-dev, - lxqt-build-tools (>= 0.6.0), + lxqt-build-tools (>= 0.6.0~), qtbase5-dev -Standards-Version: 4.3.0 -Vcs-Browser: https://phab.lubuntu.me/source/qtermwidget/ -Vcs-Git: https://phab.lubuntu.me/source/qtermwidget.git -XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/qtermwidget -XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/qtermwidget.git +Standards-Version: 4.5.0 +Vcs-Browser: https://salsa.debian.org/lxqt-team/qtermwidget +Vcs-Git: https://salsa.debian.org/lxqt-team/qtermwidget.git Homepage: https://github.com/lxqt/qtermwidget +Rules-Requires-Root: no Package: libqtermwidget5-0 Architecture: any Multi-Arch: same -Depends: qtermwidget5-data (= ${source:Version}), +Depends: ${shlibs:Depends}, ${misc:Depends}, - ${shlibs:Depends} -Recommends: fonts-hack-ttf, qtermwidget-l10n + qtermwidget5-data (= ${source:Version}) +Recommends: fonts-hack Pre-Depends: ${misc:Pre-Depends} Description: Terminal emulator widget for Qt 5 (shared libraries) QTermWidget is a Unicode-enabled, embeddable Qt widget that can be used as @@ -34,7 +34,8 @@ Package: libqtermwidget5-0-dev Architecture: any Multi-Arch: same Section: libdevel -Depends: libqtermwidget5-0 (= ${binary:Version}), ${misc:Depends} +Depends: ${misc:Depends}, + libqtermwidget5-0 (= ${binary:Version}) 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. @@ -45,18 +46,11 @@ Package: qtermwidget5-data Architecture: all Multi-Arch: foreign Depends: ${misc:Depends} +Breaks: qtermwidget-l10n (<< 0.14.1-2~) +Replaces: qtermwidget-l10n (<< 0.14.1-2~) 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. . - This package provides data files like keyboard layouts and color schemes. - -Package: qtermwidget-l10n -Architecture: all -Multi-Arch: foreign -Section: localization -Breaks: qtermwidget-l10n (<< 0.14.0) -Replaces: qtermwidget-l10n (<< 0.14.0) -Depends: qttranslations5-l10n, ${misc:Depends} -Description: Language package for qtermwidget - This package contains the l10n files needed by qtermwidget. + This package provides data files like translations, keyboard layouts + and color schemes. diff --git a/debian/copyright b/debian/copyright index 6121b84..4f2f683 100644 --- a/debian/copyright +++ b/debian/copyright @@ -18,7 +18,7 @@ Copyright: 2007 Oswald Buddenhagen License: LGPL-2+ Files: debian/* -Copyright: 2012-2018 Alf Gaida +Copyright: 2012-2020 Alf Gaida 2016 Peter Mattern 2015 ChangZhuo Chen (陳昌倬) 2015 Andrew Lee (李健秋) diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..8957fee --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,6 @@ +[DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/latest +pristine-tar = True +compression = xz + diff --git a/debian/libqtermwidget5-0-dev.install b/debian/libqtermwidget5-0-dev.install index b6b543b..2d28eed 100644 --- a/debian/libqtermwidget5-0-dev.install +++ b/debian/libqtermwidget5-0-dev.install @@ -1,4 +1,6 @@ usr/include -usr/lib/*/cmake/qtermwidget5/*.cmake + usr/lib/*/libqtermwidget5.so usr/lib/*/pkgconfig/qtermwidget5.pc + +usr/lib/*/cmake/qtermwidget5/*.cmake diff --git a/debian/libqtermwidget5-0.symbols b/debian/libqtermwidget5-0.symbols index 7e7cc66..a259f4c 100644 --- a/debian/libqtermwidget5-0.symbols +++ b/debian/libqtermwidget5-0.symbols @@ -1,4 +1,5 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# +* Build-Depends-Package: libqtermwidget5-0-dev (c++)"QTermWidget::QTermWidget(QWidget*)@Base" 0.6.0 (c++)"QTermWidget::QTermWidget(int, QWidget*)@Base" 0.6.0 (c++)"QTermWidget::activity()@Base" 0.6.0 @@ -12,6 +13,7 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (c++)"QTermWidget::copyAvailable(bool)@Base" 0.6.0 (c++)"QTermWidget::copyClipboard()@Base" 0.6.0 (c++)"QTermWidget::cursorChanged(Konsole::Emulation::KeyboardCursorShape, bool)@Base" 0.8.0 + (c++)"QTermWidget::filterActions(QPoint const&)@Base" 0.7.1 (c++)"QTermWidget::find()@Base" 0.6.0 (c++)"QTermWidget::findNext()@Base" 0.6.0 (c++)"QTermWidget::findPrevious()@Base" 0.6.0 @@ -19,7 +21,7 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (c++)"QTermWidget::flowControlEnabled()@Base" 0.6.0 (c++)"QTermWidget::getHotSpotAt(QPoint const&) const@Base" 0.6.0 (c++)"QTermWidget::getHotSpotAt(int, int) const@Base" 0.6.0 - (c++)"QTermWidget::getMargin() const@Base" 0.14.0 + (c++)"QTermWidget::getMargin() const@Base" 0.14.0~ (c++)"QTermWidget::getPtySlaveFd() const@Base" 0.6.0 (c++)"QTermWidget::getSelectionEnd(int&, int&)@Base" 0.6.0 (c++)"QTermWidget::getSelectionStart(int&, int&)@Base" 0.6.0 @@ -64,7 +66,7 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (c++)"QTermWidget::setHistorySize(int)@Base" 0.6.0 (c++)"QTermWidget::setKeyBindings(QString const&)@Base" 0.6.0 (c++)"QTermWidget::setKeyboardCursorShape(Konsole::Emulation::KeyboardCursorShape)@Base" 0.8.0 - (c++)"QTermWidget::setMargin(int)@Base" 0.14.0 + (c++)"QTermWidget::setMargin(int)@Base" 0.14.0~ (c++)"QTermWidget::setMonitorActivity(bool)@Base" 0.6.0 (c++)"QTermWidget::setMonitorSilence(bool)@Base" 0.6.0 (c++)"QTermWidget::setMotionAfterPasting(int)@Base" 0.6.0 @@ -98,9 +100,8 @@ libqtermwidget5.so.0 libqtermwidget5-0 #MINVER# (c++)"QTermWidget::zoomIn()@Base" 0.6.0 (c++)"QTermWidget::zoomOut()@Base" 0.6.0 (c++)"QTermWidget::~QTermWidget()@Base" 0.6.0 - (c++)"QTermWidget::filterActions(QPoint const&)@Base" 0.14.1 (c++)"non-virtual thunk to QTermWidget::~QTermWidget()@Base" 0.6.0 (c++)"typeinfo for QTermWidget@Base" 0.6.0 (c++)"typeinfo name for QTermWidget@Base" 0.6.0 - (optional|c++)"void std::__cxx11::basic_string, std::allocator >::_M_construct(wchar_t const*, wchar_t const*, std::forward_iterator_tag)@Base" 0.9.0+git20191204 + (optional|c++)"void std::__cxx11::basic_string, std::allocator >::_M_construct(wchar_t const*, wchar_t const*, std::forward_iterator_tag)@Base" 0.9.0~ (c++)"vtable for QTermWidget@Base" 0.6.0 diff --git a/debian/qtermwidget-l10n.install b/debian/qtermwidget-l10n.install deleted file mode 100644 index 964b640..0000000 --- a/debian/qtermwidget-l10n.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/qtermwidget5/translations/ diff --git a/debian/qtermwidget5-data.install b/debian/qtermwidget5-data.install index 2b21415..e084852 100644 --- a/debian/qtermwidget5-data.install +++ b/debian/qtermwidget5-data.install @@ -1,2 +1,4 @@ usr/share/qtermwidget5/color-schemes usr/share/qtermwidget5/kb-layouts + +usr/share/qtermwidget5/translations diff --git a/debian/rules b/debian/rules index 5e1668f..43438f1 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,6 @@ override_dh_missing: override_dh_auto_configure: dh_auto_configure -- \ - -DPULL_TRANSLATIONS=OFF \ -DUPDATE_TRANSLATIONS=OFF \ -DBUILD_EXAMPLE=OFF \ -DQTERMWIDGET_USE_UTEMPTER=OFF \ diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..bb5f93d --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,7 @@ +Name: qtermwidget +Bug-Database: https://github.com/lxqt/qtermwidget/issues +Bug-Submit: https://github.com/lxqt/qtermwidget/issues/new +Changelog: https://github.com/lxqt/qtermwidget/blob/master/CHANGELOG +Repository: https://github.com/lxqt/qtermwidget +Repository-Browser: https://github.com/lxqt/qtermwidget +