chore: [debian/control] change package name prefix

Adapt to qt6, modify the deb package name prefix to dfm6. Log: Modify the deb package name prefix to dfm6.
linuxdeepin · Jun 13, 2024 · 4d1390c · 4d1390c
1 parent 8d48c24
commit 4d1390c
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 40 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,6 +16,12 @@ find_package(QT NAMES Qt6 Qt5 ${QT_MINIMUM_VERSION} CONFIG REQUIRED Core)
 find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core)
 message("Using Qt version: ${QT_VERSION}")
 
+if(QT_VERSION_MAJOR EQUAL "6")
+    set(DFM_VERSION_MAJOR 6)
+else()
+    set(DFM_VERSION_MAJOR "")
+endif()
+
 find_package(PkgConfig REQUIRED)
 
 # Install settings

diff --git a/debian/control b/debian/control
@@ -6,11 +6,11 @@ Build-Depends:
  debhelper (>=9),
  cmake,
  pkg-config,
- qtbase5-dev,
- qtbase5-private-dev,
- qt5-qmake,
+ qt6-base-dev,
+ qt6-base-private-dev,
+ qmake6,
  libglibmm-2.4-dev,
- qttools5-dev-tools,
+ qt6-tools-dev-tools,
  libglib2.0-dev,
  libudisks2-dev,
  libisoburn-dev,
@@ -21,7 +21,7 @@ Homepage: http://www.deepin.org
 #Vcs-Browser: https://salsa.debian.org/debian/util-dfm
 #Vcs-Git: https://salsa.debian.org/debian/util-dfm.git
 
-Package: libdfm-io
+Package: libdfm6-io
 Architecture: any
 Section: libdevel
 Multi-Arch: same
@@ -32,18 +32,18 @@ Depends:
 Description: A libaray about I/O.
  A libaray that provides I/O interface.
 
-Package: libdfm-io-dev
+Package: libdfm6-io-dev
 Architecture: any
 Section: libdevel
 Multi-Arch: same
 Depends:
  ${shlibs:Depends},
  ${misc:Depends},
- libdfm-io
+ libdfm6-io
 Description: A libaray about I/O dev.
  A libaray that provides I/O interface dev.
 
-Package: libdfm-mount
+Package: libdfm6-mount
 Architecture: any
 Section: libdevel
 Multi-Arch: same
@@ -53,20 +53,20 @@ Depends:
 Description: A libaray about mount and umount.
  A libaray that provides mount and umount interface.
 
-Package: libdfm-mount-dev
+Package: libdfm6-mount-dev
 Architecture: any
 Section: libdevel
 Multi-Arch: same
 Depends:
  ${shlibs:Depends}, 
  ${misc:Depends},
- libdfm-mount,
+ libdfm6-mount,
  libsecret-1-dev,
  libudisks2-dev
 Description: A libaray about mount and umount dev.
  A libaray that provides mount and umount interface dev.
 
-Package: libdfm-burn
+Package: libdfm6-burn
 Architecture: any
 Section: libdevel
 Multi-Arch: same
@@ -78,14 +78,14 @@ Recommends:
 Description: A libaray about burning CD.
  A libaray that provides burning CD interface.
 
-Package: libdfm-burn-dev
+Package: libdfm6-burn-dev
 Architecture: any
 Section: libdevel
 Multi-Arch: same
 Depends:
  ${shlibs:Depends}, 
  ${misc:Depends},
- libdfm-burn,
+ libdfm6-burn,
  libisoburn-dev
 Description: A libaray about mount burning CD.
  A libaray that provides burning CD interface dev.
