From dd71da277b978defe007458474dcf2e2f0ca5c13 Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Thu, 9 Feb 2023 14:29:52 -0600 Subject: [PATCH] Sync with archive. --- debian/.gitignore | 7 ----- debian/changelog | 60 ++++++++++++++++++++++++++-------------- debian/control | 18 ++++++------ debian/copyright | 6 ++-- debian/docs | 1 + debian/gbp.conf | 5 ++++ debian/lintian-overrides | 2 +- debian/rules | 3 -- debian/salsa-ci.yml | 14 ++++++++++ debian/watch | 6 ++-- 10 files changed, 77 insertions(+), 45 deletions(-) delete mode 100644 debian/.gitignore create mode 100644 debian/docs create mode 100644 debian/gbp.conf create mode 100644 debian/salsa-ci.yml diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index 5bd7104..0000000 --- a/debian/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -/*.debhelper -/*.log -/*.substvars -/debhelper-build-stamp -/files - -/tmp diff --git a/debian/changelog b/debian/changelog index 4300ed4..5cb8a0b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,28 +1,48 @@ -qtxdg-tools (3.10.0-0ubuntu2) lunar; urgency=medium +qtxdg-tools (3.10.0-1) unstable; urgency=medium - * Updated copyright file. - * Drop unnecessary debian/docs file. - * Overrode a missing manpage Lintian gripe. - * Added 'Rules-Requires-Root: no' to debian/control. - * Removed obsolete "-Wl,--as-needed" linker flag. - * Moved the package to the "admin" section since it doesn't really fit - in "libs". - * Fixed a typo in debian/control. + [ Palo Kisa ] + * New upstream release + * debian/watch: Fix github uscan processing + * debian: Add gbp config - -- Aaron Rainbolt Tue, 29 Nov 2022 14:32:00 -0600 + [ ChangZhuo Chen (陳昌倬) ] + * Add ChangZhuo Chen as Uploaders. + * Add Repository-Browse in d/upstream/mateadata. + * Update Build-Depends. + * Refactor d/copyright. -qtxdg-tools (3.10.0-0ubuntu1) lunar; urgency=medium + -- ChangZhuo Chen (陳昌倬) Thu, 08 Dec 2022 01:09:08 +0800 - * New upstream release. - * Fix the watch file, for real this time. - * Lubuntuify the package slightly, to make debhelper happy. - * Bump build dependencies to the latest upstream LXQt versions. - * Fix typo in the upstream metadata. +qtxdg-tools (3.9.1-3) unstable; urgency=medium - -- Simon Quigley Wed, 16 Nov 2022 19:05:55 -0600 + [ Aaron Rainbolt ] + * debian/watch: Overhaul watch file to make it compatible with GitHub + again. + * debian/control: Added 'Rules-Requires-Root: no' to silence a Lintian + gripe. + * debian/copyright: Added Aaron Rainbolt. + * debian/control: Fixed Vcs-Browser and Vcs-Git fields to point to + Debian Salsa rather than Lubuntu GitHub. + [ Andrew Lee (李健秋) ] + * debian/salsa-ci.yml: disable build in experimental to make piuparts + happy. -qtxdg-tools (3.9.1-0ubuntu1) kinetic; urgency=medium + -- Andrew Lee (李健秋) Fri, 11 Nov 2022 13:03:57 +0800 - * Initial release. +qtxdg-tools (3.9.1-2) unstable; urgency=medium - -- Simon Quigley Tue, 31 May 2022 18:45:28 -0500 + * Added debian/salsa-ci.yml file. + * debian/watch: fix uscan error. + * debian/rules: Remove unnecessary -Wl,--as-needed. + * debian/rules: Drop --fail-missing argument to dh_missing which is now + default in debhelper 13. + * Added myself as uploader. + * debian/lintian-overrides: no-manual-page for qtxdg-mat. + + -- Andrew Lee (李健秋) Thu, 27 Oct 2022 12:11:24 +0800 + +qtxdg-tools (3.9.1-1) experimental; urgency=medium + + * Initial release (Closes: #1014257). + + -- Simon Quigley Sat, 02 Jul 2022 20:54:54 -0500 diff --git a/debian/control b/debian/control index bdce4d7..2bc9e1e 100644 --- a/debian/control +++ b/debian/control @@ -1,15 +1,17 @@ Source: qtxdg-tools -Maintainer: Lubuntu Developers -Uploaders: Simon Quigley -Section: admin +Maintainer: LXQt Packaging Team +Uploaders: Simon Quigley , + Andrew Lee (李健秋) , + ChangZhuo Chen (陳昌倬) +Section: libs Priority: optional Build-Depends: debhelper-compat (= 13), - libqt5xdg-dev (>= 3.10.0), - libqt5xdgiconloader-dev (>= 3.10.0), - lxqt-build-tools (>= 0.12.0) + libqt5xdg-dev (>= 3.10.0~), + libqt5xdgiconloader-dev (>= 3.10.0~), + lxqt-build-tools (>= 0.12.0~) Standards-Version: 4.6.1 -Vcs-Browser: https://git.lubuntu.me/Lubuntu/qtxdg-tools-packaging -Vcs-Git: https://git.lubuntu.me/Lubuntu/qtxdg-tools-packaging.git +Vcs-Browser: https://salsa.debian.org/lxqt-team/qtxdg-tools +Vcs-Git: https://salsa.debian.org/lxqt-team/qtxdg-tools.git Homepage: https://github.com/lxqt/qtxdg-tools Rules-Requires-Root: no diff --git a/debian/copyright b/debian/copyright index 90d130a..7e8dc82 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,12 +3,14 @@ Upstream-Name: qtxdg-tools Source: https://github.com/lxqt/qtxdg-tools Files: * -Copyright: 2018-2021 Luís Pereira - 2020-2022 LXQt team +Copyright: 2019-2021 Luís Pereira License: LGPL-2.1+ Files: debian/* Copyright: 2022 Lubuntu Developers + 2022 Andrew Lee (李健秋) + 2022 Aaron Rainbolt + 2022 ChangZhuo Chen (陳昌倬) License: LGPL-2.1+ License: LGPL-2.1+ diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..8f0f98f --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +CHANGELOG diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..9552c6c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,5 @@ +[DEFAULT] +debian-branch = debian/sid +upstream-branch = upstream/latest +pristine-tar = True +compression = xz diff --git a/debian/lintian-overrides b/debian/lintian-overrides index d158a8b..4d192ab 100644 --- a/debian/lintian-overrides +++ b/debian/lintian-overrides @@ -1,2 +1,2 @@ -# there will be no manual page in the foreseeable future +# currently no manpage for qtxdg-mat qtxdg-tools: no-manual-page [usr/bin/qtxdg-mat] diff --git a/debian/rules b/debian/rules index 7cdbb0c..d557bf3 100755 --- a/debian/rules +++ b/debian/rules @@ -7,9 +7,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh ${@} --buildsystem cmake -#override_dh_missing: -# dh_missing --fail-missing - override_dh_auto_configure: dh_auto_configure -- \ -DUPDATE_TRANSLATIONS=OFF \ diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml new file mode 100644 index 0000000..90e9d27 --- /dev/null +++ b/debian/salsa-ci.yml @@ -0,0 +1,14 @@ +# 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 + +#variables: +# RELEASE: 'experimental' diff --git a/debian/watch b/debian/watch index a544020..c768cfd 100644 --- a/debian/watch +++ b/debian/watch @@ -1,5 +1,3 @@ version=4 -opts="searchmode=plain, \ -pgpsigurlmangle=s/$/.asc/, \ -uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \ - https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz +opts="downloadurlmangle=s%/tag/([^/]+)$%/download/$1/@PACKAGE@-$1.tar.xz%, filenamemangle=s%^.*/([^/]+)$%@PACKAGE@-$1.tar.xz%, pgpsigurlmangle=s/$/.asc/" \ + https://github.com/lxqt/@PACKAGE@/tags /lxqt/@PACKAGE@/releases/tag/([^/]+)$