[frameworks/kpackage] /: Rename kpackagetool5 to kpackagetool6

[Alexander Lohnau]

Git commit 659f1507b11cf2557aeb9fbb8c6f5979e1eb7650 by Alexander Lohnau.
Committed on 27/01/2023 at 17:09.
Pushed by alex into branch 'master'.

Rename kpackagetool5 to kpackagetool6

This ensures we are co-installable with the KF5 version

M  +1    -1    KF6PackageMacros.cmake
M  +3    -3    autotests/CMakeLists.txt
M  +1    -1    docs/kpackagetool/CMakeLists.txt
R  +5    -5    docs/kpackagetool/man-kpackagetool6.1.docbook [from: docs/kpackagetool/man-kpackagetool5.1.docbook - 094% similarity]
M  +7    -7    src/kpackagetool/CMakeLists.txt
M  +1    -1    src/kpackagetool/main.cpp

https://invent.kde.org/frameworks/kpackage/commit/659f1507b11cf2557aeb9fbb8c6f5979e1eb7650

diff --git a/KF6PackageMacros.cmake b/KF6PackageMacros.cmake
index 4292f96..c49c178 100644
--- a/KF6PackageMacros.cmake
+++ b/KF6PackageMacros.cmake
@@ -53,7 +53,7 @@ function(kpackage_install_package dir component)
         install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/${dir}/metadata.json" DESTINATION ${KDE_INSTALL_DATADIR}/${install_dir}/${root}/${component})
     endif()
 
-   get_target_property(kpackagetool_cmd KF6::kpackagetool5 LOCATION)
+   get_target_property(kpackagetool_cmd KF6::kpackagetool LOCATION)
    if (${component} MATCHES "^.+\\..+\\.") #we make sure there's at least 2 dots
         set(APPDATAFILE "${CMAKE_CURRENT_BINARY_DIR}/${component}.appdata.xml")
 
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 4664014..1c89633 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -38,8 +38,8 @@ kcoreaddons_target_static_plugins(querytest kpackage/packagestructure)
 set_tests_properties(plasma-querytest PROPERTIES RUN_SERIAL TRUE) # it wipes out ~/.qttest/share
 set_tests_properties(plasma-plasmoidpackagetest PROPERTIES RUN_SERIAL TRUE)
 
