Skip to content

Commit 9cfb6f4

Browse files
committed
Merge packaging
1 parent be8ad78 commit 9cfb6f4

12 files changed

Lines changed: 166 additions & 30 deletions

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if (BUILD_DOCS)
5252
set (DOXYGEN_EXCLUDE_SYMBOLS "*Private;*Test")
5353
set (DOXYGEN_QHG_LOCATION "qhelpgenerator")
5454
set (DOXYGEN_QHP_NAMESPACE "org.deepin.gio-qt")
55-
set (DOXYGEN_QCH_FILE "../gio-qt.qch")
55+
#set (DOXYGEN_QCH_FILE "../gio-qt.qch")
5656
set (DOXYGEN_QHP_VIRTUAL_FOLDER "gio-qt")
5757

5858
doxygen_add_docs(doxygen
@@ -62,7 +62,7 @@ if (BUILD_DOCS)
6262
COMMENT "Generate documentation via Doxygen"
6363
)
6464

65-
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/docs/gio-qt.qch DESTINATION share/qt5/doc)
65+
#install (FILES ${CMAKE_CURRENT_BINARY_DIR}/docs/gio-qt.qch DESTINATION share/qt5/doc)
6666
else ()
6767
message (STATUS "")
6868
message (STATUS "To build docs, please use -DBUILD_DOCS=Yes")

debian/changelog

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
gio-qt (0.0.16) UNRELEASED; urgency=medium
2+
3+
* Merge packaging.
4+
5+
-- Tianyu Chen <sweetyfish@deepin.org> Thu, 21 Aug 2025 17:11:35 +0800
6+
7+
gio-qt (0.0.15-2deepin1) unstable; urgency=medium
8+
9+
* update changelog.
10+
11+
-- lichenggang <lichenggang@deepin.org> Mon, 24 Mar 2025 17:28:15 +0800
12+
13+
gio-qt (0.0.14-2deepin1) unstable; urgency=medium
14+
15+
* remove dch file
16+
17+
-- Liu zheng <liuzheng@uniontech.com> Sat, 08 Feb 2025 14:42:35 +0800
18+
19+
gio-qt (0.0.14-2) unstable; urgency=medium
20+
21+
* Source-only upload.
22+
* debian/control: Bump Standards-Version to 4.7.0.
23+
24+
-- Boyuan Yang <byang@debian.org> Thu, 11 Jul 2024 07:32:11 -0400
25+
26+
gio-qt (0.0.14-1) unstable; urgency=medium
27+
28+
* New upstream release.
29+
+ Add support for both Qt5 and Qt6.
30+
* debian/control: Split Qt5 and Qt6 library packages:
31+
Use libgio-qt0 for Qt5 and libgio-qt6-0 for Qt6.
32+
* debian/copyright: Update information.
33+
34+
-- Boyuan Yang <byang@debian.org> Wed, 10 Jul 2024 22:13:39 -0400
35+
136
gio-qt (0.0.14) unstable; urgency=medium
237

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

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

48+
gio-qt (0.0.12-1) unstable; urgency=medium
49+
50+
* Upload to unstable.
51+
52+
-- Boyuan Yang <byang@debian.org> Tue, 20 Jun 2023 14:20:48 -0400
53+
54+
gio-qt (0.0.12-1~exp1) experimental; urgency=medium
55+
56+
[ Debian Janitor ]
57+
* Remove constraints unnecessary since buster:
58+
+ Build-Depends: Drop versioned constraint on cmake.
59+
60+
[ Boyuan Yang ]
61+
* New upstream release.
62+
* debian/copyright: Update accordingly.
63+
* debian/control: Make libgio-qt0 conflicts with libgio-qt to
64+
avoid file conflict with upstream-packaged deb packages.
65+
66+
-- Boyuan Yang <byang@debian.org> Tue, 04 Apr 2023 16:31:10 -0400
67+
1368
gio-qt (0.0.12) unstable; urgency=medium
1469

1570
* update changelog.
1671

1772
-- LiChengGang <lichenggang@uniontech.com> Wed, 29 Mar 2023 14:10:29 +0800
1873

74+
gio-qt (0.0.11-1) unstable; urgency=medium
75+
76+
* New upstream release.
77+
* Upload to unstable.
78+
79+
-- Boyuan Yang <byang@debian.org> Sun, 15 Aug 2021 23:02:29 -0400
80+
81+
gio-qt (0.0.10-1~exp1) experimental; urgency=medium
82+
83+
* New upstream release.
84+
+ Switch from GPL-3+ to LGPL-3+.
85+
* debian/copyright: Update accordingly.
86+
87+
-- Boyuan Yang <byang@debian.org> Sat, 03 Apr 2021 10:20:13 -0400
88+
89+
gio-qt (0.0.9-1) unstable; urgency=medium
90+
91+
* Upload to unstable.
92+
* debian/control:
93+
+ Bump Standards-Version to 4.5.1.
94+
* debian/rules:
95+
+ Minor cleanup and ensure proper build.
96+
* Set upstream metadata fields: Bug-Database, Bug-Submit, Repository,
97+
Repository-Browse.
98+
99+
-- Arun Kumar Pariyar <openarungeek@gmail.com> Sun, 27 Dec 2020 18:01:35 +0545
100+
101+
gio-qt (0.0.9-1~exp1) experimental; urgency=medium
102+
103+
* Initial release.
104+
105+
-- Arun Kumar Pariyar <openarungeek@gmail.com> Wed, 24 Jun 2020 10:10:02 +0545
106+
19107
gio-qt (0.0.1) unstable; urgency=medium
20108