diff --git a/debian/libdfm6-burn-dev.install b/debian/libdfm6-burn-dev.install
@@ -0,0 +1,3 @@
+usr/include/dfm6-burn/*
+usr/lib/*/pkgconfig/dfm6-burn.pc
+usr/lib/*/cmake/dfm6-burn/*.cmake
diff --git a/debian/libdfm6-burn.install b/debian/libdfm6-burn.install
@@ -0,0 +1 @@
+/usr/lib/*/libdfm6-burn*.so*
diff --git a/debian/libdfm6-io-dev.install b/debian/libdfm6-io-dev.install
@@ -0,0 +1,3 @@
+usr/include/dfm6-io/*
+usr/lib/*/pkgconfig/dfm6-io.pc
+usr/lib/*/cmake/dfm6-io/*.cmake
diff --git a/debian/libdfm6-io.install b/debian/libdfm6-io.install
@@ -0,0 +1 @@
+/usr/lib/*/libdfm6-io*.so*
diff --git a/debian/libdfm6-mount-dev.install b/debian/libdfm6-mount-dev.install
@@ -0,0 +1,3 @@
+usr/include/dfm6-mount/*
+usr/lib/*/pkgconfig/dfm6-mount.pc
+usr/lib/*/cmake/dfm6-mount/*.cmake
diff --git a/debian/libdfm6-mount.install b/debian/libdfm6-mount.install
@@ -0,0 +1 @@
+/usr/lib/*/libdfm6-mount*.so*
diff --git a/misc/dfm-burn/dfm-burn.pc.in b/misc/dfm-burn/dfm-burn.pc.in
@@ -2,7 +2,7 @@ Name: @BIN_NAME@
 Description: @CMAKE_PROJECT_DESCRIPTION@
 URL: @CMAKE_PROJECT_HOMEPAGE_URL@
 Version: @PROJECT_VERSION@
-Requires: libisoburn-1, Qt@QT_VERSION_MAJOR@core
+Requires: libisoburn-1, Qt@QT_VERSION_MAJOR@Core
 Cflags: -I"@CMAKE_INSTALL_FULL_INCLUDEDIR@/@BIN_NAME@"
 Libs: -L"@CMAKE_INSTALL_FULL_LIBDIR@" -l@BIN_NAME@
 Libs.private: -L"@CMAKE_INSTALL_FULL_LIBDIR@" -l@BIN_NAME@
diff --git a/src/dfm-burn/dfm-burn-client/CMakeLists.txt b/src/dfm-burn/dfm-burn-client/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1.0)
 
