Backport to Jammy.

debian/.gitignore

@@ -1 +0,0 @@
-files

debian/changelog

@@ -1,38 +1,8 @@
-lxqt-menu-data (2.1.0-0ubuntu3) plucky; urgency=medium
+lxqt-menu-data (1.4.1-0ubuntu3~ppa1) jammy; urgency=medium
 
-  * Update Standards-Version to 4.7.1, no changes needed.
+  * Backport to Jammy.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:07:39 -0600
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Mon, 13 Nov 2023 17:32:34 -0600
-
-lxqt-menu-data (2.1.0-0ubuntu2) plucky; urgency=medium
-
-  * No-change rebuild for lxqt-build-tools C++17 -> C++20.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 03 Jan 2025 03:56:40 -0600
-
-lxqt-menu-data (2.1.0-0ubuntu1) plucky; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-    - Refresh patch.
-  * Make the package Lintian-clean.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 15 Nov 2024 15:32:39 -0600
-
-lxqt-menu-data (2.0.0-0ubuntu1) oracular; urgency=medium
-
-  * New upstream release.
-  * Bump build deps.
-  * Update copyright file.
-  * Bump Standards-Version to 4.7.0, no changes necessary.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 15 Aug 2024 16:01:25 -0500
-
-lxqt-menu-data (1.4.1-0ubuntu4) noble; urgency=medium
-
-  * Just went a little too hard on the s/X-Leave/Leave/, now things work.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 14 Nov 2023 16:13:59 -0600
 
 lxqt-menu-data (1.4.1-0ubuntu3) noble; urgency=medium
 

debian/control

@@ -4,8 +4,8 @@ Priority: optional
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
 Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
 Rules-Requires-Root: no
-Build-Depends: cmake, debhelper-compat (= 13), lxqt-build-tools (>= 2.1.0)
+Build-Depends: cmake, debhelper-compat (= 13), lxqt-build-tools (>= 0.13.0)
-Standards-Version: 4.7.1
+Standards-Version: 4.6.2
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-menu-data-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-menu-data-packaging.git
 Homepage: https://github.com/lxqt/lxqt-menu-data
@@ -13,8 +13,12 @@ Homepage: https://github.com/lxqt/lxqt-menu-data
 Package: lxqt-menu-data
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: lxqt-config (<< 1.4.0), lxqt-panel (<< 1.4.0), pcmanfm-qt (<< 1.4.0)
+Breaks: lxqt-panel (<< 1.4.0),
-Replaces: lxqt-config (<< 1.4.0), lxqt-panel (<< 1.4.0), pcmanfm-qt (<< 1.4.0)
+        lxqt-config (<< 1.4.0),
+        pcmanfm-qt (<< 1.4.0)
+Replaces: lxqt-panel (<< 1.4.0),
+          lxqt-config (<< 1.4.0),
+          pcmanfm-qt (<< 1.4.0)
 Description: Freedesktop.org compliant menu files for LXQt
  This package contains Freedesktop.org compliant menu files for LXQt Panel,
  Configuration Center and PCManFM-Qt/libfm-qt.

debian/copyright

@@ -3,12 +3,11 @@ Source: https://github.com/lxqt/lxqt-menu-data
 Upstream-Name: lxqt-menu-data
 
 Files: *
-Copyright: 2023-2024 LXQt team
+Copyright: 2023 LXQt team
 License: LGPL-2.1
 
 Files: debian/*
-Copyright: 2023-2025 Simon Quigley <tsimonq2@ubuntu.com>
+Copyright: 2023 Simon Quigley <tsimonq2@ubuntu.com>
-           2024 Aaron Rainbolt <arraybolt3@ubuntu.com>
 License: LGPL-2.1
 
 License: LGPL-2.1

debian/patches/series

@@ -1 +0,0 @@
-x-leave-to-leave.patch

debian/patches/x-leave-to-leave.patch

@@ -1,48 +0,0 @@
-Description: Instead of saying X-Leave, say Leave
- There's no Wayland-Leave, is there?
-Author: Simon Quigley <tsimonq2@ubuntu.com>
-Origin: vendor
-Forwarded: no
-Last-Update: 2023-11-13
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/menu/lxqt-applications-compact.menu
-+++ b/menu/lxqt-applications-compact.menu
-@@ -209,7 +209,7 @@
- 
- 	<!-- Leave -->
- 	<Menu>
--		<Name>X-Leave</Name>
-+		<Name>Leave</Name>
- 		<Directory>lxqt-leave.directory</Directory>
- 		<Include>
- 			<And>
-@@ -240,7 +240,7 @@
- 		<Menuname>LXQtSettings</Menuname>
- 		<Menuname>DesktopSettings</Menuname>
- 		<Separator/>
--		<Menuname show_empty="false" inline="true">X-Leave</Menuname>
-+		<Menuname show_empty="false" inline="true">Leave</Menuname>
- 		<Menuname show_empty="false" inline="true">Screensaver</Menuname>
- 	</Layout>
- 
---- a/menu/lxqt-applications.menu
-+++ b/menu/lxqt-applications.menu
-@@ -205,7 +205,7 @@
- 
- 	<!-- Leave -->
- 	<Menu>
--		<Name>X-Leave</Name>
-+		<Name>Leave</Name>
- 		<Directory>lxqt-leave.directory</Directory>
- 		<Include>
- 			<And>
-@@ -229,7 +229,7 @@
- 		<Menuname>DesktopSettings</Menuname>
- 		<Menuname show_empty="false" inline="true">LXQt-About</Menuname>
- 		<Separator/>
--		<Menuname show_empty="false">X-Leave</Menuname>
-+		<Menuname show_empty="false">Leave</Menuname>
- 		<Menuname show_empty="false" inline="true">Screensaver</Menuname>
- 	</Layout>
- 

debian/source/lintian-overrides

@@ -1,2 +0,0 @@
-# We don't plan on forwarding this patch
-lxqt-menu-data source: patch-not-forwarded-upstream [debian/patches/x-leave-to-leave.patch]