21109
* Initial release

debian/compat

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/control

Lines changed: 56 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,72 @@ Section: libs
33
Priority: optional
44
Maintainer: Gary Wang <wzc782970009@gmail.com>
55
Build-Depends:
6-
debhelper (>= 11),
76
cmake,
8-
pkg-config,
7+
debhelper-compat (= 13),
8+
doxygen,
9+
libglibmm-2.4-dev,
10+
pkgconf,
911
qtbase5-dev,
1012
qttools5-dev-tools,
1113
qt6-base-dev,
1214
qt6-tools-dev-tools,
13-
libglibmm-2.4-dev,
14-
doxygen
15-
Standards-Version: 3.9.8
15+
Rules-Requires-Root: no
16+
Standards-Version: 4.7.0
1617
Homepage: https://github.com/linuxdeepin/gio-qt
1718

18-
Package: libgio-qt
19-
Architecture: any
20-
Conflicts: libgio-qt0
21-
Replaces: libgio-qt0
22-
Depends: ${shlibs:Depends}, ${misc:Depends}, libglibmm-2.4-1v5
23-
Description: Gio wrapper for Qt.
24-
A convenient way to bind gio with either Qt5 or Qt6.
25-
2619
Package: libgio-qt-dev
2720
Architecture: any
2821
Section: libdevel
29-
Depends: libgio-qt, ${misc:Depends}, libglibmm-2.4-dev
30-
Description: Development package for libgio-qt.
31-
A convenient way to bind gio with either Qt5 or Qt6.
22+
Depends:
23+
libgio-qt0 (= ${binary:Version}),
24+
libgio-qt6-0 (= ${binary:Version}),
25+
libglibmm-2.4-dev,
26+
${misc:Depends},
27+
Multi-Arch: same
28+
Description: Gio wrapper for Qt (development files)
29+
Gio-qt provides Gio wrapper for Qt.
30+
.
31+
This package provides the library development files.
32+
.
33+
This package is part of DDE (Deepin Desktop Environment).
3234

3335
Package: libgio-qt-doc
34-
Architecture: any
3536
Section: doc
36-
Depends: ${misc:Depends}
37-
Description: Gio wrapper for Qt (documentation)
38-
A convenient way to bind gio with either Qt5 or Qt6.
37+
Architecture: all
38+
Multi-Arch: foreign
39+
Depends:
40+
${misc:Depends},
41+
Description: Gio wrapper for Qt (documentation files)
42+
Gio-qt provides Gio wrapper for Qt.
43+
.
44+
This package provides the library documentation files.
45+
.
46+
This package is part of DDE (Deepin Desktop Environment).
47+
48+
Package: libgio-qt0
49+
Architecture: any
50+
Multi-Arch: same
51+
Depends:
52+
${misc:Depends},
53+
${shlibs:Depends},
54+
Conflicts: libgio-qt
55+
Description: Gio wrapper for Qt (Qt5 library)
56+
Gio-qt provides Gio wrapper for Qt.
57+
.
58+
This package provides the libgio-qt library files for Qt5.
59+
.
60+
This package is part of DDE (Deepin Desktop Environment).
61+
62+
Package: libgio-qt6-0
63+
Architecture: any
64+
Multi-Arch: same
65+
Depends:
66+
${misc:Depends},
67+
${shlibs:Depends},
68+
Conflicts: libgio-qt
69+
Description: Gio wrapper for Qt (Qt6 library)
70+
Gio-qt provides Gio wrapper for Qt.
71+
.
72+
This package provides the libgio-qt library files for Qt6.
73+
.
74+
This package is part of DDE (Deepin Desktop Environment).

debian/copyright

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ Files: *
66
Copyright: 2019-2019 Deepin Technology Co., Ltd.
77
License: LGPL-3+
88

9+
Files: debian/*
10+
Copyright: 2020 Arun Kumar Pariyar <openarungeek@gmail.com>
11+
License: Expat
12+
913
License: LGPL-3+
1014
This package is free software; you can redistribute it and/or modify
1115
it under the terms of the GNU Lesser General Public License as published by

debian/libgio-qt-dev.docs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
README.md
2+
README.zh_CN.md

debian/libgio-qt-dev.install

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
/usr/include/*
2-
/usr/lib/*/pkgconfig
1+
usr/include/*
2+
usr/lib/*/*.so
3+
usr/lib/*/pkgconfig

debian/libgio-qt-doc.install

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/libgio-qt.install

Lines changed: 0 additions & 1 deletion
This file was deleted.

debian/libgio-qt0.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/*/libgio-qt.so.*

0 commit comments

Comments
 (0)