debian/changelog

@@ -1,12 +1,9 @@
-lxqt-build-tools (0.12.0-0ubuntu1) lunar; urgency=medium
+lxqt-build-tools (0.12.0-0ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Actually fix the uscan error. Thanks for the help, arraybolt3!
-  * Lubuntuify the package slightly, to make debhelper happy.
-  * Remove upstream-applicable patch.
-  * Brief copyright update.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 16 Nov 2022 17:04:59 -0600
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Wed, 16 Nov 2022 16:48:56 -0600
 
 lxqt-build-tools (0.11.0-2) unstable; urgency=medium
 

debian/control

@@ -1,6 +1,5 @@
 Source: lxqt-build-tools
-Maintainer: Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
-XSBC-Original-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
 Uploaders: Alf Gaida <agaida@siduction.org>,
            Andrew Lee (李健秋) <ajqlee@debian.org>,
            ChangZhuo Chen (陳昌倬) <czchen@debian.org>
@@ -12,10 +11,8 @@ Build-Depends: debhelper-compat (= 13),
                pkg-config,
                qtbase5-dev
 Standards-Version: 4.6.1
-Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-build-tools-packaging
+Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-build-tools
-Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-build-tools-packaging.git
+Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-build-tools.git
-XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-build-tools
-XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-build-tools.git
 Homepage: https://github.com/lxqt/lxqt-build-tools
 
 Package: lxqt-build-tools

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: lxqt-build-tools
 Source: https://github.com/lxqt/lxqt-build-tools
 
 Files: *
-Copyright: 2012-2022 LXQt team
+Copyright: 2012-2021 LXQt team
            2010-2012 Razor team
 License: BSD-3-Clause
 

debian/patches/series

@@ -0,0 +1 @@
+use-gdesktopappinfo-h-to-find-gio-unix-2-0.patch

debian/patches/use-gdesktopappinfo-h-to-find-gio-unix-2-0.patch

@@ -0,0 +1,35 @@
+From 7aebedfa7bf103a2eb900a3b560c7bad3761e8bc Mon Sep 17 00:00:00 2001
+From: Zamir SUN <sztsian@gmail.com>
+Date: Tue, 12 Jul 2022 20:46:56 +0800
+Subject: [PATCH] FindGLIB.cmake: Use gdesktopappinfo.h to find gio-unix-2.0
+Applied-Upstream: https://github.com/lxqt/lxqt-build-tools/pull/79
+
+In glib2 2.73.1 gunixfdlist have been moved into glib-2.0
+
+<mock-chroot> sh-5.1# rpm -ql glib2-devel | grep gio/gunixfdlist.h
+/usr/include/glib-2.0/gio/gunixfdlist.h
+<mock-chroot> sh-5.1# rpm -q glib2-devel
+glib2-devel-2.73.1-2.fc37.x86_64
+
+So using gdesktopappinfo.h for gio-unix-2.0.
+
+Fixes: https://github.com/lxqt/lxqt-build-tools/issues/78
+
+Signed-off-by: Zamir SUN <sztsian@gmail.com>
+---
+ cmake/find-modules/FindGLIB.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/find-modules/FindGLIB.cmake b/cmake/find-modules/FindGLIB.cmake
+index bb2336a..c6a06f7 100644
+--- a/cmake/find-modules/FindGLIB.cmake
++++ b/cmake/find-modules/FindGLIB.cmake
+@@ -101,7 +101,7 @@ foreach (_component ${GLIB_FIND_COMPONENTS})
+     elseif (${_component} STREQUAL "gio-unix")
+         pkg_check_modules(GIO_UNIX gio-unix-2.0)
+         find_path(GLIB_GIO_UNIX_INCLUDE_DIR
+-                  NAMES gio/gunixfdlist.h
++                  NAMES gio/gdesktopappinfo.h
+                   HINTS ${GIO_UNIX_INCLUDEDIR}
+                   PATH_SUFFIXES gio-unix-2.0)
+