Refresh x-leave-to-leave.patch

debian/.gitignore

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

debian/changelog

@@ -1,3 +1,53 @@
+lxqt-menu-data (2.3.0-0ubuntu1) resolute; urgency=medium
+
+  * New upstream release.
+    - Update build dependencies.
+    - Refresh x-leave-to-leave.patch.
+  * Update copyright file.
+  * Update Standards-Version to 4.7.3, no changes needed.
+  * Remove redundant 'Rules-Requires-Root: no' control line.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Wed, 14 Jan 2026 12:45:37 -0600
+
+lxqt-menu-data (2.2.0-0ubuntu1) questing; urgency=medium
+
+  * New upstream release.
+    - Update build dependencies.
+  * Update Standards-Version to 4.7.2, no changes needed.
+  * Update copyright file.
+
+ -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Sun, 08 Jun 2025 00:26:55 -0500
+
+lxqt-menu-data (2.1.0-0ubuntu3) plucky; urgency=medium
+
+  * Update Standards-Version to 4.7.1, no changes needed.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 21 Feb 2025 16:07:39 -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.

debian/control

@@ -2,10 +2,10 @@ Source: lxqt-menu-data
 Section: libs
 Priority: optional
 Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
-Uploaders: Simon Quigley <tsimonq2@ubuntu.com>
+Uploaders: Simon Quigley <tsimonq2@ubuntu.com>,
-Rules-Requires-Root: no
+           Aaron Rainbolt <arraybolt3@ubuntu.com>
-Build-Depends: cmake, debhelper-compat (= 13), lxqt-build-tools (>= 0.13.0)
+Build-Depends: cmake, debhelper-compat (= 13), lxqt-build-tools (>= 2.3.0)
-Standards-Version: 4.6.2
+Standards-Version: 4.7.3
 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,12 +13,8 @@ Homepage: https://github.com/lxqt/lxqt-menu-data
 Package: lxqt-menu-data
 Architecture: all
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: lxqt-panel (<< 1.4.0),
+Breaks: lxqt-config (<< 1.4.0), lxqt-panel (<< 1.4.0), pcmanfm-qt (<< 1.4.0)
-        lxqt-config (<< 1.4.0),
+Replaces: lxqt-config (<< 1.4.0), lxqt-panel (<< 1.4.0), pcmanfm-qt (<< 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,11 +3,13 @@ Source: https://github.com/lxqt/lxqt-menu-data
 Upstream-Name: lxqt-menu-data
 
 Files: *
-Copyright: 2023 LXQt team
+Copyright: 2023-2025 LXQt team
 License: LGPL-2.1
 
 Files: debian/*
-Copyright: 2023 Simon Quigley <tsimonq2@ubuntu.com>
+Copyright: 2023-2025 Simon Quigley <tsimonq2@ubuntu.com>
+                2025 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
+           2024-2026 Aaron Rainbolt <arraybolt3@ubuntu.com>
 License: LGPL-2.1
 
 License: LGPL-2.1

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

@@ -3,13 +3,22 @@ Description: Instead of saying X-Leave, say Leave
 Author: Simon Quigley <tsimonq2@ubuntu.com>
 Origin: vendor
 Forwarded: no
-Last-Update: 2023-11-13
+Last-Update: 2026-01-14
 ---
 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 @@
+@@ -139,7 +139,7 @@
- 
+ 				<Category>System</Category>
+ 				<Not><Category>Settings</Category></Not>
+ 				<Not><Category>PackageManager</Category></Not>
+-				<Not><Category>X-Leave</Category></Not>
++				<Not><Category>Leave</Category></Not>
+ 				<Not><Category>Screensaver</Category></Not>
+ 				<Not><Filename>lxqt-about.desktop</Filename></Not>
+ 			</And>
+@@ -207,11 +207,11 @@
+
  	<!-- Leave -->
  	<Menu>
 -		<Name>X-Leave</Name>
@@ -17,39 +26,33 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		<Directory>lxqt-leave.directory</Directory>
  		<Include>
  			<And>
-@@ -240,7 +240,7 @@
+-				<Category>X-Leave</Category>
++				<Category>Leave</Category>
+ 			</And>
+ 		</Include>
+ 		<Exclude>
+@@ -238,7 +238,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-simple.menu
-+++ b/menu/lxqt-applications-simple.menu
-@@ -193,7 +193,7 @@
- 
- 	<!-- Leave -->
- 	<Menu>
--		<Name>X-Leave</Name>
-+		<Name>Leave</Name>
- 		<Directory>lxqt-leave.directory</Directory>
- 		<Include>
- 			<And>
-@@ -217,7 +217,7 @@
- 		<Separator/>
- 		<Menuname show_empty="false" inline="true">Configuration Center</Menuname>
- 		<Separator/>
 -		<Menuname show_empty="false">X-Leave</Menuname>
 +		<Menuname show_empty="false">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 @@
+@@ -139,7 +139,7 @@
- 
+ 				<Category>System</Category>
+ 				<Not><Category>Settings</Category></Not>
+ 				<Not><Category>PackageManager</Category></Not>
+-				<Not><Category>X-Leave</Category></Not>
++				<Not><Category>Leave</Category></Not>
+ 				<Not><Category>Screensaver</Category></Not>
+ 				<Not><Filename>lxqt-about.desktop</Filename></Not>
+ 			</And>
+@@ -205,11 +205,11 @@
+
  	<!-- Leave -->
  	<Menu>
 -		<Name>X-Leave</Name>
@@ -57,6 +60,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		<Directory>lxqt-leave.directory</Directory>
  		<Include>
  			<And>
+-				<Category>X-Leave</Category>
++				<Category>Leave</Category>
+ 			</And>
+ 		</Include>
+ 	</Menu>	 <!-- End Leave -->
 @@ -229,7 +229,7 @@
  		<Menuname>DesktopSettings</Menuname>
  		<Menuname show_empty="false" inline="true">LXQt-About</Menuname>
@@ -65,4 +73,4 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +		<Menuname show_empty="false">Leave</Menuname>
  		<Menuname show_empty="false" inline="true">Screensaver</Menuname>
  	</Layout>
- 
+

debian/source/lintian-overrides

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

debian/watch

@@ -1,5 +1,6 @@
-version=4
+Version: 5
-opts="searchmode=plain, \
+Template: GitHub
-pgpsigurlmangle=s/$/.asc/, \
+Owner: lxqt
-uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \
+Project: @PACKAGE@
-  https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz
+Download-Url-Mangle: s%https://api.github.com/repos/([^/]+)/@PACKAGE@/git/refs/tags/@ANY_VERSION@%https://github.com/$1/@PACKAGE@/releases/download/$2/@PACKAGE@-$2.tar.xz%g
+Pgp-Mode: auto