Merge c15b67b32f into 2a38ff7e2b

debian/changelog

@@ -1,3 +1,16 @@
+lxqt-panel (1.1.0-0ubuntu2~ppa1) jammy; urgency=medium
+
+  * Backport to Jammy.
+  * Updated copyright file.
+  * Removed redundant "Repository-Browser" field from d/upstream/metadata.
+  * Bumped Standards-Version to 4.6.1, no changes necessary.
+  * Removed obsolete "-Wl,--as-needed" linker flag.
+  * Added "Rules-Requires-Root: no" to debian/control.
+    - Silences "silent-on-rules-requiring-root" Lintian message.
+  * Removed trailing whitespace from changelog.
+
+ -- Aaron Rainbolt <arraybolt3@gmail.com>  Wed, 06 Jul 2022 14:25:33 -0500
+
 lxqt-panel (1.1.0-0ubuntu2) kinetic; urgency=medium
 
   * Add some missing build dependencies.
@@ -497,4 +510,3 @@ lxqt-panel (0.9.0+20151101-1) experimental; urgency=medium
   * Removing whitespaces at EOL and EOF.
 
  -- Alf Gaida <agaida@siduction.org>  Sun, 25 Oct 2015 02:27:12 +0200
-

debian/control

@@ -34,12 +34,13 @@ Build-Depends: debhelper-compat (= 13),
                libxkbcommon-x11-dev,
                libxrender-dev,
                libxtst-dev
-Standards-Version: 4.5.1
+Standards-Version: 4.6.1
 Vcs-Browser: https://phab.lubuntu.me/source/lxqt-panel/
 Vcs-Git: https://phab.lubuntu.me/source/lxqt-panel.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-panel
 XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-panel.git
 Homepage: https://github.com/lxqt/lxqt-panel
+Rules-Requires-Root: no
 
 Package: lxqt-panel
 Architecture: any

debian/copyright

@@ -3,16 +3,43 @@ Upstream-Name: lxqt-panel
 Source: https://github.com/lxqt/lxqt-panel
 
 Files: *
-Copyright: 2012-2020, LXQt team
+Copyright: 2012-2022, LXQt team
            2010-2013, Razor team
 License: LGPL-2.1+
 
+Files: plugin-tray/fdoselectionmanager.cpp
+       plugin-tray/snidbus.cpp
+       plugin-tray/sniproxy.cpp
+       plugin-tray/sniproxy.h
+Copyright: 2015 David Edmundson <davidedmundson@kde.org>
+           2019 Konrad Materka <materka@gmail.com>
+           2022 LXQt team
+License: LGPL-2.1+
+
+Files: plugin-tray/fdoselectionmanager.h
+       plugin-tray/snidbus.h
+Copyright: 2015 David Edmundson <davidedmundson@kde.org>
+           2022 LXQt team
+License: LGPL-2.1+
+
+Files: plugin-tray/xcbutils.h
+Copyright: 2012, 2013 Martin Graesslin <mgraesslin@kde.org>
+           2015 David Edmundson <davidedmundson@kde.org>
+           2022 LXQt team
+License: LGPL-2.1+
+
+Files: plugin-tray/xtestsender.cpp
+       plugin-tray/xtestsender.h
+Copyright: 2017 David Edmundson <davidedmundson@kde.org>
+           2022 LXQt team
+License: LGPL-2.1+
+
 Files: panel/lxqtpanelapplication_p.h
 Copyright: 2016, Luís Pereira <luis.artur.pereira@gmail.com>
 License: LGPL-2.1+
 
 Files: debian/*
-Copyright: 2021,      Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2022, Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
            2014-2019, Alf Gaida <agaida@siduction.org>
            2015,      Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+

debian/rules

@@ -2,7 +2,6 @@
 # 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
 
 include /usr/share/dpkg/architecture.mk

debian/upstream/metadata

@@ -3,4 +3,3 @@ Bug-Database: https://github.com/lxqt/lxqt-panel/issues
 Bug-Submit: https://github.com/lxqt/lxqt-panel/issues/new
 Changelog: https://github.com/lxqt/lxqt-panel/blob/master/CHANGELOG
 Repository: https://github.com/lxqt/lxqt-panel
-Repository-Browser: https://github.com/lxqt/lxqt-panel