9 changed files with 54 additions and 140 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,95 +1,31 @@
-lxqt-themes (2.1.0-0ubuntu1) plucky; urgency=medium
+lxqt-themes (0.15.0-0ubuntu1) groovy; urgency=medium

  * New upstream release.
-    - Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:21 -0600
-
-lxqt-themes (2.0.0-0ubuntu1) oracular; urgency=medium
-
-  * New upstream release.
-  * Update copyright file.
-  * Bump Standards-Version to 4.7.0, no changes necessary.
-  * Bump build dependencies.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:30:48 -0500
-
-lxqt-themes (1.3.0-0ubuntu1) mantic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 03 Aug 2023 10:43:15 -0500
-
-lxqt-themes (1.2.0-0ubuntu2) lunar; urgency=medium
-
-  * Overhauled copyright file.
-  * Bumped Standards-Version to 4.6.2, no changes necessary.
-  * Ran wrap-and-sort.
+    - 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.

- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 09 Feb 2023 16:06:39 -0600
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 03 Jun 2020 23:26:22 -0500

-lxqt-themes (1.2.0-0ubuntu1) lunar; urgency=medium
+lxqt-themes (0.14.0-0ubuntu1) disco; urgency=medium

  * New upstream release.
-  * Fix the watch file, for real this time.
-  * Lubuntuify the package slightly, to make debhelper happy.
-  * Bump lxqt-build-tools build dep.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 16 Nov 2022 21:48:47 -0600
-
-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
+    - Bump build dependencies.
+  * Bump Standards-version to 4.3.0, no changes needed.
+  * Bump debhelper compat to 12, no changes needed.

-lxqt-themes (0.16.0-1) unstable; urgency=medium
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 25 Jan 2019 23:24:58 -0600

-  [ Alf Gaida ]
-  * Switched to gbp
-  * Bumped Standards-Version to 4.4.0, no changes needed
+lxqt-themes (0.13.0-0ubuntu1) cosmic; urgency=medium

-  [ Andrew Lee (李健秋) ]
  * New upstream release.
