diff --git a/debian/changelog b/debian/changelog index 5f69fbf..745766a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +qt6integration (6.0.0) unstable; urgency=medium + + * Release 6.0.0 + + -- Deepin Packages Builder Fri, 27 Oct 2023 10:14:27 +0800 + qt5integration (5.6.17) unstable; urgency=medium * release 5.6.17 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index cc3c47b..fb2f6ec 100644 --- a/debian/control +++ b/debian/control @@ -1,22 +1,19 @@ -Source: qt5integration +Source: qt6integration Section: devel Priority: optional Maintainer: Deepin Packages Builder 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, @@ -24,10 +21,9 @@ Build-Depends: 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. diff --git a/debian/copyright b/debian/copyright index 7058102..bc6cdaf 100644 --- a/debian/copyright +++ b/debian/copyright @@ -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 diff --git a/debian/rules b/debian/rules index 83e92ec..918f8f3 100755 --- a/debian/rules +++ b/debian/rules @@ -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