From e14b1f3e41eb9f743b39c9a76bf197a4a46fad9a Mon Sep 17 00:00:00 2001 From: Yixue Wang Date: Thu, 21 Sep 2023 14:48:04 +0800 Subject: [PATCH] feat: add dpkg support for dtk6 Add deb meta control files for dtk6widget. Log: add dpkg support for dtk6 --- debian/changelog | 6 ++ debian/control | 94 +++++++++++-------- debian/copyright | 4 +- ...es.install => dtk6widget-examples.install} | 0 ...-bin.install => libdtk6widget-bin.install} | 0 ...-dev.install => libdtk6widget-dev.install} | 2 +- debian/libdtk6widget-doc.install | 1 + ...kwidget5.install => libdtk6widget.install} | 0 debian/libdtkwidget-doc.install | 1 - debian/libdtkwidget5.install.amd64 | 3 - debian/libdtkwidget5.install.i386 | 3 - debian/rules | 12 +-- 12 files changed, 67 insertions(+), 59 deletions(-) rename debian/{dtkwidget5-examples.install => dtk6widget-examples.install} (100%) rename debian/{libdtkwidget5-bin.install => libdtk6widget-bin.install} (100%) rename debian/{libdtkwidget-dev.install => libdtk6widget-dev.install} (70%) create mode 100644 debian/libdtk6widget-doc.install rename debian/{libdtkwidget5.install => libdtk6widget.install} (100%) delete mode 100644 debian/libdtkwidget-doc.install delete mode 100644 debian/libdtkwidget5.install.amd64 delete mode 100644 debian/libdtkwidget5.install.i386 diff --git a/debian/changelog b/debian/changelog index f5f871135..22e79f4c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dtk6widget (6.0.0) UNRELEASED; urgency=medium + + * Release 6.0.0 + + -- Deepin Packages Builder Fri, 08 Sep 2023 08:41:51 +0800 + dtkwidget (5.6.17) unstable; urgency=medium * Release 5.6.17 diff --git a/debian/control b/debian/control index 4ee73dc49..42b8edfca 100644 --- a/debian/control +++ b/debian/control @@ -1,63 +1,81 @@ -Source: dtkwidget +Source: dtk6widget Section: libdevel Priority: optional -Maintainer: Deepin Packages Builder -Build-Depends: debhelper-compat (= 12), pkg-config, libudev-dev, - libqt5x11extras5-dev, libxext-dev, qttools5-dev-tools, qttools5-dev, - x11proto-xext-dev, libxcb-util0-dev, libstartup-notification0-dev, - libmtdev-dev, qtbase5-private-dev, libegl1-mesa-dev, libudev-dev, - libfontconfig1-dev, libfreetype-dev, libglib2.0-dev, libxrender-dev, - libdtkcore-dev, libgsettings-qt-dev, libqt5svg5-dev, libxi-dev, - libdtkgui-dev, libcups2-dev, libgtest-dev, libdtkcore5-bin, cmake, doxygen +Maintainer: Deepin Packages Builder +Build-Depends: + debhelper-compat (= 12), + pkg-config, + libudev-dev, + libxext-dev, + qt6-tools-dev-tools, + qt6-tools-dev, + x11proto-xext-dev, + libxcb-util0-dev, + libstartup-notification0-dev, + libmtdev-dev, + qt6-base-private-dev, + libegl1-mesa-dev, + libudev-dev, + libfontconfig1-dev, + libfreetype-dev, + libglib2.0-dev, + libxrender-dev, + libgsettings-qt-dev, + libqt6svg6-dev, + libxi-dev, + libcups2-dev, + libgtest-dev, + libdtk6core-dev, + libdtk6gui-dev, + libdtkcommon-dev, + cmake, + doxygen Standards-Version: 3.9.8 -Package: libdtkwidget5 +Package: libdtk6widget Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libdtkdata, - libqt5widgets5(>= 5.11.3.33) | libqt5widgets5(<= 5.11.3.28) +Depends: ${shlibs:Depends}, ${misc:Depends}, libdtkdata Multi-Arch: same -Description: Deepin graphical user interface library - DtkWidget is Deepin graphical user interface for deepin desktop development. +Description: deepin graphical user interface library + DtkWidget is deepin graphical user interface for deepin desktop development. . This package contains the shared libraries. -Package: libdtkwidget5-bin +Package: libdtk6widget-bin Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - libdtkwidget5( =${binary:Version}), - libqt5x11extras5-dev, libdtkcore-dev, libqt5svg5-dev -Description: Deepin graphical user interface library utilities - DtkWidget is Deepin graphical user interface for deepin desktop development. +Build-Profiles: +Depends: ${shlibs:Depends}, ${misc:Depends}, libdtk6widget (= ${binary:Version}) +Description: deepin graphical user interface library utilities + DtkWidget is deepin graphical user interface for deepin desktop development. . This package contains the utilities which are - needed for developing Deepin applications. + needed for developing deepin applications. -Package: libdtkwidget-dev +Package: libdtk6widget-dev Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - libdtkwidget5( =${binary:Version}), - libqt5x11extras5-dev, libdtkcore-dev, libqt5svg5-dev, - libdtkgui-dev, libcups2-dev -Description: Deepin graphical user interface library - DtkWidget is Deepin graphical user interface for deepin desktop development. +Depends: ${misc:Depends}, libdtk6widget (= ${binary:Version}), + libdtk6core-dev, + libdtk6gui-dev +Description: deepin graphical user interface library + DtkWidget is deepin graphical user interface for deepin desktop development. . This package contains the header files and static libraries which are - needed for developing Deepin applications. + needed for developing deepin applications. -Package: dtkwidget5-examples +Package: dtk6widget-examples Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, - libdtkwidget5( =${binary:Version}), libdtkdata +Depends: ${shlibs:Depends}, ${misc:Depends}, libdtk6widget (= ${binary:Version}), libdtkdata Description: dtkwidget-examples is generated by dtkwidget. - DtkWidget is Deepin graphical user interface for deepin desktop development. + DtkWidget is deepin graphical user interface for deepin desktop development. . This package contains example application which are - needed for developing Deepin applications. + needed for developing deepin applications. -Package: dtkwidget-doc +Package: libdtk6widget-doc +Build-Profiles: Architecture: any -Description: Deepin graphical user interface library (Document) - DtkWidget is Deepin graphical user interface for deepin desktop development. +Description: deepin graphical user interface library (Document) + DtkWidget is deepin graphical user interface for deepin desktop development. . This package contains example application which are - needed for developing Deepin applications. + needed for developing deepin applications. diff --git a/debian/copyright b/debian/copyright index 7da756504..27e1d1a4c 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: deepin-tool-kit -Source: https://github.com/linuxdeepin/deepin-tool-kit +Upstream-Name: dtk6widget +Source: https://github.com/linuxdeepin/dtk6widget Files: * Copyright: 2017 Deepin Technology Co., Ltd. diff --git a/debian/dtkwidget5-examples.install b/debian/dtk6widget-examples.install similarity index 100% rename from debian/dtkwidget5-examples.install rename to debian/dtk6widget-examples.install diff --git a/debian/libdtkwidget5-bin.install b/debian/libdtk6widget-bin.install similarity index 100% rename from debian/libdtkwidget5-bin.install rename to debian/libdtk6widget-bin.install diff --git a/debian/libdtkwidget-dev.install b/debian/libdtk6widget-dev.install similarity index 70% rename from debian/libdtkwidget-dev.install rename to debian/libdtk6widget-dev.install index 1764ecaae..b11cb21c5 100644 --- a/debian/libdtkwidget-dev.install +++ b/debian/libdtk6widget-dev.install @@ -2,4 +2,4 @@ usr/lib/*/*.so usr/include usr/lib/*/pkgconfig/*.pc usr/lib/*/cmake/*/*.cmake -usr/lib/*/qt5/mkspecs/modules/* +usr/lib/*/qt6/mkspecs/modules/* diff --git a/debian/libdtk6widget-doc.install b/debian/libdtk6widget-doc.install new file mode 100644 index 000000000..e766a0895 --- /dev/null +++ b/debian/libdtk6widget-doc.install @@ -0,0 +1 @@ +usr/share/qt6/doc/*.qch diff --git a/debian/libdtkwidget5.install b/debian/libdtk6widget.install similarity index 100% rename from debian/libdtkwidget5.install rename to debian/libdtk6widget.install diff --git a/debian/libdtkwidget-doc.install b/debian/libdtkwidget-doc.install deleted file mode 100644 index f2088ed74..000000000 --- a/debian/libdtkwidget-doc.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/qt5/doc/dtkwidget.qch diff --git a/debian/libdtkwidget5.install.amd64 b/debian/libdtkwidget5.install.amd64 deleted file mode 100644 index fa08da37b..000000000 --- a/debian/libdtkwidget5.install.amd64 +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/lib*.so.* -#usr/lib/*/libmsc.so -usr/share/*/*/translations/* diff --git a/debian/libdtkwidget5.install.i386 b/debian/libdtkwidget5.install.i386 deleted file mode 100644 index fa08da37b..000000000 --- a/debian/libdtkwidget5.install.i386 +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib/*/lib*.so.* -#usr/lib/*/libmsc.so -usr/share/*/*/translations/* diff --git a/debian/rules b/debian/rules index 7efc74c12..f17620738 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,6 @@ #!/usr/bin/make -f DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/default.mk -export QT_SELECT = qt5 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -21,15 +20,6 @@ endif override_dh_auto_configure: dh_auto_configure -- -DBUILD_PLUGINS=OFF -DBUILD_DOCS=ON -DDTK_VERSION=$(_PACK_VER) -#override_dh_auto_configure: -# dh_auto_configure -- LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) -#override_dh_makeshlibs: -# dh_makeshlibs -V - -#ifeq ($(DEB_BUILD_ARCH), sw_64) -#override_dh_makeshlibs: -# dh_makeshlibs -V -- -c0 -#endif override_dh_makeshlibs: - dh_makeshlibs -V "libdtkwidget5 (>= $(shell echo $(VERSION) | cut -d '.' -f 1,2))" + dh_makeshlibs -V "libdtk6widget (>= $(shell echo $(VERSION) | cut -d '.' -f 1,2))"