From 5621aaa7615129c651e0d2a43961e75d227ec4d2 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Fri, 18 Nov 2022 19:07:23 -0600 Subject: [PATCH] Sync with Debian version 1.1.0-1. --- debian/changelog | 92 +++------------------------------------- debian/control | 17 ++++---- debian/qterminal.install | 2 +- debian/rules | 9 ++-- debian/salsa-ci.yml | 12 ++++++ 5 files changed, 34 insertions(+), 98 deletions(-) create mode 100644 debian/salsa-ci.yml diff --git a/debian/changelog b/debian/changelog index 395ebdc..0967b2f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,41 +1,14 @@ -qterminal (1.1.0-0ubuntu1) kinetic; urgency=medium +qterminal (1.1.0-1) experimental; urgency=medium * New upstream release. + * Run wrap-and-sort. * Bump build dependencies. - * Drop old Breaks/Replaces, since we're past the LTS. - * Remove reverse-applicable patches. - * Update install files for new metadata locations. - - -- Simon Quigley Thu, 02 Jun 2022 10:29:23 -0500 - -qterminal (0.17.0-0ubuntu1) impish; urgency=medium - - * New upstream release 0.17.0 - * Update debian/control - - Bump Standards-Version to 4.5.1 - - Use lxqt-build-tools 0.9.0 - - Use libqtermwidget5-0-dev 0.17.0 - - Extend qterminal-l10n package description - * Update debian/qterminal.install - * Update debian/patches/appdata.patch - - Refresh patch - - Add Forwarded: not needed - - Add Lubuntu Developers as author - * Update debian/copyright + * Bump Standards-version to 4.6.1, no changes needed. + * Bump debhelper compat to 13, no changes needed. + * Drop some old Breaks/Replaces. + * Upstream some useful changes from Ubuntu so we can sync. - -- apt-ghetto Tue, 17 Aug 2021 10:57:16 +0200 - -qterminal (0.16.1-1ubuntu1) hirsute; urgency=low - - [ Raman Sarda ] - * New upstream version. Merge from debian unstable. - * Tighten debhelper-compat requirement. - * Updated copyrights. - * Updated upstream signing key. - * Added upstream metadata. - * Updated upstream patch. - - -- Raman Sarda Mon, 22 Feb 2021 01:50:32 +0530 + -- Simon Quigley Thu, 14 Jul 2022 14:26:41 -0500 qterminal (0.16.1-1) unstable; urgency=medium @@ -59,17 +32,6 @@ qterminal (0.16.1-1) unstable; urgency=medium -- Sophie Brun Wed, 16 Dec 2020 15:06:50 +0100 -qterminal (0.15.0-0ubuntu1) groovy; urgency=medium - - * New upstream release. - - Update upstream signing key. - - Update LXQt build dependencies. - * Update Standards-version to 4.5.0, no changes needed. - * Migrate to debhelper-compat. - * Update copyright. - - -- Simon Quigley Thu, 04 Jun 2020 14:24:55 -0500 - qterminal (0.14.1-1) unstable; urgency=medium * Cherry-picking upstream version 0.14.1. @@ -77,14 +39,6 @@ qterminal (0.14.1-1) unstable; urgency=medium -- Alf Gaida Tue, 26 Feb 2019 03:09:41 +0100 -qterminal (0.14.1-0ubuntu1) disco; urgency=medium - - * New upstream release. - * Run wrap-and-sort. - * Drop fix-memory-api.patch, which causes crashes. - - -- Simon Quigley Sat, 09 Mar 2019 15:56:11 -0600 - qterminal (0.14.0-1) unstable; urgency=medium * Cherry-picking upstream version 0.14.0. @@ -100,37 +54,6 @@ qterminal (0.14.0-1) unstable; urgency=medium -- Alf Gaida Sun, 27 Jan 2019 22:06:09 +0100 -qterminal (0.14.0-0ubuntu1) disco; urgency=medium - - * New upstream release. - - Bump build dependencies. - - Remove reverse-applicable patches. - * Bump Standards-version to 4.3.0, no changes needed. - * Bump debhelper compat to 12, no changes needed. - * Add new qterminal-l10n package. - - -- Simon Quigley Sat, 26 Jan 2019 01:12:04 -0600 - -qterminal (0.9.0-3ubuntu3) cosmic; urgency=medium - - * The preferences menu should never be larger than the screen (LP: #1784198). - - -- Simon Quigley Sun, 29 Jul 2018 15:04:10 -0500 - -qterminal (0.9.0-3ubuntu2) cosmic; urgency=medium - - * Remember the maximization state of the window (LP: #1754496). - - -- Simon Quigley Fri, 20 Jul 2018 05:25:18 -0500 - -qterminal (0.9.0-3ubuntu1) cosmic; urgency=medium - - * Update the maintainer and Vcs-* for maintaining in Lubuntu. - * Add patch adapting to API changes in qtermwidget, and bump the - dependencies accordingly. - - -- Simon Quigley Tue, 10 Jul 2018 22:34:17 -0500 - qterminal (0.9.0-3) unstable; urgency=medium * Fixed typo in long description @@ -315,4 +238,3 @@ qterminal (0.6.0+20150802-1) unstable; urgency=medium - Update rules, add linker flags -- ChangZhuo Chen (陳昌倬) Sat, 19 Sep 2015 10:14:08 +0800 - diff --git a/debian/control b/debian/control index 121ed26..d89b0c3 100644 --- a/debian/control +++ b/debian/control @@ -1,22 +1,21 @@ Source: qterminal -Maintainer: Lubuntu Developers -Uploaders: Simon Quigley -XSBC-Original-Maintainer: LXQt Packaging Team +Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + ChangZhuo Chen (陳昌倬) , + Andrew Lee (李健秋) Section: x11 Priority: optional Build-Depends: debhelper-compat (= 13), libkf5windowsystem-dev, - libqtermwidget5-1-dev (>= 1.1.0), libqt5svg5-dev, libqt5x11extras5-dev, + libqtermwidget5-1-dev (>= 1.1.0), libutf8proc-dev, libx11-dev, lxqt-build-tools (>= 0.11.0) -Standards-Version: 4.5.1 -Vcs-Browser: https://phab.lubuntu.me/source/qterminal/ -Vcs-Git: https://phab.lubuntu.me/source/qterminal.git -XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/qterminal -XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/qterminal.git +Standards-Version: 4.6.1 +Vcs-Browser: https://salsa.debian.org/lxqt-team/qterminal +Vcs-Git: https://salsa.debian.org/lxqt-team/qterminal.git Homepage: https://github.com/lxqt/qterminal Package: qterminal diff --git a/debian/qterminal.install b/debian/qterminal.install index 355aaea..7224c20 100644 --- a/debian/qterminal.install +++ b/debian/qterminal.install @@ -1,6 +1,6 @@ usr/bin/qterminal -usr/share/applications/qterminal.desktop usr/share/applications/qterminal-drop.desktop +usr/share/applications/qterminal.desktop usr/share/icons/hicolor/64x64/apps/qterminal.png usr/share/metainfo/qterminal.metainfo.xml usr/share/qterminal/qterminal_bookmarks_example.xml diff --git a/debian/rules b/debian/rules index c03819d..1cbdd6b 100755 --- a/debian/rules +++ b/debian/rules @@ -8,8 +8,11 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh ${@} --buildsystem cmake +override_dh_missing: + dh_missing --fail-missing + override_dh_auto_configure: - dh_auto_configure --\ - -DPULL_TRANSLATIONS=OFF\ - -DUPDATE_TRANSLATIONS=OFF\ + dh_auto_configure -- \ + -DPULL_TRANSLATIONS=OFF \ + -DUPDATE_TRANSLATIONS=OFF \ -DCMAKE_BUILD_TYPE=RelWithDebInfo diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..28214c5 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,12 @@ +# For more information on what jobs are run see: +# https://salsa.debian.org/salsa-ci-team/pipeline +# +# To enable the jobs, go to your repository (at salsa.debian.org) +# and click over Settings > CI/CD > Expand (in General pipelines). +# In "Custom CI config path" write debian/salsa-ci.yml and click +# in "Save Changes". The CI tests will run after the next commit. +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml +