Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个是为啥去掉的

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

不知道,我 as-is 照搬的
deepin-community/gio-qt#2

Copy link
Member Author

@UTsweetyfish UTsweetyfish Aug 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

可以留着?要留着吗?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个和下面那个应该是出qch文档(-doc包)用的,现在我看-doc包已经去掉了,相当于不会生成文档。。

set (DOXYGEN_QHP_VIRTUAL_FOLDER "gio-qt")

doxygen_add_docs(doxygen
Expand All @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion archlinux/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Maintainer: Dingyuan Zhang <lxz@mkacg.com>

pkgname=gio-qt-git
pkgver=0.0.14
pkgver=0.0.16
pkgrel=1
pkgdesc='Gio wrapper for Qt applications'
arch=('x86_64')
Expand Down
90 changes: 90 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,40 @@
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 <sweetyfish@deepin.org> Thu, 21 Aug 2025 17:46:22 +0800

gio-qt (0.0.15-2deepin1) unstable; urgency=medium

* update changelog.

-- lichenggang <lichenggang@deepin.org> Mon, 24 Mar 2025 17:28:15 +0800

gio-qt (0.0.14-2deepin1) unstable; urgency=medium

* remove dch file

-- Liu zheng <liuzheng@uniontech.com> 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 <byang@debian.org> 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 <byang@debian.org> Wed, 10 Jul 2024 22:13:39 -0400

gio-qt (0.0.14) unstable; urgency=medium

* fix: crash when calling DGioSettings::setValue
Expand All @@ -10,12 +47,65 @@ gio-qt (0.0.13) unstable; urgency=medium

-- ut003880 <zhangtianyi@uniontech.com> Tue, 4 Jun 2024 17:15:29 +0800

gio-qt (0.0.12-1) unstable; urgency=medium

* Upload to unstable.

-- Boyuan Yang <byang@debian.org> 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 <byang@debian.org> Tue, 04 Apr 2023 16:31:10 -0400

gio-qt (0.0.12) unstable; urgency=medium

* update changelog.

-- LiChengGang <lichenggang@uniontech.com> 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 <byang@debian.org> 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 <byang@debian.org> 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 <openarungeek@gmail.com> Sun, 27 Dec 2020 18:01:35 +0545

gio-qt (0.0.9-1~exp1) experimental; urgency=medium

* Initial release.

-- Arun Kumar Pariyar <openarungeek@gmail.com> Wed, 24 Jun 2020 10:10:02 +0545

gio-qt (0.0.1) unstable; urgency=medium

* Initial release
Expand Down
1 change: 0 additions & 1 deletion debian/compat

This file was deleted.

77 changes: 56 additions & 21 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,71 @@ Section: libs
Priority: optional
Maintainer: Gary Wang <wzc782970009@gmail.com>
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},
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.
.
This package provides the library development files.
.
This package is part of DDE (Deepin Desktop Environment).

Package: libgio-qt0
Architecture: any
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.
.
This package provides the libgio-qt library files for Qt5.
.
This package is part of DDE (Deepin Desktop Environment).

Package: libgio-qt-doc
Package: libgio-qt6-0
Architecture: any
Section: doc
Depends: ${misc:Depends}
Description: Gio wrapper for Qt (documentation)
A convenient way to bind gio with either Qt5 or Qt6.
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.
.
This package provides the libgio-qt library files for Qt6.
.
This package is part of DDE (Deepin Desktop Environment).
4 changes: 4 additions & 0 deletions debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ Files: *
Copyright: 2019-2019 Deepin Technology Co., Ltd.
License: LGPL-3+

Files: debian/*
Copyright: 2020 Arun Kumar Pariyar <openarungeek@gmail.com>
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
Expand Down
2 changes: 2 additions & 0 deletions debian/libgio-qt-dev.docs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
README.md
README.zh_CN.md
5 changes: 3 additions & 2 deletions debian/libgio-qt-dev.install
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
/usr/include/*
/usr/lib/*/pkgconfig
usr/include/*
usr/lib/*/*.so
usr/lib/*/pkgconfig
1 change: 0 additions & 1 deletion debian/libgio-qt-doc.install

This file was deleted.

1 change: 0 additions & 1 deletion debian/libgio-qt.install

This file was deleted.

1 change: 1 addition & 0 deletions debian/libgio-qt0.install
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/lib/*/libgio-qt.so.*
1 change: 1 addition & 0 deletions debian/libgio-qt6-0.install
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
usr/lib/*/libgio-qt6.so.*
12 changes: 9 additions & 3 deletions debian/rules
Original file line number Diff line number Diff line change
@@ -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 $@
Loading