From 70cf4ae270a017766d5781c6819e61d6bb20b6f2 Mon Sep 17 00:00:00 2001 From: Tianyu Chen Date: Thu, 21 Aug 2025 17:39:51 +0800 Subject: [PATCH 1/5] packaging: merge packaging - Update debian/changelog to 0.0.16 - Split Qt5/Qt6 library packages: libgio-qt0 & libgio-qt6-0 - Replace deprecated debian/compat with debhelper-compat (= 13) - Refresh d/control and d/rules - Drop obsolete .qch documentation installation https://github.com/deepin-community/gio-qt/pull/2 - Add proper Multi-Arch, copyright and docs handling --- CMakeLists.txt | 4 +- debian/changelog | 88 ++++++++++++++++++++++++++++++++++++ debian/compat | 1 - debian/control | 76 +++++++++++++++++++++++-------- debian/copyright | 4 ++ debian/libgio-qt-dev.docs | 2 + debian/libgio-qt-dev.install | 5 +- debian/libgio-qt-doc.install | 1 - debian/libgio-qt.install | 1 - debian/libgio-qt0.install | 1 + debian/libgio-qt6-0.install | 1 + debian/rules | 12 +++-- 12 files changed, 166 insertions(+), 30 deletions(-) delete mode 100644 debian/compat create mode 100644 debian/libgio-qt-dev.docs delete mode 100644 debian/libgio-qt-doc.install delete mode 100644 debian/libgio-qt.install create mode 100644 debian/libgio-qt0.install create mode 100644 debian/libgio-qt6-0.install diff --git a/CMakeLists.txt b/CMakeLists.txt index b41a69d..b7568d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ if (BUILD_DOCS) set (DOXYGEN_EXCLUDE_SYMBOLS "*Private;*Test") set (DOXYGEN_QHG_LOCATION "qhelpgenerator") set (DOXYGEN_QHP_NAMESPACE "org.deepin.gio-qt") - set (DOXYGEN_QCH_FILE "../gio-qt.qch") + #set (DOXYGEN_QCH_FILE "../gio-qt.qch") set (DOXYGEN_QHP_VIRTUAL_FOLDER "gio-qt") doxygen_add_docs(doxygen @@ -62,7 +62,7 @@ if (BUILD_DOCS) COMMENT "Generate documentation via Doxygen" ) - install (FILES ${CMAKE_CURRENT_BINARY_DIR}/docs/gio-qt.qch DESTINATION share/qt5/doc) + #install (FILES ${CMAKE_CURRENT_BINARY_DIR}/docs/gio-qt.qch DESTINATION share/qt5/doc) else () message (STATUS "") message (STATUS "To build docs, please use -DBUILD_DOCS=Yes") diff --git a/debian/changelog b/debian/changelog index 3e352ee..b4c2329 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,38 @@ +gio-qt (0.0.16) UNRELEASED; urgency=medium + + * Merge packaging. + + -- Tianyu Chen Thu, 21 Aug 2025 17:11:35 +0800 + +gio-qt (0.0.15-2deepin1) unstable; urgency=medium + + * update changelog. + + -- lichenggang Mon, 24 Mar 2025 17:28:15 +0800 + +gio-qt (0.0.14-2deepin1) unstable; urgency=medium + + * remove dch file + + -- Liu zheng Sat, 08 Feb 2025 14:42:35 +0800 + +gio-qt (0.0.14-2) unstable; urgency=medium + + * Source-only upload. + * debian/control: Bump Standards-Version to 4.7.0. + + -- Boyuan Yang Thu, 11 Jul 2024 07:32:11 -0400 + +gio-qt (0.0.14-1) unstable; urgency=medium + + * New upstream release. + + Add support for both Qt5 and Qt6. + * debian/control: Split Qt5 and Qt6 library packages: + Use libgio-qt0 for Qt5 and libgio-qt6-0 for Qt6. + * debian/copyright: Update information. + + -- Boyuan Yang Wed, 10 Jul 2024 22:13:39 -0400 + gio-qt (0.0.14) unstable; urgency=medium * fix: crash when calling DGioSettings::setValue @@ -10,12 +45,65 @@ gio-qt (0.0.13) unstable; urgency=medium -- ut003880 Tue, 4 Jun 2024 17:15:29 +0800 +gio-qt (0.0.12-1) unstable; urgency=medium + + * Upload to unstable. + + -- Boyuan Yang Tue, 20 Jun 2023 14:20:48 -0400 + +gio-qt (0.0.12-1~exp1) experimental; urgency=medium + + [ Debian Janitor ] + * Remove constraints unnecessary since buster: + + Build-Depends: Drop versioned constraint on cmake. + + [ Boyuan Yang ] + * New upstream release. + * debian/copyright: Update accordingly. + * debian/control: Make libgio-qt0 conflicts with libgio-qt to + avoid file conflict with upstream-packaged deb packages. + + -- Boyuan Yang Tue, 04 Apr 2023 16:31:10 -0400 + gio-qt (0.0.12) unstable; urgency=medium * update changelog. -- LiChengGang Wed, 29 Mar 2023 14:10:29 +0800 +gio-qt (0.0.11-1) unstable; urgency=medium + + * New upstream release. + * Upload to unstable. + + -- Boyuan Yang Sun, 15 Aug 2021 23:02:29 -0400 + +gio-qt (0.0.10-1~exp1) experimental; urgency=medium + + * New upstream release. + + Switch from GPL-3+ to LGPL-3+. + * debian/copyright: Update accordingly. + + -- Boyuan Yang Sat, 03 Apr 2021 10:20:13 -0400 + +gio-qt (0.0.9-1) unstable; urgency=medium + + * Upload to unstable. + * debian/control: + + Bump Standards-Version to 4.5.1. + * debian/rules: + + Minor cleanup and ensure proper build. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + + -- Arun Kumar Pariyar Sun, 27 Dec 2020 18:01:35 +0545 + +gio-qt (0.0.9-1~exp1) experimental; urgency=medium + + * Initial release. + + -- Arun Kumar Pariyar Wed, 24 Jun 2020 10:10:02 +0545 + gio-qt (0.0.1) unstable; urgency=medium * Initial release diff --git a/debian/compat b/debian/compat deleted file mode 100644 index b4de394..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -11 diff --git a/debian/control b/debian/control index 9dbc619..0064f9e 100644 --- a/debian/control +++ b/debian/control @@ -3,36 +3,72 @@ Section: libs Priority: optional Maintainer: Gary Wang Build-Depends: - debhelper (>= 11), cmake, - pkg-config, + debhelper-compat (= 13), + doxygen, + libglibmm-2.4-dev, + pkgconf, qtbase5-dev, qttools5-dev-tools, qt6-base-dev, qt6-tools-dev-tools, - libglibmm-2.4-dev, - doxygen -Standards-Version: 3.9.8 +Rules-Requires-Root: no +Standards-Version: 4.7.0 Homepage: https://github.com/linuxdeepin/gio-qt -Package: libgio-qt -Architecture: any -Conflicts: libgio-qt0 -Replaces: libgio-qt0 -Depends: ${shlibs:Depends}, ${misc:Depends}, libglibmm-2.4-1v5 -Description: Gio wrapper for Qt. - A convenient way to bind gio with either Qt5 or Qt6. - Package: libgio-qt-dev Architecture: any Section: libdevel -Depends: libgio-qt, ${misc:Depends}, libglibmm-2.4-dev -Description: Development package for libgio-qt. - A convenient way to bind gio with either Qt5 or Qt6. +Depends: + libgio-qt0 (= ${binary:Version}), + libgio-qt6-0 (= ${binary:Version}), + libglibmm-2.4-dev, + ${misc:Depends}, +Multi-Arch: same +Description: Gio wrapper for Qt (development files) + Gio-qt provides Gio wrapper for Qt. + . + This package provides the library development files. + . + This package is part of DDE (Deepin Desktop Environment). Package: libgio-qt-doc -Architecture: any Section: doc -Depends: ${misc:Depends} -Description: Gio wrapper for Qt (documentation) - A convenient way to bind gio with either Qt5 or Qt6. +Architecture: all +Multi-Arch: foreign +Depends: + ${misc:Depends}, +Description: Gio wrapper for Qt (documentation files) + Gio-qt provides Gio wrapper for Qt. + . + This package provides the library documentation files. + . + This package is part of DDE (Deepin Desktop Environment). + +Package: libgio-qt0 +Architecture: any +Multi-Arch: same +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Conflicts: libgio-qt +Description: Gio wrapper for Qt (Qt5 library) + Gio-qt provides Gio wrapper for Qt. + . + This package provides the libgio-qt library files for Qt5. + . + This package is part of DDE (Deepin Desktop Environment). + +Package: libgio-qt6-0 +Architecture: any +Multi-Arch: same +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Conflicts: libgio-qt +Description: Gio wrapper for Qt (Qt6 library) + Gio-qt provides Gio wrapper for Qt. + . + This package provides the libgio-qt library files for Qt6. + . + This package is part of DDE (Deepin Desktop Environment). diff --git a/debian/copyright b/debian/copyright index c6e2f4b..8dbb97f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,6 +6,10 @@ Files: * Copyright: 2019-2019 Deepin Technology Co., Ltd. License: LGPL-3+ +Files: debian/* +Copyright: 2020 Arun Kumar Pariyar +License: Expat + License: LGPL-3+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/debian/libgio-qt-dev.docs b/debian/libgio-qt-dev.docs new file mode 100644 index 0000000..e4fe902 --- /dev/null +++ b/debian/libgio-qt-dev.docs @@ -0,0 +1,2 @@ +README.md +README.zh_CN.md diff --git a/debian/libgio-qt-dev.install b/debian/libgio-qt-dev.install index 8dd0dcc..1b13d44 100644 --- a/debian/libgio-qt-dev.install +++ b/debian/libgio-qt-dev.install @@ -1,2 +1,3 @@ -/usr/include/* -/usr/lib/*/pkgconfig +usr/include/* +usr/lib/*/*.so +usr/lib/*/pkgconfig diff --git a/debian/libgio-qt-doc.install b/debian/libgio-qt-doc.install deleted file mode 100644 index d1abb55..0000000 --- a/debian/libgio-qt-doc.install +++ /dev/null @@ -1 +0,0 @@ -/usr/share/qt5/doc/*.qch \ No newline at end of file diff --git a/debian/libgio-qt.install b/debian/libgio-qt.install deleted file mode 100644 index e405ec7..0000000 --- a/debian/libgio-qt.install +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/*/*.so* diff --git a/debian/libgio-qt0.install b/debian/libgio-qt0.install new file mode 100644 index 0000000..0ba1363 --- /dev/null +++ b/debian/libgio-qt0.install @@ -0,0 +1 @@ +usr/lib/*/libgio-qt.so.* diff --git a/debian/libgio-qt6-0.install b/debian/libgio-qt6-0.install new file mode 100644 index 0000000..3a01a63 --- /dev/null +++ b/debian/libgio-qt6-0.install @@ -0,0 +1 @@ +usr/lib/*/libgio-qt6.so.* diff --git a/debian/rules b/debian/rules index 9ce0fb8..0f0bc79 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,13 @@ #!/usr/bin/make -f -include /usr/share/dpkg/default.mk +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#export DH_VERBOSE = 1 + +# see FEATURE AREAS in dpkg-buildflags(1) +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -export QT_SELECT = qt5 +# Retrieve version info +include /usr/share/dpkg/default.mk %: - dh $@ --parallel + dh $@ From 24cd056939cee02294bf1cf51b1579957758b2db Mon Sep 17 00:00:00 2001 From: Tianyu Chen Date: Thu, 21 Aug 2025 17:45:13 +0800 Subject: [PATCH 2/5] chore: bump version to 0.0.16 in CMakeLists.txt and archlinux/PKGBUILD Synchronize the hard-coded version strings: - CMakeLists.txt: update PROJECT_VERSION default from 0.0.1 to 0.0.16 - archlinux/PKGBUILD: update pkgver from 0.0.14 to 0.0.16 --- CMakeLists.txt | 2 +- archlinux/PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b7568d4..4640245 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ option(BUILD_DOCS "Build documentation" ON) # Version if (NOT PROJECT_VERSION) - set(PROJECT_VERSION "0.0.1") + set(PROJECT_VERSION "0.0.16") endif() if (NOT PROJECT_VERSION_MAJOR) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 231f56d..cc6c05b 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Dingyuan Zhang pkgname=gio-qt-git -pkgver=0.0.14 +pkgver=0.0.16 pkgrel=1 pkgdesc='Gio wrapper for Qt applications' arch=('x86_64') From 6df798a68fed31812be13a007d1d311019f1f2d4 Mon Sep 17 00:00:00 2001 From: Tianyu Chen Date: Thu, 21 Aug 2025 17:45:46 +0800 Subject: [PATCH 3/5] fix: declare Breaks/Replaces against libgio-qt <= 0.0.14 Added Breaks and Replaces relations against the legacy libgio-qt binary packages (version 0.0.14 and earlier) to all three binary packages (libgio-qt-dev, libgio-qt5-0, libgio-qt6-0). --- debian/control | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/debian/control b/debian/control index 0064f9e..bf3a3dc 100644 --- a/debian/control +++ b/debian/control @@ -24,6 +24,10 @@ Depends: libgio-qt6-0 (= ${binary:Version}), libglibmm-2.4-dev, ${misc:Depends}, +Breaks: + libgio-qt (<= 0.0.14), +Replaces: + libgio-qt (<= 0.0.14), Multi-Arch: same Description: Gio wrapper for Qt (development files) Gio-qt provides Gio wrapper for Qt. @@ -51,6 +55,10 @@ Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends}, +Breaks: + libgio-qt (<= 0.0.14), +Replaces: + libgio-qt (<= 0.0.14), Conflicts: libgio-qt Description: Gio wrapper for Qt (Qt5 library) Gio-qt provides Gio wrapper for Qt. @@ -65,6 +73,10 @@ Multi-Arch: same Depends: ${misc:Depends}, ${shlibs:Depends}, +Breaks: + libgio-qt (<= 0.0.14), +Replaces: + libgio-qt (<= 0.0.14), Conflicts: libgio-qt Description: Gio wrapper for Qt (Qt6 library) Gio-qt provides Gio wrapper for Qt. From 703482b989225d64a37186b62ae0d6a1dc1928bc Mon Sep 17 00:00:00 2001 From: Tianyu Chen Date: Thu, 21 Aug 2025 17:55:13 +0800 Subject: [PATCH 4/5] chore: Drop libgio-qt-doc package Remove the libgio-qt-doc binary package from the build. It's already an empty package. --- debian/control | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/debian/control b/debian/control index bf3a3dc..8b69835 100644 --- a/debian/control +++ b/debian/control @@ -36,19 +36,6 @@ Description: Gio wrapper for Qt (development files) . This package is part of DDE (Deepin Desktop Environment). -Package: libgio-qt-doc -Section: doc -Architecture: all -Multi-Arch: foreign -Depends: - ${misc:Depends}, -Description: Gio wrapper for Qt (documentation files) - Gio-qt provides Gio wrapper for Qt. - . - This package provides the library documentation files. - . - This package is part of DDE (Deepin Desktop Environment). - Package: libgio-qt0 Architecture: any Multi-Arch: same From fd96df5950b2727e91a9e1d8eea69877291f8a48 Mon Sep 17 00:00:00 2001 From: Tianyu Chen Date: Thu, 21 Aug 2025 17:46:41 +0800 Subject: [PATCH 5/5] chore: Release version 0.0.16 to unstable Update changelog --- debian/changelog | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b4c2329..d078587 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ -gio-qt (0.0.16) UNRELEASED; urgency=medium +gio-qt (0.0.16) unstable; urgency=medium * Merge packaging. + * Bump version to 0.0.16 in archlinux/PKGBUILD and CMakeLists.txt. + * Declare Breaks and Replaces against libgio-qt (<= 0.0.14). - -- Tianyu Chen Thu, 21 Aug 2025 17:11:35 +0800 + -- Tianyu Chen Thu, 21 Aug 2025 17:46:22 +0800 gio-qt (0.0.15-2deepin1) unstable; urgency=medium