diff --git a/debian/changelog b/debian/changelog index 011a195..c912ade 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +lxqt-build-tools (0.11.0-1) unstable; urgency=medium + + * Team Upload + + [ Debian Janitor ] + * 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 (魏銘廷) Sat, 17 Sep 2022 21:17:34 +0800 + lxqt-build-tools (0.11.0-0.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/control b/debian/control index 7f4b477..923c492 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: debhelper-compat (= 13), libglib2.0-dev, pkg-config, qtbase5-dev -Standards-Version: 4.6.0 +Standards-Version: 4.6.1 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 +20,7 @@ Architecture: all Depends: ${misc:Depends}, binutils, cmake, - libglib2.0-dev (>= 2.5.0), + libglib2.0-dev (>= 2.73.1), pkg-config, qttools5-dev, qttools5-dev-tools diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e991b22 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +use-gdesktopappinfo-h-to-find-gio-unix-2-0.patch diff --git a/debian/patches/use-gdesktopappinfo-h-to-find-gio-unix-2-0.patch b/debian/patches/use-gdesktopappinfo-h-to-find-gio-unix-2-0.patch new file mode 100644 index 0000000..157cb51 --- /dev/null +++ b/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 +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 + + sh-5.1# rpm -ql glib2-devel | grep gio/gunixfdlist.h +/usr/include/glib-2.0/gio/gunixfdlist.h + 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 +--- + 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) + diff --git a/debian/rules b/debian/rules index 2dee036..d6212aa 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,6 @@ # 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 %: diff --git a/debian/upstream/metadata b/debian/upstream/metadata index 68b5046..9d4788e 100644 --- a/debian/upstream/metadata +++ b/debian/upstream/metadata @@ -1,7 +1,6 @@ -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 -Repository-Browser: https://github.com/lxqt/lxqt-build-tools +Repository: https://github.com/lxqt/lxqt-build-tools.git +Repository-Browse: https://github.com/lxqt/lxqt-build-tools