Backport to Mantic.

2023-11-16 15:12:19 -06:00
6 changed files with 21 additions and 120 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,68 +1,8 @@
-xdg-desktop-portal-lxqt (1.2.0-0ubuntu1) questing; urgency=medium
+xdg-desktop-portal-lxqt (0.5.0-0ubuntu2~ppa1) mantic; urgency=medium

-  * New upstream release.
-    - Update build dependencies.
-  * Update copyright file.
-  * Update Standards-Version to 4.7.2, no changes needed.
-  * Use Breaks/Replaces rather than Conflicts/Replaces on older lxqt-session
-    versions.
-  * Add DEP-3 header on add-kde-as-secondary-option.patch.
+  * Backport to Mantic.

- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 01 Aug 2025 11:30:28 -0500
-
-xdg-desktop-portal-lxqt (1.1.0-0ubuntu6) plucky; urgency=medium
-
-  * Update Standards-Version to 4.7.1, no changes needed.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:59:23 -0600
-
-xdg-desktop-portal-lxqt (1.1.0-0ubuntu5) plucky; urgency=medium
-
-  * Remove extra runtime depends that are pulled in by debhelper anyway.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 16 Feb 2025 19:26:24 -0600
-
-xdg-desktop-portal-lxqt (1.1.0-0ubuntu4) plucky; urgency=medium
-
-  * No-change rebuild for Qt 6.8.2.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 04 Feb 2025 18:32:43 -0600
-
-xdg-desktop-portal-lxqt (1.1.0-0ubuntu3) plucky; urgency=medium
-
-  * No-change rebuild for lxqt-build-tools C++17 -> C++20.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 Jan 2025 04:03:21 -0600
-
-xdg-desktop-portal-lxqt (1.1.0-0ubuntu2) plucky; urgency=medium
-
-  * No-change rebuild for Qt 6.8.1.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 05 Dec 2024 00:46:26 -0600
-
-xdg-desktop-portal-lxqt (1.1.0-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-    - Add Breaks/Replaces on the older lxqt-session, since we include
-      lxqt-portals.conf now.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:33:57 -0600
-
-xdg-desktop-portal-lxqt (1.0.2-0ubuntu2) plucky; urgency=medium
-
-  * No-change rebuild against Qt 6.7.2 private-abi.
-
- -- Rik Mills <rikmills@kde.org>  Thu, 17 Oct 2024 17:54:36 +0100
-
-xdg-desktop-portal-lxqt (1.0.2-0ubuntu1) oracular; urgency=medium
-
-  * New upstream release.
-  * Update copyright file.
-  * Bump Standards-Version to 4.7.0, no changes necessary.
-  * Adjust dependencies.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:46:38 -0500
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Thu, 16 Nov 2023 15:12:07 -0600

 xdg-desktop-portal-lxqt (0.5.0-0ubuntu2) noble; urgency=medium

--- a/debian/control
+++ b/debian/control
@ -4,39 +4,12 @@ Uploaders: Simon Quigley <tsimonq2@lubuntu.me>
 Section: libs
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
-               cmake (>= 3.18),
-               libfm-qt6-dev (>= 2.2.0),
-               libkf6windowsystem-dev (>= 6.0.0),
-               libxcb-composite0-dev,
-               libxcb-cursor-dev,
-               libxcb-damage0-dev,
-               libxcb-dpms0-dev,
-               libxcb-dri2-0-dev,
-               libxcb-dri3-dev,
-               libxcb-ewmh-dev,
-               libxcb-glx0-dev,
-               libxcb-icccm4-dev,
-               libxcb-keysyms1-dev,
-               libxcb-present-dev,
-               libxcb-record0-dev,
-               libxcb-render0-dev,
-               libxcb-res0-dev,
-               libxcb-screensaver0-dev,
-               libxcb-shape0-dev,
-               libxcb-shm0-dev,
-               libxcb-util-dev,
-               libxcb-xf86dri0-dev,
-               libxcb-xfixes0-dev,
-               libxcb-xinerama0-dev,
-               libxcb-xinput-dev,
-               libxcb-xkb-dev,
-               libxcb-xtest0-dev,
-               libxcb-xv0-dev,
-               libxcb-xvmc0-dev,
-               libxkbcommon-dev (>= 0.5.0),
-               lxqt-build-tools (>= 2.2.0),
-               qt6-base-private-dev (>= 6.6.0)
-Standards-Version: 4.7.2
+               libfm-qt-dev (>= 1.4.0),
+               libkf5windowsystem-dev,
+               libqt5x11extras5-dev,
+               lxqt-build-tools (>= 0.13.0),
+               qtbase5-private-dev
+Standards-Version: 4.6.2
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/xdg-desktop-portal-lxqt-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/xdg-desktop-portal-lxqt-packaging.git
 Homepage: https://github.com/lxqt/xdg-desktop-portal-lxqt
@ -44,16 +17,19 @@ Rules-Requires-Root: no

 Package: xdg-desktop-portal-lxqt
 Architecture: any
-Depends: xdg-desktop-portal, ${misc:Depends}, ${shlibs:Depends}
-Breaks: lxqt-session (<< 2.1.0)
-Replaces: lxqt-session (<< 2.1.0)
+Depends: libfm-qt-dev (>= 1.4.0),
+         libkf5windowsystem-dev,
+         libqt5x11extras5-dev,
+         xdg-desktop-portal,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Provides: xdg-desktop-portal-backend
-Description: xdg-desktop-portal using Qt/KF6/libfm-qt
+Description: xdg-desktop-portal using Qt/KF5/libfm-qt
 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 a backend implementation for xdg-desktop-portal that is
- using Qt/KF6/libfm-qt.
+ using Qt/KF5/libfm-qt.
--- a/debian/copyright
+++ b/debian/copyright
@ -3,7 +3,7 @@ Upstream-Name: qtxdg-tools
 Source: https://github.com/lxqt/qtxdg-tools

 Files: *
-Copyright: 2021-2025 LXQt team
+Copyright: 2021-2023 LXQt team
 License: LGPL-2.1

 Files: src/desktopportal.cpp
@ -22,8 +22,8 @@ Copyright: 2016-2018 Red Hat Inc
 License: LGPL-2.1+

 Files: debian/*
-Copyright: 2022-2025 Simon Quigley <tsimonq2@ubuntu.com>
-           2022-2025 Aaron Rainbolt <arraybolt3@gmail.com>
+Copyright: 2022-2023 Simon Quigley <tsimonq2@ubuntu.com>
+           2022-2023 Aaron Rainbolt <arraybolt3@gmail.com>
 License: LGPL-2.1+

 License: LGPL-2.1
--- a/debian/patches/add-kde-as-secondary-option.patch
+++ b/debian/patches/add-kde-as-secondary-option.patch
@ -1,13 +0,0 @@
-Description: Add KDE desktop portal as fallback
- KDE's desktop portal is a better fallback than GTK's for Qt-based desktop
- environments. Try KDE's before falling back to GTK's.
-Forwarded: no
-Author: Simon Quigley <tsimonq2@ubuntu.com>
-Reviewed-By: Aaron Rainbolt <arraybolt3@ubuntu.com>
--- a/data/lxqt-portals.conf
-+++ b/data/lxqt-portals.conf
-@@ -1,3 +1,2 @@
- [preferred]
-default=lxqt
-org.freedesktop.impl.portal.FileChooser=lxqt;gtk;
-+default=lxqt;kde;gtk;
--- a/debian/patches/series
+++ b/debian/patches/series
@ -1 +0,0 @@
-add-kde-as-secondary-option.patch
--- a/debian/rules
+++ b/debian/rules
@ -9,8 +9,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all

 override_dh_installchangelogs:
 	dh_installchangelogs -O--buildsystem=cmake
-	mv debian/xdg-desktop-portal-lxqt/usr/share/doc/xdg-desktop-portal-lxqt/CHANGELOG debian/xdg-desktop-portal-lxqt/usr/share/doc/xdg-desktop-portal-lxqt/changelog
-	gzip -9 debian/xdg-desktop-portal-lxqt/usr/share/doc/xdg-desktop-portal-lxqt/changelog
+	gzip -9 debian/xdg-desktop-portal-lxqt/usr/share/doc/xdg-desktop-portal-lxqt/CHANGELOG

 override_dh_auto_configure:
 	dh_auto_configure -- \