7 changed files with 26 additions and 114 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,86 +1,3 @@
-lxqt-policykit (2.1.0-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:32:55 -0600
-
-lxqt-policykit (2.0.0-0ubuntu1) oracular; urgency=medium
-
-  * New upstream release.
-  * Update copyright file.
-  * Bump Standards-Version to 4.7.0, no changes necessary.
-  * Adjust build dependencies.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:42:26 -0500
-
-lxqt-policykit (1.4.0-0ubuntu1) noble; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * Bump Standards-version to 4.6.2, no changes needed.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 12 Nov 2023 18:54:45 -0600
-
-lxqt-policykit (1.3.0-0ubuntu1) mantic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * I guess we don't require root to build, do we?
-  * Remove redundant compiler flag.
-  * Update copyright years.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 09:51:12 -0500
-
-lxqt-policykit (1.2.0-0ubuntu1) lunar; urgency=medium
-
-  * New upstream release.
-  * Fix the watch file, for real this time.
-  * Bump Standards-version to 4.6.1, no changes needed.
-  * Lubuntuify the package slightly, to make debhelper happy.
-  * Bump build dependencies in debian/control.
-  * Lintian doesn't like extra "r"s in upstream metadata.
-  * Brief copyright update.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 17:50:24 -0600
-
-lxqt-policykit (1.1.0-0ubuntu1) kinetic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * Remove old Breaks/Replaces, we're past the LTS.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 01 Jun 2022 16:21:21 -0500
-
-lxqt-policykit (0.17.0-0ubuntu1) impish; urgency=medium
-
-  * New upstream release 0.17.0 (LP: #1875774)
-  * Update debian/control
-    - Bump Standards-Version to 4.5.1
-    - Use liblxqt0-dev 0.17.0
-    - Extend lxqt-policykit-l10n package description
-  * Update debian/copyright
-
- -- apt-ghetto <apt-ghetto@protonmail.com>  Fri, 13 Aug 2021 14:41:25 +0200
-
-lxqt-policykit (0.16.0-1ubuntu1) hirsute; urgency=medium
-
-  * New upstream version.
-  * Bump debhelper-compat to 13.
-
- -- Raman Sarda <theloudspeaker@disroot.org>  Mon, 22 Feb 2021 01:05:03 +0530
-
-lxqt-policykit (0.16.0-1) unstable; urgency=medium
-
-  [ Alf Gaida ]
-  * Switched to gbp
-  * Bumped Standards-Version to 4.4.0, no changes needed
-
-  [ Andrew Lee (李健秋) ]
-  * New upstream release.
-
- -- Andrew Lee (李健秋) <ajqlee@debian.org>  Wed, 06 Jan 2021 17:49:18 +0800
-
 lxqt-policykit (0.15.0-0ubuntu1) groovy; urgency=medium

  * New upstream release.
@ -299,3 +216,4 @@ lxqt-policykit (0.9.0+20150807-1) unstable; urgency=medium
  * Merging upstream 0.9.0+20150807.

 -- Yukiharu YABUKI <yyabuki@debian.org>  Wed, 19 Aug 2015 06:52:13 +0900
+
--- a/debian/control
+++ b/debian/control
@ -1,25 +1,25 @@
 Source: lxqt-policykit
 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>,
           ChangZhuo Chen (陳昌倬) <czchen@debian.org>,
           Andrew Lee (李健秋) <ajqlee@debian.org>,
           Yukiharu YABUKI <yyabuki@debian.org>
 Section: x11
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
-               libkf6windowsystem-dev,
-               liblxqt2-dev (>= 2.1.0),
+Build-Depends: debhelper-compat (= 12),
+               libkf5windowsystem-dev,
+               liblxqt0-dev (>= 0.15.0),
               libpolkit-agent-1-dev,
-               libpolkit-qt6-1-dev,
-               libx11-dev,
-               qt6-svg-dev (>= 6.6.0)
-Standards-Version: 4.7.0
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-policykit-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-policykit-packaging.git
-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-policykit
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-policykit.git
-Rules-Requires-Root: no
+               libpolkit-qt5-1-dev,
+               libqt5svg5-dev,
+               libqt5x11extras5-dev,
+               libx11-dev
+Standards-Version: 4.5.0
+Vcs-Browser: https://phab.lubuntu.me/source/lxqt-policykit/
+Vcs-Git: https://phab.lubuntu.me/source/lxqt-policykit.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-policykit
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-policykit.git
 Homepage: https://github.com/lxqt/lxqt-policykit

 Package: lxqt-policykit
@ -27,6 +27,8 @@ Architecture: any
 Depends: lxqt-session, ${misc:Depends}, ${shlibs:Depends}
 Recommends: lxqt-policykit-l10n
 Suggests: lxqt | lxqt-core
+Breaks: lxqt-common (<< 0.12.0)
+Replaces: lxqt-common (<< 0.12.0)
 Provides: polkit-1-auth-agent
 Description: LXQt authentication agent for PolicyKit
 The lxqt-policykit D-Bus session bus service that is used to
@ -38,8 +40,8 @@ Package: lxqt-policykit-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qt6-translations-l10n, ${misc:Depends}
+Depends: qttranslations5-l10n, ${misc:Depends}
+Breaks: lxqt-policykit (<< 0.11.0)
+Replaces: lxqt-policykit (<< 0.11.0)
 Description: Language package for lxqt-policykit
- The l10n files for lxqt-policykit
- .
 This package contains the l10n files needed by lxqt-policykit.
--- a/debian/copyright
+++ b/debian/copyright
@ -3,14 +3,13 @@ Upstream-Name: lxqt-policykit
 Source: https://github.com/lxqt/lxqt-policykit

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

 Files: debian/*
-Copyright: 2021-2024, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2014-2019, Alf Gaida <agaida@siduction.org>
-           2015,      Yukiharu YABUKI <yyabuki@debian.org>
+Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
+           2015      Yukiharu YABUKI <yyabuki@debian.org>
 License: LGPL-2.1+

 License: LGPL-2.1+
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@ -1,6 +0,0 @@
-[DEFAULT]
-debian-branch = debian/sid
-upstream-branch = upstream/latest
-pristine-tar = True
-compression = xz
-
--- a/debian/rules
+++ b/debian/rules
@ -2,6 +2,7 @@
 # export DH_VERBOSE=1

 export LC_ALL=C.UTF-8
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all

 %:
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -3,4 +3,4 @@ Bug-Database: https://github.com/lxqt/lxqt-policykit/issues
 Bug-Submit: https://github.com/lxqt/lxqt-policykit/issues/new
 Changelog: https://github.com/lxqt/lxqt-policykit/blob/master/CHANGELOG
 Repository: https://github.com/lxqt/lxqt-policykit
-Repository-Browse: https://github.com/lxqt/lxqt-policykit
+Repository-Browser: https://github.com/lxqt/lxqt-policykit
--- 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-policykit/releases .*/lxqt-policykit-([\d\.]+).tar.xz