debian/.gitignore

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

debian/changelog

@@ -1,12 +1,3 @@
-lxqt-menu-data (2.1.0-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release.
-    - Bump build dependencies.
-    - Refresh patch.
-  * Make the package Lintian-clean.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 05 Nov 2024 11:30:22 -0600
-
 lxqt-menu-data (2.0.0-0ubuntu1) oracular; urgency=medium
 
   * New upstream release.

debian/control

@@ -4,7 +4,7 @@ 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 (>= 2.0.0)
 Standards-Version: 4.7.0
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-menu-data-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-menu-data-packaging.git
@@ -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/files

@@ -0,0 +1 @@
+lxqt-menu-data_2.0.0-0ubuntu1~ppa1_source.buildinfo libs optional

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

@@ -26,6 +26,26 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  		<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 @@

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]