-project(dfm-burn-client)
+project(dfm${DFM_VERSION_MAJOR}-burn-client)
 
 set(SRCS
     main.cpp
@@ -17,5 +17,5 @@ include_directories(
 target_link_libraries(
     ${PROJECT_NAME}
     Qt${QT_VERSION_MAJOR}::Core
-    dfm-burn
+    dfm${DFM_VERSION_MAJOR}-burn
 )
diff --git a/src/dfm-burn/dfm-burn-lib/CMakeLists.txt b/src/dfm-burn/dfm-burn-lib/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.1.0)
 
-set(BIN_NAME dfm-burn)
+set(BIN_NAME dfm${DFM_VERSION_MAJOR}-burn)
+set(BASE_NAME dfm-burn)
 
 # Version
 if (NOT PROJECT_VERSION)
@@ -18,7 +19,7 @@ pkg_check_modules(isoburn REQUIRED libisoburn-1 IMPORTED_TARGET)
 
 # public include
 file(GLOB_RECURSE PUBLIC_INCLUDES  CONFIGURE_DEPENDS
-    "${PROJECT_SOURCE_DIR}/include/${BIN_NAME}/*")
+    "${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/*")
 
 # udfclient
 FILE (GLOB_RECURSE UDFCLIENT_SRCS CONFIGURE_DEPENDS
@@ -48,7 +49,7 @@ target_link_libraries(${BIN_NAME}
 target_include_directories(
     ${BIN_NAME}
 PUBLIC
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}
     ${CMAKE_CURRENT_SOURCE_DIR}/..
 )
 
@@ -72,15 +73,18 @@ target_compile_definitions(${BIN_NAME} PRIVATE
 )
 
 set_target_properties(
-    dfm-burn PROPERTIES
+    ${BIN_NAME} PROPERTIES
     VERSION ${PROJECT_VERSION}
     SOVERSION ${PROJECT_VERSION_MAJOR}
 )
 
+# compact
+add_library(${BASE_NAME} ALIAS ${BIN_NAME})
+
 # Install
 install(DIRECTORY
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
-    DESTINATION include
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/${BASE_NAME}
+    DESTINATION include/${BIN_NAME}
     FILES_MATCHING PATTERN "*.h"
 )
 install(TARGETS ${BIN_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -91,11 +95,11 @@ set(PC_REQ_PRIVATE)
 set(PC_REQ_PUBLIC)
 
 # config pkgconfig file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # config cmake file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}Config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${BIN_NAME})
 
 
diff --git a/src/dfm-io/dfm-io/CMakeLists.txt b/src/dfm-io/dfm-io/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.1.0)
 
-set(BIN_NAME dfm-io)
+set(BIN_NAME dfm${DFM_VERSION_MAJOR}-io)
+set(BASE_NAME dfm-io)
 
 # Version
 if (NOT PROJECT_VERSION)
@@ -25,7 +26,7 @@ add_definitions(-DQT_NO_KEYWORDS)
 
 # public include
 file(GLOB_RECURSE IO_PUBLIC_INCLUDES  CONFIGURE_DEPENDS
-    "${PROJECT_SOURCE_DIR}/include/${BIN_NAME}/*")
+    "${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/*")
 # src
 FILE (GLOB_RECURSE IO_SRCS CONFIGURE_DEPENDS
     "./*.c"
@@ -40,7 +41,7 @@ add_library(${BIN_NAME} SHARED
 )
 
 set_target_properties(
-    dfm-io PROPERTIES
+    ${BIN_NAME} PROPERTIES
     VERSION ${PROJECT_VERSION}
     SOVERSION ${PROJECT_VERSION_MAJOR}
 )
@@ -56,13 +57,16 @@ target_link_libraries(${BIN_NAME}
 target_include_directories(${BIN_NAME}
 PUBLIC
     ${GLIB_INCLUDE_DIRS}
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}
 )
 
+# compact
+add_library(${BASE_NAME} ALIAS ${BIN_NAME})
+
 include(GNUInstallDirs)
 install(DIRECTORY
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
-    DESTINATION include
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/${BASE_NAME}
+    DESTINATION include/${BIN_NAME}
     FILES_MATCHING PATTERN "*.h"
 )
 install(TARGETS ${BIN_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -73,10 +77,10 @@ set(PC_REQ_PRIVATE)
 set(PC_REQ_PUBLIC)
 
 # config pkgconfig file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # config cmake file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}Config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${BIN_NAME})
 
diff --git a/src/dfm-mount/CMakeLists.txt b/src/dfm-mount/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.0)
 
-set(BIN_NAME dfm-mount)
+set(BIN_NAME dfm${DFM_VERSION_MAJOR}-mount)
+set(BASE_NAME dfm-mount)
 
 # Version
 if (NOT PROJECT_VERSION)
@@ -31,7 +32,7 @@ pkg_check_modules(mount REQUIRED mount IMPORTED_TARGET)
 
 # public include
 file(GLOB_RECURSE PUBLIC_INCLUDES  CONFIGURE_DEPENDS
-    "${PROJECT_SOURCE_DIR}/include/${BIN_NAME}/*")
+    "${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/*")
 # src
 FILE (GLOB_RECURSE SRCS CONFIGURE_DEPENDS
     "./*.cpp"
@@ -45,7 +46,7 @@ add_library(${BIN_NAME} SHARED
 )
 
 set_target_properties(
-    dfm-mount PROPERTIES
+    ${BIN_NAME} PROPERTIES
     VERSION ${PROJECT_VERSION}
     SOVERSION ${PROJECT_VERSION_MAJOR}
 )
@@ -65,15 +66,18 @@ target_link_libraries(${BIN_NAME}
 target_include_directories(
     ${BIN_NAME}
 PUBLIC
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}
 )
 
+# compact
+add_library(${BASE_NAME} ALIAS ${BIN_NAME})
+
 include(GNUInstallDirs)
 
 # Install lib
 install(DIRECTORY
-    ${PROJECT_SOURCE_DIR}/include/${BIN_NAME}
-    DESTINATION include
+    ${PROJECT_SOURCE_DIR}/include/${BASE_NAME}/${BASE_NAME}
+    DESTINATION include/${BIN_NAME}
     FILES_MATCHING PATTERN "*.h"
 )
 install(TARGETS ${BIN_NAME} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -84,11 +88,11 @@ set(PC_REQ_PRIVATE)
 set(PC_REQ_PUBLIC)
 
 # config pkgconfig file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}.pc.in ${BIN_NAME}.pc @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
 
 # config cmake file
-configure_file(${PROJECT_SOURCE_DIR}/misc/${BIN_NAME}/${BIN_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
+configure_file(${PROJECT_SOURCE_DIR}/misc/${BASE_NAME}/${BASE_NAME}Config.cmake.in ${BIN_NAME}Config.cmake @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${BIN_NAME}Config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${BIN_NAME})
 
 # Build example