8 changed files with 18 additions and 132 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,72 +1,3 @@
-lxqt-notificationd (1.4.0-0ubuntu1) noble; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * Fix outdated Lintian override formatting.
-  * Add an upstream metadata file in the packaging.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 12 Nov 2023 18:28:09 -0600
-
-lxqt-notificationd (1.3.0-0ubuntu1) mantic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * Bump Standards-Version to 4.6.2, no changes needed.
-  * I guess we don't require root to build, do we?
-  * Bad trailing whitespace.
-  * Remove redundant build flags.
-  * Update copyright years.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 09:50:36 -0500
-
-lxqt-notificationd (1.2.0-0ubuntu1) lunar; urgency=medium
-
-  * New upstream release.
-  * Fix the watch file, for real this time.
-  * Bump build dependencies in debian/control.
-  * Bump Standards-version to 4.6.1, no changes needed.
-  * Lubuntuify the package slightly, to make debhelper happy.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 17:28:36 -0600
-
-lxqt-notificationd (1.1.0-0ubuntu1) kinetic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * Remove old Breaks/Replaces since we're past the LTS.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 01 Jun 2022 15:57:42 -0500
-
-lxqt-notificationd (0.17.0-0ubuntu1) impish; urgency=medium
-
-  * New upstream release 0.17.0
-  * Update debian/control
-    - Bump Standards-Version to 4.5.1
-    - Use liblxqt0-dev 0.17.0
-  * Rename tag for lintian override
-  * Extend lxqt-notificationd-l10n package description
-  * Update debian/copyright
-
- -- apt-ghetto <apt-ghetto@protonmail.com>  Fri, 13 Aug 2021 13:59:14 +0200
-
-lxqt-notificationd (0.16.0-1ubuntu1) hirsute; urgency=medium
-
-  * New upstream version.
-  * Bump debhelper-compat requirement to 13.
-
- -- Raman Sarda <theloudspeaker@disroot.org>  Mon, 22 Feb 2021 00:45:40 +0530
-
-lxqt-notificationd (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:26:15 +0800
-
 lxqt-notificationd (0.15.0-0ubuntu1) groovy; urgency=medium

  * New upstream release.
@ -83,13 +14,6 @@ lxqt-notificationd (0.14.1-1ubuntu1) focal; urgency=medium

 -- Raman Sarda <theloudspeaker@lubuntu.me>  Thu, 30 Jan 2020 02:45:02 +0530

-lxqt-notificationd (0.14.1-1) unstable; urgency=medium
-
-  * Cherry-picking new upstream version 0.14.1.
-  * Bumped minimum version liblxqt0-dev (>= 0.14.1~)
-
- -- Alf Gaida <agaida@siduction.org>  Tue, 26 Feb 2019 01:52:36 +0100
-
 lxqt-notificationd (0.14.1-0ubuntu1) disco; urgency=medium

  * New upstream release.
@ -97,19 +21,6 @@ lxqt-notificationd (0.14.1-0ubuntu1) disco; urgency=medium

 -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 09 Mar 2019 13:08:37 -0600

-lxqt-notificationd (0.14.0-1) unstable; urgency=medium
-
-  * Cherry-picking new 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 liblxqt0-dev (>= 0.14.0~)
-  * Removed obsolete PULL_TRANSLATIONS= OFF from dh_auto_configure
-  * Added l10n-package, moved from lxqt-l10n
-  * Added d/upstream/metadata
-
- -- Alf Gaida <agaida@siduction.org>  Sun, 27 Jan 2019 12:41:20 +0100
-
 lxqt-notificationd (0.14.0-0ubuntu1) disco; urgency=medium

  * New upstream release.
@ -121,13 +32,6 @@ lxqt-notificationd (0.14.0-0ubuntu1) disco; urgency=medium

 -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 26 Jan 2019 00:22:05 -0600

-lxqt-notificationd (0.13.0-1) unstable; urgency=medium
-
-  * Cherry-picking new upstream version 0.13.0.
-  * Bumped build dependency liblxqt0-dev to >= 0.13.0~
-
- -- Alf Gaida <agaida@siduction.org>  Thu, 24 May 2018 21:45:09 +0200
-
 lxqt-notificationd (0.13.0-0ubuntu2) cosmic; urgency=medium

  * Bump Standards-version to 4.1.5, no changes needed.
--- a/debian/control
+++ b/debian/control
@ -6,25 +6,26 @@ Uploaders: Alf Gaida <agaida@siduction.org>,
           Andrew Lee (李健秋) <ajqlee@debian.org>
 Section: x11
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: debhelper-compat (= 12),
               libkf5windowsystem-dev,
-               liblxqt1-dev (>= 1.4.0),
+               liblxqt0-dev (>= 0.15.0),
               libqt5svg5-dev,
               libqt5x11extras5-dev,
               libx11-dev,
               qtbase5-private-dev
-Standards-Version: 4.6.2
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-notificationd-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-notificationd-packaging.git
+Standards-Version: 4.5.0
+Vcs-Browser: https://phab.lubuntu.me/source/lxqt-notificationd/
+Vcs-Git: https://phab.lubuntu.me/source/lxqt-notificationd.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-notificationd
 XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-notificationd.git
-Rules-Requires-Root: no
 Homepage: https://github.com/lxqt/lxqt-notificationd

 Package: lxqt-notificationd
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: lxqt-notificationd-l10n, lxqt-qtplugin
+Breaks: lxqt-common (<< 0.12.0)
+Replaces: lxqt-common (<< 0.12.0)
 Provides: notification-daemon
 Description: LXQt notification daemon
 The LXQt notification daemon.
@ -36,7 +37,7 @@ Architecture: all
 Multi-Arch: foreign
 Section: localization
 Depends: qttranslations5-l10n, ${misc:Depends}
+Breaks: lxqt-notificationd (<< 0.11.0)
+Replaces: lxqt-notificationd (<< 0.11.0)
 Description: Language package for lxqt-notificationd
- The l10n files for lxqt-notificationd.
- .
 This package contains the l10n files needed by lxqt-notificationd.
--- a/debian/copyright
+++ b/debian/copyright
@ -3,20 +3,13 @@ Upstream-Name: lxqt-notificationd
 Source: https://github.com/lxqt/lxqt-notificationd

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

-Files: test/main.cpp
-       test/mainwindow.cpp
-       test/mainwindow.h
-Copyright: 2012, Alec Moskvin <alecm@gmx.com>
-License: LGPL-2.1+
-
 Files: debian/*
-Copyright: 2021-2023, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-           2014-2018, Alf Gaida <agaida@siduction.org>
-           2015,      Andrew Lee (李健秋) <ajqlee@debian.org>
+Copyright: 2014-2018 Alf Gaida <agaida@siduction.org>
+           2015      Andrew Lee (李健秋) <ajqlee@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/lintian-overrides
+++ b/debian/lintian-overrides
@ -1,6 +1,6 @@
 # there will not be manpages in a foreseable future
-lxqt-notificationd: no-manual-page [usr/bin/lxqt-config-notificationd]
-lxqt-notificationd: no-manual-page [usr/bin/lxqt-notificationd]
+lxqt-notificationd: binary-without-manpage usr/bin/lxqt-config-notificationd
+lxqt-notificationd: binary-without-manpage usr/bin/lxqt-notificationd

 # LXQt is not in freedesktop specs yet
-lxqt-notificationd: desktop-entry-invalid-category LXQt [usr/share/applications/lxqt-config-notificationd.desktop]
+lxqt-notificationd: desktop-entry-invalid-category LXQt usr/share/applications/lxqt-config-notificationd.desktop
--- 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
@ -1,5 +0,0 @@
-Bug-Database: https://github.com/lxqt/lxqt-notificationd/issues
-Bug-Submit: https://github.com/lxqt/lxqt-notificationd/issues/new
-Changelog: https://github.com/lxqt/lxqt-notificationd/blob/master/CHANGELOG
-Repository: https://github.com/lxqt/lxqt-notificationd.git
-Repository-Browse: https://github.com/lxqt/lxqt-notificationd
--- 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-notificationd/releases .*/lxqt-notificationd-([\d\.]+).tar.xz