-function(kpackagetool5test testname)
-    add_test(NAME ${testname}-appstream COMMAND cmake -Dkpackagetool=$<TARGET_FILE:kpackagetool5>
+function(kpackagetooltest testname)
+    add_test(NAME ${testname}-appstream COMMAND cmake -Dkpackagetool=$<TARGET_FILE:kpackagetool6>
                                                       -Dgenerated=${CMAKE_CURRENT_BINARY_DIR}/${testname}.appdata.xml
                                                       -Dinput=${CMAKE_CURRENT_LIST_DIR}/data/${testname}/
                                                       -Doutput=${CMAKE_CURRENT_SOURCE_DIR}/data/${testname}/${testname}.testappdataxml
@@ -53,7 +53,7 @@ function(kpackagetool5test testname)
 endfunction()
 
 foreach(var "testfallbackpackage" "testpackage" "testpackage-nodisplay" "testjsonmetadatapackage" "testpackagesdep" "testpackagesdepinvalid") # "customcontent" "simplecontent"
-    kpackagetool5test(${var})
+    kpackagetooltest(${var})
 endforeach()
 
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/testpackage-rcc")
diff --git a/docs/kpackagetool/CMakeLists.txt b/docs/kpackagetool/CMakeLists.txt
index 812b467..7e4fa80 100644
--- a/docs/kpackagetool/CMakeLists.txt
+++ b/docs/kpackagetool/CMakeLists.txt
@@ -1,2 +1,2 @@
-kdoctools_create_manpage(man-kpackagetool5.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
+kdoctools_create_manpage(man-kpackagetool6.1.docbook 1 INSTALL_DESTINATION ${KDE_INSTALL_MANDIR})
 
diff --git a/docs/kpackagetool/man-kpackagetool5.1.docbook b/docs/kpackagetool/man-kpackagetool6.1.docbook
similarity index 94%
rename from docs/kpackagetool/man-kpackagetool5.1.docbook
rename to docs/kpackagetool/man-kpackagetool6.1.docbook
index d8ca76d..8370995 100644
--- a/docs/kpackagetool/man-kpackagetool5.1.docbook
+++ b/docs/kpackagetool/man-kpackagetool6.1.docbook
@@ -12,18 +12,18 @@
 </refentryinfo>
 
 <refmeta>
-<refentrytitle><command>kpackagetool5</command></refentrytitle>
+<refentrytitle><command>kpackagetool6</command></refentrytitle>
 <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-<refname><command>kpackagetool5</command></refname>
+<refname><command>kpackagetool6</command></refname>
 <refpurpose>Install, list, remove &plasma; packages</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
 <cmdsynopsis>
-<command>kpackagetool5</command>
+<command>kpackagetool6</command>
 
 <group choice="opt"><option>-v, --version</option></group>
 <group choice="opt"><option>-h, --help</option></group>
@@ -43,7 +43,7 @@
 
 <refsect1>
 <title>Description</title>
-<para><command>kpackagetool5</command> is a command line tool to
+<para><command>kpackagetool6</command> is a command line tool to
 install, list, remove &plasma; packages.</para>
 
 </refsect1>
@@ -127,7 +127,7 @@ url="help:/plasma-desktop">help:/plasma-desktop</ulink>
 
 <refsect1>
 <title>Authors</title>
-<para><command>kpackagetool5</command> was written by
+<para><command>kpackagetool6</command> was written by
 <personname><firstname>Aaron</firstname><surname>Seigo</surname></personname> <email>aseigo at kde.org</email>.</para>
 </refsect1>
 
diff --git a/src/kpackagetool/CMakeLists.txt b/src/kpackagetool/CMakeLists.txt
index ca0a013..5ca3046 100644
--- a/src/kpackagetool/CMakeLists.txt
+++ b/src/kpackagetool/CMakeLists.txt
@@ -1,18 +1,18 @@
-add_executable(kpackagetool5)
-add_executable(KF6::kpackagetool5 ALIAS kpackagetool5)
+add_executable(kpackagetool6)
+add_executable(KF6::kpackagetool ALIAS kpackagetool6)
 
-ecm_mark_nongui_executable(kpackagetool5)
+ecm_mark_nongui_executable(kpackagetool6)
 
-target_sources(kpackagetool5 PRIVATE
+target_sources(kpackagetool6 PRIVATE
     main.cpp
     kpackagetool.cpp
     kpackagetool.qrc
 )
-ecm_qt_declare_logging_category(kpackagetool5
+ecm_qt_declare_logging_category(kpackagetool6
     HEADER kpackage_debug.h
     IDENTIFIER KPACKAGE_LOG
     CATEGORY_NAME kf.package
 )
-target_link_libraries(kpackagetool5 kpackage_common_STATIC KF6::Archive KF6::Package KF6::I18n KF6::CoreAddons)
+target_link_libraries(kpackagetool6 kpackage_common_STATIC KF6::Archive KF6::Package KF6::I18n KF6::CoreAddons)
 
-install(TARGETS kpackagetool5 EXPORT KF6PackageToolsTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kpackagetool6 EXPORT KF6PackageToolsTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/src/kpackagetool/main.cpp b/src/kpackagetool/main.cpp
index c1c9c3a..e447c84 100644
--- a/src/kpackagetool/main.cpp
+++ b/src/kpackagetool/main.cpp
@@ -6,7 +6,7 @@
 */
 
 /**
- * kpackagetool5 exit codes used in this program
+ * kpackagetool6 exit codes used in this program
 
     0 No error