Sync with Debian version 1.1.0-1.

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 <tsimonq2@ubuntu.com>  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 <tsimonq2@ubuntu.com>  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 <apt-ghetto@protonmail.com>  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 <theloudspeaker@disroot.org>  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 <arraybolt3@gmail.com>  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 (李健秋) <ajqlee@debian.org>  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 <tsimonq2@ubuntu.com>  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 <agaida@siduction.org>  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 <tsimonq2@ubuntu.com>  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 <agaida@siduction.org>  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 <tsimonq2@ubuntu.com>  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 <agaida@siduction.org>  Tue, 10 Oct 2017 18:16:26 +0200
-

debian/control

@@ -1,18 +1,17 @@
 Source: lxqt-themes
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>,
-           ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+           ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
+           Aaron Rainbolt <arraybolt3@gmail.com>
 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

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 <giacomosrv@gmail.com>
 License: CC-BY-SA-3.0
 
 Files: debian/*
-Copyright: 2021,      Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2014-2018, Alf Gaida <agaida@siduction.org>
+Copyright: 2021-2022, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2014-2019, Alf Gaida <agaida@siduction.org>
            2015,      Andrew Lee (李健秋) <ajqlee@debian.org>
            2015,      ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 License: LGPL-2.1+

debian/gbp.conf

@@ -3,4 +3,3 @@ debian-branch = debian/sid
 upstream-branch = upstream/latest
 pristine-tar = True
 compression = xz
-

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
 

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