Merge ~liushuyu-011/ubuntu/+source/lxqt-metapackages:merge-lp2065228 into ubuntu/+source/lxqt-metapackages:debian/sid

[Zixing Liu]

This MP merges lxqt-metapackages changes from Debian unstable into Ubuntu Oracular.

PPA build: https://launchpad.net/~liushuyu-011/+archive/ubuntu/misc/+sourcepub/16127541/+listing-archive-extra

[Zixing Liu (liushuyu-011)]

Cleaned up whitespace and sorting changes.
The delta is more clear now.

[Zixing Liu (liushuyu-011)]

Done. Cleaned up all the non-functional changes.

[Simon Quigley (tsimonq2)]

LGTM, although you're missing the addition of lxqt-archiver in debian/changelog.

Fixing and uploading.

review: Approve

[Zixing Liu (liushuyu-011)]

> LGTM, although you're missing the addition of lxqt-archiver in
> debian/changelog.

Thanks for pointing this out! I was basing the changelog on the previous changelog entries.

diff --git a/debian/changelog b/debian/changelog
index d3a4394..e25e4ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+lxqt-metapackages (32ubuntu1) oracular; urgency=medium
+
+  * Merge with Debian unstable (LP: #2065228). Remaining changes:
+    - Ensure xdg-desktop-portal-lxqt is a dependency of lxqt-core.
+  * Dropped changes:
+    - Remove old Breaks/Replaces since we're past the LTS.
+
+ -- Zixing Liu <[e-mail]>  Wed, 08 May 2024 16:41:55 -0600
+
 lxqt-metapackages (32) unstable; urgency=medium
 
   [ ChangZhuo Chen (陳昌倬) ]
@@ -27,6 +36,25 @@ lxqt-metapackages (31) unstable; urgency=medium
 
  -- ChangZhuo Chen (陳昌倬) <[e-mail]>  Fri, 06 Jan 2023 00:19:34 +0800
 
+lxqt-metapackages (30ubuntu3) noble; urgency=high
+
+  * No change rebuild for frame pointers (and time_t).
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 18 Apr 2024 20:00:06 +0200
+
+lxqt-metapackages (30ubuntu2) kinetic; urgency=medium
+
+  * Ensure xdg-desktop-portal-lxqt is a dependency of lxqt-core.
+  * Remove old Breaks/Replaces since we're past the LTS.
+
+ -- Simon Quigley <[e-mail]>  Thu, 02 Jun 2022 13:50:23 -0500
+
+lxqt-metapackages (30ubuntu1) hirsute; urgency=medium
+
+  * Added lxqt-archiver to archiver Recommends (LP: #1918564) 
+
+ -- Walter Lapchynski <[e-mail]>  Wed, 10 Mar 2021 17:20:23 -0800
+
 lxqt-metapackages (30) unstable; urgency=medium
 
   * Use x-window-manager as alternative in lxqt (Closes: #942157)
diff --git a/debian/control b/debian/control
index 19aef07..267a8cd 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,6 @@
 Source: lxqt-metapackages
-Maintainer: LXQt Packaging Team <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: LXQt Packaging Team <[e-mail]>
 Uploaders: Alf Gaida <[e-mail]>,
            Andrew Lee (李健秋) <[e-mail]>,
            ChangZhuo Chen (陳昌倬) <[e-mail]>
@@ -28,7 +29,8 @@ Depends: ${misc:Depends},
          lxqt-runner,
          lxqt-session,
          pcmanfm-qt,
-         qterminal
+         qterminal,
+         xdg-desktop-portal-lxqt
 Recommends: featherpad,
             lximage-qt,
             lxqt-about,
@@ -39,7 +41,7 @@ Recommends: featherpad,
             qlipper | clipit | xfce4-clipman,
             qps,
             qttranslations5-l10n,
-            xarchiver | ark | engrampa,
+            lxqt-archiver | xarchiver | ark | engrampa,
             xscreensaver
 Suggests: feathernotes,
           firefox | www-browser,