-  * debian/lxqt-themes.install: ship new themes.
-
- -- Andrew Lee (李健秋) <ajqlee@debian.org>  Thu, 07 Jan 2021 15:46:13 +0800
-
-lxqt-themes (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
-  * Bumped minimum version lxqt-build-tools (>= 0.6.0~)
-  * Added d/upstream/metadata
-
- -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 14:57:29 +0100
-
-lxqt-themes (0.13.0-1) unstable; urgency=medium
-
-  * Cherry-picking upstream version 0.13.0.
-  * Bumped build dependency lxqt-build-tools to >= 0.5.0
-  * Added papirus-icon-theme to theme alternatives, papirus is now
-    the default alternative
-  * Bump year in copyright
+  * Update Vcs-* and Maintainer to Lubuntu values.
+  * Update build dependencies.
+  * Update copyright.

- -- Alf Gaida <agaida@siduction.org>  Thu, 24 May 2018 18:10:41 +0200
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 23 May 2018 00:01:07 -0500

 lxqt-themes (0.12.0-4) unstable; urgency=medium

--- a/debian/control
+++ b/debian/control
@ -1,26 +1,25 @@
 Source: lxqt-themes
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+XSBC-Original-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>,
-           Aaron Rainbolt <arraybolt3@gmail.com>
+           ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 Section: x11
 Priority: optional
-Build-Depends: cmake, debhelper-compat (= 13), lxqt-build-tools (>= 2.1.0)
-Standards-Version: 4.7.0
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-themes-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-themes-packaging.git
-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-themes
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-themes.git
+Build-Depends: cmake, debhelper-compat (= 12), lxqt-build-tools (>= 0.7.0)
+Standards-Version: 4.5.0
+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
 Homepage: https://github.com/lxqt/lxqt-themes
-Rules-Requires-Root: no

 Package: lxqt-themes
 Architecture: all
 Multi-Arch: foreign
 Depends: lxqt-system-theme, ${misc:Depends}
 Provides: lxqt-theme
+Breaks: lxqt-common (<< 0.12.0)
+Replaces: lxqt-common (<< 0.12.0)
 Description: Themes for LXQt
 Some upstream themes for LXQt
  * Ambiance
@ -36,7 +35,9 @@ Package: lxqt-system-theme
 Architecture: all
 Multi-Arch: foreign
 Depends: x11-utils, ${misc:Depends}
-Recommends: papirus-icon-theme | oxygen-icon-theme | breeze-icon-theme | faenza-icon-theme
+Recommends: oxygen-icon-theme | breeze-icon-theme | faenza-icon-theme
+Breaks: lxqt-common (<< 0.12.0)
+Replaces: lxqt-common (<< 0.12.0)
 Description: System theme for LXQt
 The System theme for LXQt provide basic styling for LXQt system
 components
--- a/debian/copyright
+++ b/debian/copyright
@ -3,39 +3,30 @@ Upstream-Name: lxqt-themes
 Source: https://github.com/lxqt/lxqt-themes

 Files: *
-Copyright: 2010-2012 Razor team
-           2012-2024 LXQt team
+Copyright: 2012-2018 LXQt team
+           2010-2012 Razor team
 License: LGPL-2.1+

 Files: graphics/*
       themes/ambiance/mainmenu.svg
-       themes/Clearlooks/mainmenu.svg
       themes/dark/mainmenu.svg
       themes/frost/mainmenu.svg
-       themes/KDE-Plasma/mainmenu.svg
-       themes/Leech/mainmenu.svg
+       themes/kde-plasma/mainmenu.svg
       themes/light/mainmenu.svg
-       themes/system/mainmenu.svg
-Copyright: 2012-2013 Giacomo Barazzetti <giacomosrv@gmail.com>
+Copyright: 2012-2013, Giacomo Barazzetti <giacomosrv@gmail.com>
 License: CC-BY-SA-3.0

-Files: wallpapers/*.jpg
-       wallpapers/*.png
-Copyright: 2022 LXQt team
-License: CC-BY-SA-3.0
-
-Files: wallpapers/kde-plasma.png
-Copyright: 2014 Nuno Pinheiro <nuno@oxygen-icons.org>
-License: LGPL-3
-
 Files: debian/*
-Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
-           2015 Andrew Lee (李健秋) <ajqlee@debian.org>
-           2015 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
-           2022 Simon Quigley <tsimonq2@debian.org>
-           2023-2024 Aaron Rainbolt <arraybolt3@ubuntu.com>
+Copyright: 2014-2018, Alf Gaida <agaida@siduction.org>
+           2015, Andrew Lee (李健秋) <ajqlee@debian.org>
+           2015, ChangZhuo Chen (陳昌倬) <czchen@debian.org>
 License: LGPL-2.1+

+Files: themes/kde-plasma/kde-plasma.png
+Copyright: 2014, Nuno Pinheiro <nuno@oxygen-icons.org>
+License: LGPL-3+
+
+
 License: CC-BY-SA-3.0
 THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS
 CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS
@ -396,10 +387,11 @@ License: LGPL-2.1+
 On Debian systems, the complete text of the GNU Lesser General
 Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".

-License: LGPL-3
+License: LGPL-3+
 This package is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public
- License version 3, as published by the Free Software Foundation.
+ License as published by the Free Software Foundation; either
+ version 3 of the License, or (at your option) any later version.
 .
 This package is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -1,5 +0,0 @@
-[DEFAULT]
-debian-branch = debian/sid
-upstream-branch = upstream/latest
-pristine-tar = True
-compression = xz
--- a/debian/lxqt-system-theme.lintian-overrides
+++ b/debian/lxqt-system-theme.lintian-overrides
@ -1,2 +0,0 @@
-# This is okay/expected
-lxqt-system-theme: package-contains-documentation-outside-usr-share-doc [usr/share/lxqt/graphics/README]
--- a/debian/lxqt-themes.install
+++ b/debian/lxqt-themes.install
@ -1,3 +1,5 @@
-usr/share/lxqt/palettes/
-usr/share/lxqt/themes/
-usr/share/lxqt/wallpapers/
+usr/share/lxqt/themes/ambiance
+usr/share/lxqt/themes/dark
+usr/share/lxqt/themes/frost
+usr/share/lxqt/themes/kde-plasma
+usr/share/lxqt/themes/light
--- a/debian/rules
+++ b/debian/rules
@ -1,13 +1,10 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1

+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
 %:
 	dh ${@} --buildsystem cmake

 override_dh_missing:
 	dh_missing --fail-missing
-
-override_dh_install:
-	dh_install
-	rm -rf debian/lxqt-themes/usr/share/lxqt/themes/system/
-	rm debian/lxqt-themes/usr/share/lxqt/wallpapers/License
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -1,5 +0,0 @@
-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
--- 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="pgpsigurlmangle=s/$/.asc/" \
+https://github.com/lxqt/lxqt-themes/releases .*/lxqt-themes-([\d\.]+).tar.xz