From 3b81db469e62b2281564a0461cdc109e4c0048fd Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Wed, 16 Nov 2022 21:34:34 -0600 Subject: [PATCH] Sync with Debian version 1.1.0-1. --- debian/changelog | 80 ++++++++++------------------------------ debian/control | 17 ++++----- debian/copyright | 6 +-- debian/gbp.conf | 1 - debian/rules | 2 - debian/upstream/metadata | 5 +++ 6 files changed, 35 insertions(+), 76 deletions(-) create mode 100644 debian/upstream/metadata diff --git a/debian/changelog b/debian/changelog index bdbfebc..e698d62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,34 +1,22 @@ -lxqt-themes (1.1.0-0ubuntu2) kinetic; urgency=medium - - * Update the install file for the upstream release. - - -- Simon Quigley Thu, 02 Jun 2022 13:42:39 -0500 - -lxqt-themes (1.1.0-0ubuntu1) kinetic; urgency=medium - - * New upstream release. - * Bumped build dependencies. - * Drop old Breaks/Replaces since we're past the LTS. Update the - runtime dependencies too. - - -- Simon Quigley Thu, 02 Jun 2022 12:43:40 -0500 - -lxqt-themes (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 - * Update debian/copyright - - -- apt-ghetto Mon, 16 Aug 2021 15:05:16 +0200 - -lxqt-themes (0.16.0-1ubuntu1) hirsute; urgency=medium - - * New upstream version. - * Bumped standards to 4.5.0. - - -- Raman Sarda Thu, 18 Feb 2021 23:02:33 +0530 +lxqt-themes (1.1.0-1) experimental; urgency=medium + + [ Aaron Rainbolt ] + * New upstream release 1.1.0. + * Removed obsolete debian/compat file. + * Switched to GBP. + * Created debian/upstream/metadata. + * Upstreamed non-Ubuntu-specific packaging changes from Ubuntu, modifying + the following files: + - control + - copyright + - *.install + - rules + - upstream/signing-key.asc + + [ Simon Quigley ] + * Fix some various merge errors. + + -- Aaron Rainbolt Sat, 09 Jul 2022 23:16:23 -0500 lxqt-themes (0.16.0-1) unstable; urgency=medium @@ -42,17 +30,6 @@ lxqt-themes (0.16.0-1) unstable; urgency=medium -- Andrew Lee (李健秋) Thu, 07 Jan 2021 15:46:13 +0800 -lxqt-themes (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. - * Run wrap-and-sort. - - -- Simon Quigley Wed, 03 Jun 2020 23:26:22 -0500 - lxqt-themes (0.14.0-1) unstable; urgency=medium * Cherry-picking upstream version 0.14.0. @@ -64,15 +41,6 @@ lxqt-themes (0.14.0-1) unstable; urgency=medium -- Alf Gaida Sun, 27 Jan 2019 14:57:29 +0100 -lxqt-themes (0.14.0-0ubuntu1) disco; 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. - - -- Simon Quigley Fri, 25 Jan 2019 23:24:58 -0600 - lxqt-themes (0.13.0-1) unstable; urgency=medium * Cherry-picking upstream version 0.13.0. @@ -83,15 +51,6 @@ lxqt-themes (0.13.0-1) unstable; urgency=medium -- Alf Gaida Thu, 24 May 2018 18:10:41 +0200 -lxqt-themes (0.13.0-0ubuntu1) cosmic; urgency=medium - - * New upstream release. - * Update Vcs-* and Maintainer to Lubuntu values. - * Update build dependencies. - * Update copyright. - - -- Simon Quigley Wed, 23 May 2018 00:01:07 -0500 - lxqt-themes (0.12.0-4) unstable; urgency=medium * Bumped compat to 11 @@ -124,4 +83,3 @@ lxqt-themes (0.12.0-1) experimental; urgency=medium * Initial release (Closes: #867606) -- Alf Gaida Tue, 10 Oct 2017 18:16:26 +0200 - diff --git a/debian/control b/debian/control index c4f8011..cb3243d 100644 --- a/debian/control +++ b/debian/control @@ -1,18 +1,17 @@ Source: lxqt-themes -Maintainer: Lubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team +Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , Andrew Lee (李健秋) , - ChangZhuo Chen (陳昌倬) + ChangZhuo Chen (陳昌倬) , + Aaron Rainbolt Section: x11 Priority: optional Build-Depends: cmake, debhelper-compat (= 13), lxqt-build-tools (>= 0.11.0) -Standards-Version: 4.5.1 -Vcs-Browser: https://phab.lubuntu.me/source/lxqt-themes/ -Vcs-Git: https://phab.lubuntu.me/source/lxqt-themes.git -XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-themes -XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-themes.git +Standards-Version: 4.6.1 +Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-themes +Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-themes.git Homepage: https://github.com/lxqt/lxqt-themes +Rules-Requires-Root: no Package: lxqt-themes Architecture: all @@ -34,7 +33,7 @@ Package: lxqt-system-theme Architecture: all Multi-Arch: foreign Depends: x11-utils, ${misc:Depends} -Recommends: oxygen-icon-theme | breeze-icon-theme | faenza-icon-theme +Recommends: papirus-icon-theme | oxygen-icon-theme | breeze-icon-theme | faenza-icon-theme Description: System theme for LXQt The System theme for LXQt provide basic styling for LXQt system components diff --git a/debian/copyright b/debian/copyright index 8efcba9..f546af4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ Upstream-Name: lxqt-themes Source: https://github.com/lxqt/lxqt-themes Files: * -Copyright: 2012-2018 LXQt team +Copyright: 2012-2022 LXQt team 2010-2012 Razor team License: LGPL-2.1+ @@ -17,8 +17,8 @@ Copyright: 2012-2013, Giacomo Barazzetti License: CC-BY-SA-3.0 Files: debian/* -Copyright: 2021, Lubuntu Developers - 2014-2018, Alf Gaida +Copyright: 2021-2022, Lubuntu Developers + 2014-2019, Alf Gaida 2015, Andrew Lee (李健秋) 2015, ChangZhuo Chen (陳昌倬) License: LGPL-2.1+ diff --git a/debian/gbp.conf b/debian/gbp.conf index 8957fee..9552c6c 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -3,4 +3,3 @@ debian-branch = debian/sid upstream-branch = upstream/latest pristine-tar = True compression = xz - diff --git a/debian/rules b/debian/rules index 3e68658..fa1204c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,8 +1,6 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 -export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed - %: dh ${@} --buildsystem cmake diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 0000000..98fba64 --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,5 @@ +Name: lxqt-themes +Bug-Database: https://github.com/lxqt/lxqt-themes/issues +Bug-Submit: https://github.com/lxqt/lxqt-themes/issues/new +Changelog: https://github.com/lxqt/lxqt-themes/blob/master/CHANGELOG +Repository: https://github.com/lxqt/lxqt-themes