Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add support for dtk6 #2

Merged
merged 1 commit into from
Oct 27, 2023
Merged

feat: add support for dtk6 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
qt6integration (6.0.0) unstable; urgency=medium

* Release 6.0.0

-- Deepin Packages Builder <[email protected]> Fri, 27 Oct 2023 10:14:27 +0800

qt5integration (5.6.17) unstable; urgency=medium

* release 5.6.17
Expand Down
1 change: 0 additions & 1 deletion debian/compat
View file
Open in desktop

This file was deleted.

26 changes: 11 additions & 15 deletions debian/control
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,29 @@
Source: qt5integration
Source: qt6integration
Section: devel
Priority: optional
Maintainer: Deepin Packages Builder <[email protected]>
Build-Depends:
debhelper (>=9),
debhelper-compat (= 12),
cmake,
qtbase5-dev,
qtbase5-private-dev,
libqt5xdg-dev,
libdtkgui-dev (>=5.6.13),
libdtkwidget-dev,
qt6-base-dev,
qt6-base-private-dev,
libdtk6widget-dev,
libdtkcommon-dev,
pkg-config,
libqt5x11extras5-dev,
libfontconfig1-dev,
libfreetype-dev,
libglib2.0-dev,
libqt5svg5-dev,
libqt5xdgiconloader-dev,
qt6-svg-dev,
libmtdev-dev,
libegl1-mesa-dev,
libxrender-dev,
libgtest-dev,
libgmock-dev
Standards-Version: 3.9.8

Package: dde-qt5integration
Package: dde-qt6integration
Architecture: any
Provides: libqt5deepintheme-plugin
Conflicts: libqt5deepintheme-plugin
Depends: ${shlibs:Depends}, ${misc:Depends}, dde-qt5xcb-plugin
Provides: libqt6deepintheme-plugin
Depends: ${shlibs:Depends}, ${misc:Depends}, dde-qt6xcb-plugin
Description: Qt platform theme integration plugins for DDE
Multiple Qt plugins to provide better Qt5 integration for DDE is included.
Multiple Qt plugins to provide better Qt6 integration for DDE is included.
4 changes: 2 additions & 2 deletions debian/copyright
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: qt5integration
Source: https://github.com/linuxdeepin/qt5integration
Upstream-Name: qt6integration
Source: https://github.com/linuxdeepin/qt6integration

Files: *
Copyright: 2017 Deepin.Inc <[email protected]>
Expand Down
18 changes: 18 additions & 0 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,25 @@
#!/usr/bin/make -f
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/default.mk

DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)

DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)

VERSION = $(DEB_VERSION_UPSTREAM)
_PACK_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$1}')
_BUILD_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$2}' | sed 's/[^0-9]//g' | awk '{print int($$1)}')
ifeq ($(_BUILD_VER),)
CONFIG_VERSION = $(_PACK_VER)
else
CONFIG_VERSION = $(_PACK_VER).$(_BUILD_VER)
endif

%:
dh $@

override_dh_auto_configure:
dh_auto_configure -- -DDTK_VERSION=$(_PACK_VER)

override_dh_shlibdeps:
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
Loading