From 9c14e9ced13cf997ec918c9a8b9a9cee26314f73 Mon Sep 17 00:00:00 2001 From: Yixue Wang Date: Mon, 1 Apr 2024 17:35:46 +0800 Subject: [PATCH 1/6] feat: initialize branch for dtk6 Initialize branch for DTK 6.x. --- .gitmodules | 40 ++++++++++++++++++---------------------- dtk6core | 1 + dtk6declarative | 1 + dtk6gui | 1 + dtk6widget | 1 + dtkcommon | 1 - dtkcore | 1 - dtkdeclarative | 1 - dtkgui | 1 - dtkwidget | 1 - qt5integration | 1 - qt5platform-plugins | 1 - qt6integration | 1 + qt6platform-plugins | 1 + 14 files changed, 24 insertions(+), 29 deletions(-) create mode 160000 dtk6core create mode 160000 dtk6declarative create mode 160000 dtk6gui create mode 160000 dtk6widget delete mode 160000 dtkcommon delete mode 160000 dtkcore delete mode 160000 dtkdeclarative delete mode 160000 dtkgui delete mode 160000 dtkwidget delete mode 160000 qt5integration delete mode 160000 qt5platform-plugins create mode 160000 qt6integration create mode 160000 qt6platform-plugins diff --git a/.gitmodules b/.gitmodules index 96cc37e..d84919a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,28 +1,24 @@ -[submodule "dtkcommon"] - path = dtkcommon - url = https://github.com/linuxdeepin/dtkcommon +[submodule "dtk6core"] + path = dtk6core + url = https://github.com/linuxdeepin/dtk6core branch = master -[submodule "dtkcore"] - path = dtkcore - url = https://github.com/linuxdeepin/dtkcore +[submodule "dtk6gui"] + path = dtk6gui + url = https://github.com/linuxdeepin/dtk6gui branch = master -[submodule "dtkgui"] - path = dtkgui - url = https://github.com/linuxdeepin/dtkgui +[submodule "dtk6widget"] + path = dtk6widget + url = https://github.com/linuxdeepin/dtk6widget branch = master -[submodule "dtkwidget"] - path = dtkwidget - url = https://github.com/linuxdeepin/dtkwidget +[submodule "dtk6declarative"] + path = dtk6declarative + url = https://github.com/linuxdeepin/dtk6declarative branch = master -[submodule "dtkdeclarative"] - path = dtkdeclarative - url = https://github.com/linuxdeepin/dtkdeclarative +[submodule "qt6integration"] + path = qt6integration + url = https://github.com/linuxdeepin/qt6integration branch = master -[submodule "qt5integration"] - path = qt5integration - url = https://github.com/linuxdeepin/qt5integration - branch = master -[submodule "qt5platform-plugins"] - path = qt5platform-plugins - url = https://github.com/linuxdeepin/qt5platform-plugins +[submodule "qt6platform-plugins"] + path = qt6platform-plugins + url = https://github.com/linuxdeepin/qt6platform-plugins branch = master diff --git a/dtk6core b/dtk6core new file mode 160000 index 0000000..c712656 --- /dev/null +++ b/dtk6core @@ -0,0 +1 @@ +Subproject commit c712656527b76cf96eda008746a451637b79283d diff --git a/dtk6declarative b/dtk6declarative new file mode 160000 index 0000000..b5034f1 --- /dev/null +++ b/dtk6declarative @@ -0,0 +1 @@ +Subproject commit b5034f1e394bef6234bb987d6b318ce20db86aa3 diff --git a/dtk6gui b/dtk6gui new file mode 160000 index 0000000..81fbbaa --- /dev/null +++ b/dtk6gui @@ -0,0 +1 @@ +Subproject commit 81fbbaa1589b76191237542738707d7c4241e619 diff --git a/dtk6widget b/dtk6widget new file mode 160000 index 0000000..c1420ba --- /dev/null +++ b/dtk6widget @@ -0,0 +1 @@ +Subproject commit c1420baf1187f1215b010e5f8e833f9aef606dbd diff --git a/dtkcommon b/dtkcommon deleted file mode 160000 index 30efe14..0000000 --- a/dtkcommon +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 30efe141010ca360cc95bc080af829de7b833594 diff --git a/dtkcore b/dtkcore deleted file mode 160000 index 391320d..0000000 --- a/dtkcore +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 391320dd81869f568708fd9d77dcbb33651548d5 diff --git a/dtkdeclarative b/dtkdeclarative deleted file mode 160000 index 9fa5007..0000000 --- a/dtkdeclarative +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9fa500780dd8210055c33484f0d8ea9fc32d4758 diff --git a/dtkgui b/dtkgui deleted file mode 160000 index 1aa57f8..0000000 --- a/dtkgui +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1aa57f8b4eb9c865f22ba86eebe858d30d8af96c diff --git a/dtkwidget b/dtkwidget deleted file mode 160000 index 03bf76a..0000000 --- a/dtkwidget +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 03bf76a0745efe5265ca422d142b52cb2835da90 diff --git a/qt5integration b/qt5integration deleted file mode 160000 index 95aafcf..0000000 --- a/qt5integration +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 95aafcf5a42c2f4651eb068bdf9063de3e913e1c diff --git a/qt5platform-plugins b/qt5platform-plugins deleted file mode 160000 index dffd0ba..0000000 --- a/qt5platform-plugins +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dffd0bae14d143065713f17498fd63e4fc93d24d diff --git a/qt6integration b/qt6integration new file mode 160000 index 0000000..287e168 --- /dev/null +++ b/qt6integration @@ -0,0 +1 @@ +Subproject commit 287e168f5a06ad90f4f6170083a9ca69bbb60bee diff --git a/qt6platform-plugins b/qt6platform-plugins new file mode 160000 index 0000000..4412680 --- /dev/null +++ b/qt6platform-plugins @@ -0,0 +1 @@ +Subproject commit 4412680f52b105616ef3df71017a400648cc3d03 From 153b0a1d6b8e41d220f93f80fb6901625dfa200b Mon Sep 17 00:00:00 2001 From: zhangkun Date: Mon, 24 Jun 2024 13:28:54 +0800 Subject: [PATCH 2/6] chore: bump version to 6.0.17 release 6.0.17 Log: bump version to 6.0.17 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index b7d3350..70998ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dtk (6.0.17) unstable; urgency=medium + + * release 6.0.17 + + -- Zhang kun Mon, 24 Jun 2024 13:26:23 +0800 + dtk (5.6.26) unstable; urgency=medium * release 5.6.26 From a8a3a938fa2d73793904d595732d9495b354c1b2 Mon Sep 17 00:00:00 2001 From: ck Date: Mon, 8 Jul 2024 10:35:18 +0800 Subject: [PATCH 3/6] chore: bump version to 6.0.18 release 6.0.18 Log: bump version to 6.0.18 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 70998ec..1a2af5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dtk (6.0.18) unstable; urgency=medium + + * release 6.0.18 + + -- Mike Chen Mon, 08 Jul 2024 10:35:18 +0800 + dtk (6.0.17) unstable; urgency=medium * release 6.0.17 From eb11f7c0258f93adfb2307768b6bd4bee2de442e Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Wed, 21 Aug 2024 09:28:49 +0000 Subject: [PATCH 4/6] chore: update submodules Update submodules to version 6.0.19. --- dtk6core | 2 +- dtk6declarative | 2 +- dtk6gui | 2 +- dtk6widget | 2 +- qt6integration | 2 +- qt6platform-plugins | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dtk6core b/dtk6core index c712656..0e222e6 160000 --- a/dtk6core +++ b/dtk6core @@ -1 +1 @@ -Subproject commit c712656527b76cf96eda008746a451637b79283d +Subproject commit 0e222e676fe8eba60173f88c02bfd2de6c65ad64 diff --git a/dtk6declarative b/dtk6declarative index b5034f1..67adc18 160000 --- a/dtk6declarative +++ b/dtk6declarative @@ -1 +1 @@ -Subproject commit b5034f1e394bef6234bb987d6b318ce20db86aa3 +Subproject commit 67adc18a283066a7cc3614b6e42d799fcb4e9dee diff --git a/dtk6gui b/dtk6gui index 81fbbaa..d73c310 160000 --- a/dtk6gui +++ b/dtk6gui @@ -1 +1 @@ -Subproject commit 81fbbaa1589b76191237542738707d7c4241e619 +Subproject commit d73c310094b91594354f6c7a9d41c71340e20e70 diff --git a/dtk6widget b/dtk6widget index c1420ba..f18b453 160000 --- a/dtk6widget +++ b/dtk6widget @@ -1 +1 @@ -Subproject commit c1420baf1187f1215b010e5f8e833f9aef606dbd +Subproject commit f18b453a24cb767b3e002b1f5819b338cca8165f diff --git a/qt6integration b/qt6integration index 287e168..79ba7b0 160000 --- a/qt6integration +++ b/qt6integration @@ -1 +1 @@ -Subproject commit 287e168f5a06ad90f4f6170083a9ca69bbb60bee +Subproject commit 79ba7b03974cea44318aefa4279c3cfd6a33f89e diff --git a/qt6platform-plugins b/qt6platform-plugins index 4412680..1d2dbd7 160000 --- a/qt6platform-plugins +++ b/qt6platform-plugins @@ -1 +1 @@ -Subproject commit 4412680f52b105616ef3df71017a400648cc3d03 +Subproject commit 1d2dbd78649498b856e8968522d88f15c91b2d2f From cf0caad1ef657ef3a4ffb2223153b6c06979c309 Mon Sep 17 00:00:00 2001 From: zhangkun Date: Tue, 20 Aug 2024 13:15:53 +0800 Subject: [PATCH 5/6] chore: bump version to 6.0.19 release 6.0.19 Log: bump version to 6.0.19 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1a2af5e..db67900 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dtk (6.0.19) unstable; urgency=medium + + * release 6.0.19 + + -- Zhang Kun Tue, 20 Aug 2024 13:15:20 +0800 + dtk (6.0.18) unstable; urgency=medium * release 6.0.18 From 7294eaa9f6c86dd664a6201cf86d537e92dcae54 Mon Sep 17 00:00:00 2001 From: Ye ShanShan Date: Thu, 2 Jan 2025 13:54:27 +0800 Subject: [PATCH 6/6] chore: bump version to 6.0.26 changelog. --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index db67900..414720d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dtk (6.0.26) unstable; urgency=medium + + * release 6.0.26 + + -- YeShanShan Thu, 02 Jan 2025 13:53:37 +0800 + dtk (6.0.19) unstable; urgency=medium * release 6.0.19