From 848ca31f01f9adf298aa02e41e2488e5c52ea74d Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Wed, 16 Nov 2022 16:46:18 -0600 Subject: [PATCH] Sync with Debian version 0.11.0-0.1. --- debian/changelog | 8 +++++--- debian/control | 3 +-- debian/patches/gio-unix-include-dir.patch | 25 ----------------------- debian/patches/series | 1 - 4 files changed, 6 insertions(+), 31 deletions(-) delete mode 100644 debian/patches/gio-unix-include-dir.patch delete mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 3b7c56c..011a195 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -lxqt-build-tools (0.10.0-1ubuntu1) jammy; urgency=medium +lxqt-build-tools (0.11.0-0.1) unstable; urgency=medium - * Add a patch to support GLib ≥ 2.71.1. + * Non-maintainer upload. + * New upstream release. + - Fixes compatibility with GLib ≥ 2.71.1 (closes: #1008416). - -- Dmitry Shachnev Sat, 19 Mar 2022 20:15:43 +0300 + -- Dmitry Shachnev Sat, 14 May 2022 16:00:20 +0300 lxqt-build-tools (0.10.0-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 871245a..7f4b477 100644 --- a/debian/control +++ b/debian/control @@ -1,6 +1,5 @@ Source: lxqt-build-tools -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: LXQt Packaging Team +Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , Andrew Lee (李健秋) , ChangZhuo Chen (陳昌倬) diff --git a/debian/patches/gio-unix-include-dir.patch b/debian/patches/gio-unix-include-dir.patch deleted file mode 100644 index fce67ab..0000000 --- a/debian/patches/gio-unix-include-dir.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Dmitry Shachnev -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) - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 569dca4..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -gio-unix-include-dir.patch