debian/changelog

@@ -1,29 +1,8 @@
-lxqt-build-tools (0.11.0-1) unstable; urgency=medium
+lxqt-build-tools (0.10.0-1ubuntu1) jammy; urgency=medium
 
-  * Team Upload
+  * Add a patch to support GLib ≥ 2.71.1.
 
-  [ Debian Janitor ]
+ -- Dmitry Shachnev <mitya57@ubuntu.com>  Sat, 19 Mar 2022 20:15:43 +0300
-  * Set upstream metadata fields: Repository, Repository-Browse.
-  * Remove obsolete field Name from debian/upstream/metadata (already present in
-    machine-readable debian/copyright).
-  * Avoid explicitly specifying -Wl,--as-needed linker flag.
-
-  [ Yao Wei (魏銘廷) ]
-  * debian/patches: Use gdesktopappinfo.h to find gio-unix-2.0
-  * debian/upstream/metadata: Remove Repository-Browser (typoed entry)
-  * debian/control:
-    - Bump Standards-Version to 4.6.1;  No related changes.
-    - Update version dependency of libglib2.0-dev
-
- -- Yao Wei (魏銘廷) <mwei@debian.org>  Sat, 17 Sep 2022 21:17:34 +0800
-
-lxqt-build-tools (0.11.0-0.1) unstable; urgency=medium
-
-  * Non-maintainer upload.
-  * New upstream release.
-    - Fixes compatibility with GLib ≥ 2.71.1 (closes: #1008416).
-
- -- Dmitry Shachnev <mitya57@debian.org>  Sat, 14 May 2022 16:00:20 +0300
 
 lxqt-build-tools (0.10.0-1) unstable; urgency=medium
 

debian/control

@@ -1,5 +1,6 @@
 Source: lxqt-build-tools
-Maintainer: LXQt Packaging Team <pkg-lxqt-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+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>
@@ -10,7 +11,7 @@ Build-Depends: debhelper-compat (= 13),
                libglib2.0-dev,
                pkg-config,
                qtbase5-dev
-Standards-Version: 4.6.1
+Standards-Version: 4.6.0
 Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-build-tools
 Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-build-tools.git
 Homepage: https://github.com/lxqt/lxqt-build-tools
@@ -20,7 +21,7 @@ Architecture: all
 Depends: ${misc:Depends},
          binutils,
          cmake,
-         libglib2.0-dev (>= 2.73.1),
+         libglib2.0-dev (>= 2.5.0),
          pkg-config,
          qttools5-dev,
          qttools5-dev-tools

debian/patches/gio-unix-include-dir.patch

@@ -0,0 +1,25 @@
+From: Dmitry Shachnev <mitya57@debian.org>
+Date: Sat, 19 Mar 2022 20:01:20 +0300
+Subject: Replace gunixconnection.h file in gio-unix include dir check
+
+That file was moved from gio-unix to gio in GLib 2.71.1:
+https://gitlab.gnome.org/GNOME/glib/-/commit/83d45c4f35dc87ba
+
+Forwarded: https://github.com/lxqt/lxqt-build-tools/pull/74
+---
+ 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 0564b8d..bb2336a 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/gunixconnection.h
++                  NAMES gio/gunixfdlist.h
+                   HINTS ${GIO_UNIX_INCLUDEDIR}
+                   PATH_SUFFIXES gio-unix-2.0)
+ 

debian/patches/series

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

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

@@ -1,35 +0,0 @@
-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)
- 

debian/rules

@@ -2,6 +2,7 @@
 # export DH_VERBOSE=1
 
 export LC_ALL=C.UTF-8
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:

debian/upstream/metadata

@@ -1,6 +1,7 @@
+Name: lxqt-build-tools
 Bug-Database: https://github.com/lxqt/lxqt-build-tools/issues
 Bug-Submit: https://github.com/lxqt/lxqt-build-tools/issues/new
 Changelog: https://github.com/lxqt/lxqt-build-tools/blob/master/CHANGELOG
-Repository: https://github.com/lxqt/lxqt-build-tools.git
+Repository: https://github.com/lxqt/lxqt-build-tools
-Repository-Browse: https://github.com/lxqt/lxqt-build-tools
+Repository-Browser: https://github.com/lxqt/lxqt-build-tools