Merge branch 'ci/stable' into ci/unstable

debian/changelog

@@ -1,3 +1,37 @@
+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 <theloudspeaker@disroot.org>  Mon, 22 Feb 2021 01:50:32 +0530
+
+qterminal (0.16.1-1) unstable; urgency=medium
+
+  * Team upload.
+
+  [ Sophie Brun ]
+  * Update debian/upstream/signing-key.asc
+  * New upstream version 0.16.1. Closes: #959963
+  * Refresh patch
+  * Update minimal required versions of libqtermwidget5-0-dev and
+    lxqt-build-tools
+  * Bump Standard-Version to 4.5.0
+
+  [ Raphaël Hertzog ]
+  * Refer to common license file for CC0-1.0.
+  * Fix field name typo in debian/upstream/metadata (Repository-Browser =>
+    Repository-Browse).
+  * Set upstream metadata fields: Repository.
+  * Remove obsolete field Name from debian/upstream/metadata (already present in
+    machine-readable debian/copyright).
+
+ -- Sophie Brun <sophie@offensive-security.com>  Wed, 16 Dec 2020 15:06:50 +0100
+
 qterminal (0.15.0-0ubuntu1) groovy; urgency=medium
 
   * New upstream release.
@@ -9,6 +43,13 @@ qterminal (0.15.0-0ubuntu1) groovy; urgency=medium
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 04 Jun 2020 14:24:55 -0500
 
+qterminal (0.14.1-1) unstable; urgency=medium
+
+  * Cherry-picking upstream version 0.14.1.
+  * Bumped minimum versions libqtermwidget5-0-dev (>= 0.14.1~)
+
+ -- Alf Gaida <agaida@siduction.org>  Tue, 26 Feb 2019 03:09:41 +0100
+
 qterminal (0.14.1-0ubuntu1) disco; urgency=medium
 
   * New upstream release.
@@ -17,6 +58,21 @@ qterminal (0.14.1-0ubuntu1) disco; urgency=medium
 
  -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Mar 2019 15:56:11 -0600
 
+qterminal (0.14.0-1) unstable; urgency=medium
+
+  * Cherry-picking upstream version 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
+  * Added CC0 for qterminal.appdata.xml
+  * Bumped minimum versions libqtermwidget5-0-dev (>= 0.14.0~)
+  * Bumped minimum version lxqt-build-tools (>= 0.6.0~)
+  * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure
+  * Added l10n-package, moved from lxqt-l10n
+  * Added d/upstream/metadata
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 22:06:09 +0100
+
 qterminal (0.14.0-0ubuntu1) disco; urgency=medium
 
   * New upstream release.
@@ -232,3 +288,4 @@ qterminal (0.6.0+20150802-1) unstable; urgency=medium
     - Update rules, add linker flags
 
  -- ChangZhuo Chen (陳昌倬) <czchen@debian.org>  Sat, 19 Sep 2015 10:14:08 +0800
+

debian/control

@@ -4,14 +4,14 @@ Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
 XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Section: x11
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                libkf5windowsystem-dev,
+               libqtermwidget5-0-dev (>= 0.16.1~),
                libqt5svg5-dev,
                libqt5x11extras5-dev,
-               libqtermwidget5-0-dev (>= 0.15.0),
                libutf8proc-dev,
                libx11-dev,
-               lxqt-build-tools (>= 0.7.0)
+               lxqt-build-tools (>= 0.8.0~)
 Standards-Version: 4.5.0
 Vcs-Browser: https://phab.lubuntu.me/source/qterminal/
 Vcs-Git: https://phab.lubuntu.me/source/qterminal.git

debian/copyright

@@ -75,5 +75,12 @@ License: BSD-3-clause
  SUCH DAMAGE.
 
 License: CC0-1.0
- On Debian systems the full text of the CC0-1.0 license can be found in
- /usr/share/common-licenses/CC0-1.0
+ To the extent possible under law, the author(s) have dedicated all copyright
+ and related and neighboring rights to this software to the public domain
+ worldwide. This software is distributed without any warranty.
+ .
+ You should have received a copy of the CC0 Public Domain Dedication along with
+ this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ .
+ On Debian systems, the full text of the CC0 1.0 Universal license can be found
+ in the file `/usr/share/common-licenses/CC0-1.0'.

debian/gbp.conf

@@ -0,0 +1,6 @@
+[DEFAULT]
+debian-branch = debian/sid
+upstream-branch = upstream/latest
+pristine-tar = True
+compression = xz
+

debian/patches/appdata.patch

@@ -1,7 +1,13 @@
 Description: Add some appdata
 Author: Alf Gaida <agaida@siduction.org>
 Last-Update: 2018-07-10
+---
+ CMakeLists.txt        |  2 +-
+ qterminal.appdata.xml | 13 +++++++++----
+ 2 files changed, 10 insertions(+), 5 deletions(-)
 
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 69c66b2..86fb6bb 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -213,7 +213,7 @@ install(FILES
@@ -13,6 +19,8 @@ Last-Update: 2018-07-10
  )
  
  if(NOT APPLEBUNDLE)
+diff --git a/qterminal.appdata.xml b/qterminal.appdata.xml
+index 706d539..3c60444 100644
 --- a/qterminal.appdata.xml
 +++ b/qterminal.appdata.xml
 @@ -1,6 +1,6 @@

debian/upstream/metadata

@@ -0,0 +1,6 @@
+Bug-Database: https://github.com/lxqt/qterminal/issues
+Bug-Submit: https://github.com/lxqt/qterminal/issues/new
+Changelog: https://github.com/lxqt/qterminal/blob/master/CHANGELOG
+Repository: https://github.com/lxqt/qterminal.git
+Repository-Browse: https://github.com/lxqt/qterminal
+

debian/upstream/signing-key.asc

@@ -1,4 +1,5 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: Signed by Sophie Brun
 
 mQINBF6cxrwBEADfl3ydxNfLBbWGPesXty2baQgixZ3D6aCxadI2kX+aikmT8rd0
 ttDKN18cXV52Ssxnj0qhgf4hwnu/b0be6BzqSEyGM+UQR3X2CYpxrMakfW32Q18K