11 changed files with 63 additions and 154 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,74 +1,3 @@
-liblxqt (2.1.0-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-    - Update symbols from amd64 build logs.
-  * Make the package Lintian-clean.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 05 Nov 2024 11:42:15 -0600
-
-liblxqt (2.0.0-0ubuntu2) oracular; urgency=medium
-
-  * Update symbols from build logs.
-
- -- Rik Mills <rikmills@kde.org>  Fri, 23 Aug 2024 21:22:05 +0100
-
-liblxqt (2.0.0-0ubuntu1) oracular; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-  * Update copyright file.
-  * Bump Standards-Version to 4.7.0, no changes necessary.
-  * Bump soname.
-  * Adjust package names.
-  * Update symbols file.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:03:02 -0500
-
-liblxqt (1.4.0-0ubuntu1) noble; urgency=medium
-
-  * New upstream release.
-  * Update copyright file.
-  * Bump libqtxdg-related build dependencies.
-
- -- Aaron Rainbolt <arraybolt3@gmail.com>  Sun, 05 Nov 2023 12:13:40 -0600
-
-liblxqt (1.3.0-0ubuntu1) mantic; urgency=medium
-
-  * New upstream release.
-  * wrap-and-sort.
-  * Update Standards-version to 4.6.2, no changes needed.
-  * Update copyright file.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 10 May 2023 12:12:24 -0500
-
-liblxqt (1.2.0-0ubuntu3) lunar; urgency=medium
-
-  * No-change rebuild against lxqt-build-tools 0.12.0-0ubuntu3.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 09 Feb 2023 13:49:31 -0600
-
-liblxqt (1.2.0-0ubuntu2) lunar; urgency=medium
-
-  * Removed the obsolete '-Wl,--as-needed' linker flag from debian/rules.
-  * Removed trailing whitespace from changelog.
-  * Added 'Rules-Requires-Root: no' to debian/control.
-  * Overhauled copyright file.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Mon, 28 Nov 2022 14:44:46 -0600
-
-liblxqt (1.2.0-0ubuntu1) lunar; urgency=medium
-
-  * New upstream release.
-  * Fix the watch file, for real this time.
-  * Lubuntuify the package slightly, to make debhelper happy.
-  * Bump build dependencies to the latest upstream LXQt versions.
-  * Remove unnecessary dh-exec call.
-  * Remove a seemingly-obsolete Lintian override.
-  * Fix a typo in the upstream metadata.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 16 Nov 2022 19:19:19 -0600
-
 liblxqt (1.1.0-0ubuntu2) kinetic; urgency=medium

  * Add additional Breaks/Replaces on liblxqt0 just to be safe.
@ -108,7 +37,7 @@ liblxqt (0.17.0-0ubuntu1) impish; urgency=medium

 liblxqt (0.16.0-1ubuntu2) hirsute; urgency=medium

-  * Dropped symbol failing on s390x.
+  * Dropped symbol failing on s390x. 

 -- Walter Lapchynski <wxl@ubuntu.com>  Wed, 03 Feb 2021 16:15:06 -0800

@ -132,7 +61,7 @@ liblxqt (0.16.0-1) unstable; urgency=medium
  * Refresh debian/liblxqt0.symbols file.

 -- Andrew Lee (李健秋) <ajqlee@debian.org>  Tue, 05 Jan 2021 17:23:10 +0800
-
+ 
 liblxqt (0.15.0-0ubuntu1) groovy; urgency=medium

  * New upstream release.
@ -454,3 +383,4 @@ liblxqt (0.9.0-1) experimental; urgency=low
  * Initial release (Closes: #747620)

 -- Alf Gaida <agaida@siduction.org>  Sat, 14 Feb 2015 15:59:22 +0100
+
--- a/debian/control
+++ b/debian/control
@ -1,6 +1,6 @@
 Source: liblxqt
 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>
@ -8,24 +8,23 @@ Section: libs
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
               dh-exec,
-               libkf6windowsystem-dev (>= 6.0.0),
-               libpolkit-qt6-1-dev,
-               libqt6xdg-dev (>= 4.1.0),
-               libqt6xdgiconloader-dev (>= 4.1.0),
+               libkf5windowsystem-dev (>= 5.36.0),
+               libpolkit-qt5-1-dev,
+               libqt5svg5-dev,
+               libqt5x11extras5-dev,
+               libqt5xdg-dev (>= 3.9.1),
+               libqt5xdgiconloader-dev (>= 3.9.1),
               libx11-dev,
-               libxkbcommon-dev (>= 0.5.0),
               libxss-dev,
-               lxqt-build-tools (>= 2.1.0),
-               qt6-svg-dev (>= 6.6.0)
-Standards-Version: 4.7.0
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/liblxqt-packaging
-Vcs-Git: https://git.lubuntu.me/Lubuntu/liblxqt-packaging.git
-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/liblxqt
-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/liblxqt.git
+               lxqt-build-tools (>= 0.11.0)
+Standards-Version: 4.6.1
+Vcs-Browser: https://phab.lubuntu.me/source/liblxqt/
+Vcs-Git: https://phab.lubuntu.me/source/liblxqt.git
+XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/liblxqt
+XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/liblxqt.git
 Homepage: https://github.com/lxqt/liblxqt
-Rules-Requires-Root: no

-Package: liblxqt2
+Package: liblxqt1
 Architecture: any
 Depends: desktop-file-utils,
         shared-mime-info,
@ -33,8 +32,8 @@ Depends: desktop-file-utils,
         ${shlibs:Depends}
 Recommends: liblxqt-l10n
 Pre-Depends: ${misc:Pre-Depends}
-Breaks: liblxqt0 (<< 0.99), liblxqt1
-Replaces: liblxqt0 (<< 0.99), liblxqt1
+Breaks: liblxqt0 (<< 0.99)
+Replaces: liblxqt0 (<< 0.99)
 Description: Shared libraries for LXQt desktop environment (libs)
 LXQt is an advanced, easy-to-use, and fast desktop environment based on Qt
 technologies. It has been tailored for users who value simplicity, speed, and
@ -44,13 +43,13 @@ Description: Shared libraries for LXQt desktop environment (libs)
 This package contains the shared libraries needed by the LXQt desktop
 environment.

-Package: liblxqt2-dev
+Package: liblxqt1-dev
 Architecture: any
 Section: libdevel
-Depends: liblxqt2 (= ${binary:Version}),
-         libqt6xdg-dev (>= 4.1.0),
-         libqt6xdgiconloader-dev (>= 4.1.0),
-         lxqt-build-tools (>= 2.1.0),
+Depends: liblxqt1 (= ${binary:Version}),
+         libqt5xdg-dev (>= 3.9.1),
+         libqt5xdgiconloader-dev (>= 3.9.1),
+         lxqt-build-tools (>= 0.11.0),
         ${misc:Depends}
 Description: Shared libraries for LXQt desktop environment (dev)
 LXQt is an advanced, easy-to-use, and fast desktop environment based on Qt
@ -64,11 +63,6 @@ Package: liblxqt-l10n
 Architecture: all
 Multi-Arch: foreign
 Section: localization
-Depends: qt6-translations-l10n, ${misc:Depends}
+Depends: qttranslations5-l10n, ${misc:Depends}
 Description: Language package for liblxqt
- LXQt is an advanced, easy-to-use, and fast desktop environment based on Qt
- technologies. It has been tailored for users who value simplicity, speed, and
- an intuitive interface. Unlike most desktop environments, LXQt also works
- fine with less powerful machines.
- .
- This package contains the l10n files needed by liblxqt.
+ This package contains the l10n files needed by the liblxqt.
--- a/debian/copyright
+++ b/debian/copyright
@ -3,30 +3,17 @@ Upstream-Name: liblxqt
 Source: https://github.com/lxqt/liblxqt

 Files: *
-Copyright: 2012-2024 LXQt team
-           2010-2013 Razor team
-License: LGPL-2.1+
-
-Files: lxqtautostartentry.cpp
-       lxqtautostartentry.h
-       lxqtnotification.cpp
-       lxqtnotification.h
-       lxqtnotification_p.h
-       lxqtprogramfinder.cpp
-       lxqtprogramfinder.h
-       configdialog/lxqtconfigdialog.cpp
-       configdialog/lxqtconfigdialog.h
-       configdialog/lxqtconfigdialogcmdlineoptions.cpp
-       configdialog/lxqtconfigdialogcmdlineoptions.h
-       configdialog/lxqtconfigdialog_p.h
-Copyright: 2012-2013 Alec Moskvin <alecm@gmx.com>
-           2018 Luis Pereira <luis.artur.pereira@gmail.com>
+Copyright: 2012-2019, LXQt team
+           2010-2013, Razor team
+           2012, The Chromium Authors
+           2012-2013, Alec Moskvin <alecm@gmx.com>
+           2016-2018, P.L. Lucas
+           2016, 2018, Luís Pereira <luis.artur.pereira@gmail.com>
 License: LGPL-2.1+

 Files: debian/*
-Copyright: 2014-2019 Alf Gaida <agaida@siduction.org>
-           2022-2023 Simon Quigley <tsimonq2@debian.org>
-           2022-2024 Aaron Rainbolt <arraybolt3@gmail.com>
+Copyright: 2021-2022, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+           2014-2019, Alf Gaida <agaida@siduction.org>
 License: LGPL-2.1+

 License: LGPL-2.1+
--- a/debian/liblxqt1-dev.install
+++ b/debian/liblxqt1-dev.install
--- a/debian/liblxqt1.install
+++ b/debian/liblxqt1.install
@ -1,4 +1,8 @@
-usr/bin/lxqt-backlight_backend
+#!/usr/bin/dh-exec
+
 usr/lib/*/liblxqt.so.*
+
 usr/share/lxqt/power.conf
+
 usr/share/polkit-1/actions/org.lxqt.backlight.pkexec.policy
+usr/bin/lxqt-backlight_backend
--- a/debian/liblxqt1.lintian-overrides
+++ b/debian/liblxqt1.lintian-overrides
@ -0,0 +1,6 @@
+# lxqt-backlight_backend is a needed helper-application
+liblxqt1: application-in-library-section libs usr/bin/lxqt-backlight_backend
+
+# there will be no manpage for lxqt-backlight_backend
+liblxqt1: no-manual-page usr/bin/lxqt-backlight_backend
+
--- a/debian/liblxqt1.symbols
+++ b/debian/liblxqt1.symbols
@ -1,6 +1,6 @@
-# SymbolsHelper-Confirmed: 2.1.0 amd64
-liblxqt.so.2 liblxqt2 #MINVER#
-* Build-Depends-Package: liblxqt2-dev
+# SymbolsHelper-Confirmed: 1.1.0 amd64 armhf
+liblxqt.so.1 liblxqt1 #MINVER#
+* Build-Depends-Package: liblxqt1-dev
 _ZN4LXQt10GridLayout10invalidateEv@Base 1.1.0
 _ZN4LXQt10GridLayout10setStretchE6QFlagsINS0_11StretchFlagEE@Base 1.1.0
 _ZN4LXQt10GridLayout11qt_metacallEN11QMetaObject4CallEiPPv@Base 1.1.0
@ -8,7 +8,6 @@ liblxqt.so.2 liblxqt2 #MINVER#
 _ZN4LXQt10GridLayout11setGeometryERK5QRect@Base 1.1.0
 _ZN4LXQt10GridLayout11setRowCountEi@Base 1.1.0
 _ZN4LXQt10GridLayout12setDirectionENS0_9DirectionE@Base 1.1.0
- _ZN4LXQt10GridLayout13setItemsOrderENS0_10ItemsOrderE@Base 2.1.0
 _ZN4LXQt10GridLayout14setColumnCountEi@Base 1.1.0
 _ZN4LXQt10GridLayout16setCellFixedSizeE5QSize@Base 1.1.0
 _ZN4LXQt10GridLayout16staticMetaObjectE@Base 1.1.0
@ -29,7 +28,7 @@ liblxqt.so.2 liblxqt2 #MINVER#
 _ZN4LXQt10GridLayoutD1Ev@Base 1.1.0
 _ZN4LXQt10GridLayoutD2Ev@Base 1.1.0
 _ZN4LXQt10PluginInfo4loadERK7QString@Base 1.1.0
- _ZN4LXQt10PluginInfo6searchERK5QListI7QStringERKS2_S7_@Base 2.0.0
+ _ZN4LXQt10PluginInfo6searchERK11QStringListRK7QStringS6_@Base 1.1.0
 _ZN4LXQt10PluginInfo6searchERK7QStringS3_S3_@Base 1.1.0
 _ZN4LXQt10PluginInfoC1Ev@Base 1.1.0
 _ZN4LXQt10PluginInfoC2Ev@Base 1.1.0
@ -37,7 +36,7 @@ liblxqt.so.2 liblxqt2 #MINVER#
 _ZN4LXQt10Translator16translateLibraryERK7QString@Base 1.1.0
 _ZN4LXQt10Translator20translateApplicationERK7QString@Base 1.1.0
 _ZN4LXQt10Translator22translationSearchPathsEv@Base 1.1.0
- _ZN4LXQt10Translator25setTranslationSearchPathsERK5QListI7QStringE@Base 2.0.0
+ _ZN4LXQt10Translator25setTranslationSearchPathsERK11QStringList@Base 1.1.0
 _ZN4LXQt11Application10unixSignalEi@Base 1.1.0
 _ZN4LXQt11Application11qt_metacallEN11QMetaObject4CallEiPPv@Base 1.1.0
 _ZN4LXQt11Application11qt_metacastEPKc@Base 1.1.0
@ -70,7 +69,7 @@ liblxqt.so.2 liblxqt2 #MINVER#
 _ZN4LXQt12ConfigDialog4saveEv@Base 1.1.0
 _ZN4LXQt12ConfigDialog5eventEP6QEvent@Base 1.1.0
 _ZN4LXQt12ConfigDialog5resetEv@Base 1.1.0
- _ZN4LXQt12ConfigDialog7addPageEP7QWidgetRK7QStringRK5QListIS3_E@Base 2.0.0
+ _ZN4LXQt12ConfigDialog7addPageEP7QWidgetRK7QStringRK11QStringList@Base 1.1.0
 _ZN4LXQt12ConfigDialog7addPageEP7QWidgetRK7QStringS5_@Base 1.1.0
 _ZN4LXQt12ConfigDialog7clickedEN16QDialogButtonBox14StandardButtonE@Base 1.1.0
 _ZN4LXQt12ConfigDialog8showPageEP7QWidget@Base 1.1.0
@ -90,7 +89,7 @@ liblxqt.so.2 liblxqt2 #MINVER#
 _ZN4LXQt12HtmlDelegateD2Ev@Base 1.1.0
 _ZN4LXQt12Notification10clearHintsEv@Base 1.1.0
 _ZN4LXQt12Notification10serverInfoEv@Base 1.1.0
- _ZN4LXQt12Notification10setActionsERK5QListI7QStringEi@Base 2.0.0
+ _ZN4LXQt12Notification10setActionsERK11QStringListi@Base 1.1.0
 _ZN4LXQt12Notification10setSummaryERK7QString@Base 1.1.0
 _ZN4LXQt12Notification10setTimeoutEi@Base 1.1.0
 _ZN4LXQt12Notification11qt_metacallEN11QMetaObject4CallEiPPv@Base 1.1.0
@ -130,9 +129,9 @@ liblxqt.so.2 liblxqt2 #MINVER#
 _ZN4LXQt12PowerManagerD1Ev@Base 1.1.0
 _ZN4LXQt12PowerManagerD2Ev@Base 1.1.0
 _ZN4LXQt13ProgramFinder11programNameERK7QString@Base 1.1.0
- _ZN4LXQt13ProgramFinder12findProgramsERK5QListI7QStringE@Base 2.0.0
+ _ZN4LXQt13ProgramFinder12findProgramsERK11QStringList@Base 1.1.0
 _ZN4LXQt13ProgramFinder13programExistsERK7QString@Base 1.1.0
- _ZN4LXQt13RotatedWidget10enterEventEP11QEnterEvent@Base 2.0.0
+ _ZN4LXQt13RotatedWidget10enterEventEP6QEvent@Base 1.1.0
 _ZN4LXQt13RotatedWidget10leaveEventEP6QEvent@Base 1.1.0
 _ZN4LXQt13RotatedWidget10paintEventEP11QPaintEvent@Base 1.1.0
 _ZN4LXQt13RotatedWidget10wheelEventEP11QWheelEvent@Base 1.1.0
@ -278,7 +277,6 @@ liblxqt.so.2 liblxqt2 #MINVER#
 _ZN4LXQt9LXQtThemeD1Ev@Base 1.1.0
 _ZN4LXQt9LXQtThemeD2Ev@Base 1.1.0
 _ZN4LXQt9LXQtThemeaSERKS0_@Base 1.1.0
- _ZNK4LXQt10GridLayout10itemsOrderEv@Base 2.1.0
 _ZNK4LXQt10GridLayout10metaObjectEv@Base 1.1.0
 _ZNK4LXQt10GridLayout11columnCountEv@Base 1.1.0
 _ZNK4LXQt10GridLayout15cellMaximumSizeEv@Base 1.1.0
@ -339,9 +337,7 @@ liblxqt.so.2 liblxqt2 #MINVER#
 _ZNK4LXQt9LXQtTheme4nameEv@Base 1.1.0
 _ZNK4LXQt9LXQtTheme4pathEv@Base 1.1.0
 _ZNK4LXQt9LXQtTheme7isValidEv@Base 1.1.0
- (optional=templinst)_ZNKSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE4findERS2_@Base 2.0.0
- (optional=templinst)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE24_M_get_insert_unique_posERS2_@Base 2.0.0
- (optional=templinst|arch=!armhf !s390x)_ZNSt8_Rb_treeI7QStringSt4pairIKS0_8QVariantESt10_Select1stIS4_ESt4lessIS0_ESaIS4_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS4_ERS2_@Base 2.0.0
+ _ZNSt6vectorIiSaIiEE17_M_realloc_insertIJiEEEvN9__gnu_cxx17__normal_iteratorIPiS1_EEDpOT_@Base 1.1.0
 _ZTIN4LXQt10GridLayoutE@Base 1.1.0
 _ZTIN4LXQt10MessageBoxE@Base 1.1.0
 _ZTIN4LXQt10PluginInfoE@Base 1.1.0
@ -399,11 +395,9 @@ liblxqt.so.2 liblxqt2 #MINVER#
 _ZTVN4LXQt5PowerE@Base 1.1.0
 _ZTVN4LXQt8SettingsE@Base 1.1.0
 _ZTVN4LXQt9BacklightE@Base 1.1.0
- _Zls6QDebugRK5QListIN4LXQt10PluginInfoEE@Base 2.0.0
- _Zls6QDebugRKN4LXQt10PluginInfoE@Base 2.0.0
- (c++)"non-virtual thunk to LXQt::ConfigDialog::~ConfigDialog()@Base" 2.0.0
+ (c++|arch=!armhf)"non-virtual thunk to LXQt::ConfigDialog::~ConfigDialog()@Base" 1.1.0
 (c++)"non-virtual thunk to LXQt::GridLayout::invalidate()@Base" 1.1.0
- (c++)"non-virtual thunk to LXQt::GridLayout::setGeometry(QRect const&)@Base" 2.0.0
- (c++)"non-virtual thunk to LXQt::GridLayout::sizeHint() const@Base" 2.0.0
- (c++)"non-virtual thunk to LXQt::GridLayout::~GridLayout()@Base" 2.0.0
+ (c++|arch=!armhf)"non-virtual thunk to LXQt::GridLayout::setGeometry(QRect const&)@Base" 1.1.0
+ (c++|arch=!armhf)"non-virtual thunk to LXQt::GridLayout::sizeHint() const@Base" 1.1.0
+ (c++|arch=!armhf)"non-virtual thunk to LXQt::GridLayout::~GridLayout()@Base" 1.1.0
 (c++)"non-virtual thunk to LXQt::PageSelectWidget::~PageSelectWidget()@Base" 1.1.0
--- a/debian/liblxqt2.lintian-overrides
+++ b/debian/liblxqt2.lintian-overrides
@ -1,5 +0,0 @@
-# there will be no manpage for lxqt-backlight_backend
-liblxqt2: no-manual-page [usr/bin/lxqt-backlight_backend]
-
-# This is fine
-liblxqt2: application-in-library-section libs [usr/bin/lxqt-backlight_backend]
--- 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

 WHICH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@ -3,4 +3,4 @@ Bug-Database: https://github.com/lxqt/liblxqt/issues
 Bug-Submit: https://github.com/lxqt/liblxqt/issues/new
 Changelog: https://github.com/lxqt/liblxqt/blob/master/CHANGELOG
 Repository: https://github.com/lxqt/liblxqt
-Repository-Browse: https://github.com/lxqt/liblxqt
+Repository-Browser: https://github.com/lxqt/liblxqt
--- 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/liblxqt/releases .*/liblxqt-([\d\.]+).tar.xz