From 198d49b773ffbe42de619c626fbfb77fe56566c0 Mon Sep 17 00:00:00 2001
From: lmarz <main@lmarz.org>
Date: Mon, 27 Sep 2021 07:49:51 +0200
Subject: [PATCH] Rename freedesktop and metainfo files to reverse DNS schema

Based on the suggestion made by Mart Raudsepp.

"Regular installs should have reverse DNS notation desktop and
metainfo files as well. This becomes important if we ever make use
of things like dbus service activation further down the line. And
renaming it then will break peoples app shortcuts and other things."

Signed-off-by: Leon Marz <main@lmarz.org>
Signed-off-by: Panagiotis Vasilopoulos <hello@alwayslivid.com>
Helped-by: Mart Raudsepp <leio@gentoo.org>
Reference-to: https://github.com/tenacityteam/tenacity/pull/642
---
 help/CMakeLists.txt                                         | 6 +++---
 ...metainfo.xml => org.tenacityaudio.Tenacity.metainfo.xml} | 0
 packaging/flatpak/org.tenacity.Tenacity.json                | 5 ++---
 src/CMakeLists.txt                                          | 6 +++---
 ...ity.desktop.in => org.tenacityaudio.Tenacity.desktop.in} | 0
 src/{tenacity.xml => org.tenacityaudio.Tenacity.xml}        | 0
 6 files changed, 8 insertions(+), 9 deletions(-)
 rename help/{tenacity.metainfo.xml => org.tenacityaudio.Tenacity.metainfo.xml} (100%)
 rename src/{tenacity.desktop.in => org.tenacityaudio.Tenacity.desktop.in} (100%)
 rename src/{tenacity.xml => org.tenacityaudio.Tenacity.xml} (100%)

diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt
index bf6baaeda..6f9c6c58b 100755
--- a/help/CMakeLists.txt
+++ b/help/CMakeLists.txt
@@ -51,8 +51,8 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
    if( NOT WIN32)
       install( DIRECTORY "${dst}" OPTIONAL
                DESTINATION "${_DATADIR}/tenacity/help" )
-      
-      install( FILES "${_SRCDIR}/tenacity.metainfo.xml"
+
+      install( FILES "${_SRCDIR}/org.tenacityaudio.Tenacity.metainfo.xml"
                DESTINATION "${_DATADIR}/metainfo" )
    endif()
 endif()
@@ -64,7 +64,7 @@ cmake_dependent_option(BUILD_MANPAGE "Build manpage" ON "NOT SCDOC_CMD STREQUAL
 
 if( BUILD_MANPAGE )
    add_custom_command( COMMENT "Generating manpage"
-      COMMAND ${SCDOC_CMD} < "${_SRCDIR}/tenacity.1.scd" > "${CMAKE_BINARY_DIR}/help/tenacity.1" 
+      COMMAND ${SCDOC_CMD} < "${_SRCDIR}/tenacity.1.scd" > "${CMAKE_BINARY_DIR}/help/tenacity.1"
       DEPENDS "${_SRCDIR}/tenacity.1.scd"
       OUTPUT "${CMAKE_BINARY_DIR}/help/tenacity.1" )
 
diff --git a/help/tenacity.metainfo.xml b/help/org.tenacityaudio.Tenacity.metainfo.xml
similarity index 100%
rename from help/tenacity.metainfo.xml
rename to help/org.tenacityaudio.Tenacity.metainfo.xml
diff --git a/packaging/flatpak/org.tenacity.Tenacity.json b/packaging/flatpak/org.tenacity.Tenacity.json
index cefc6547b..0fb95fbd2 100644
--- a/packaging/flatpak/org.tenacity.Tenacity.json
+++ b/packaging/flatpak/org.tenacity.Tenacity.json
@@ -6,7 +6,6 @@
   "command": "tenacity",
   "rename-desktop-file": "tenacity.desktop",
   "rename-icon": "tenacity",
-  "rename-appdata-file": "tenacity.metainfo.xml",
   "finish-args": [
     "--share=ipc",
     "--socket=x11",
@@ -189,7 +188,7 @@
         "-DWX_CONFIG=/app/bin/wx-config"
       ],
       "post-install": [
-        "install -Dm644 ../help/tenacity.metainfo.xml -t /app/share/metainfo",
+        "install -Dm644 ../help/org.tenacityaudio.Tenacity.metainfo.xml -t /app/share/metainfo",
         "install -d /app/extensions/Plugins"
       ],
       "cleanup": [
@@ -209,7 +208,7 @@
         {
           "type": "shell",
           "commands": [
-            "sed -e '43i <release version=\"master\" date=\"2021-08-12\"/>' -i help/tenacity.metainfo.xml"
+            "sed -e '43i <release version=\"master\" date=\"2021-08-12\"/>' -i help/org.tenacityaudio.Tenacity.metainfo.xml"
           ]
         }
       ]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7fd1a50c2..83e57578d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1263,7 +1263,7 @@ else()
   endif()
 
   # Create the desktop file
-  configure_file( tenacity.desktop.in ${_INTDIR}/tenacity.desktop )
+  configure_file( org.tenacityaudio.Tenacity.desktop.in ${_INTDIR}/org.tenacityaudio.Tenacity.desktop )
 
   # Copy the required wxWidgets libs into the bundle
   add_custom_command(
@@ -1369,7 +1369,7 @@ else()
       PATTERN "*.so*"
     )
     install(
-      FILES "${_INTDIR}/tenacity.desktop"
+      FILES "${_INTDIR}/org.tenacityaudio.Tenacity.desktop"
       DESTINATION "${_DATADIR}/applications"
     )
     install(
@@ -1377,7 +1377,7 @@ else()
       DESTINATION "${_DATADIR}/doc/${AUDACITY_NAME}"
     )
     install(
-      FILES "${_SRCDIR}/tenacity.xml"
+      FILES "${_SRCDIR}/org.tenacityaudio.Tenacity.xml"
       DESTINATION "${_DATADIR}/mime/packages"
     )
     install(
diff --git a/src/tenacity.desktop.in b/src/org.tenacityaudio.Tenacity.desktop.in
similarity index 100%
rename from src/tenacity.desktop.in
rename to src/org.tenacityaudio.Tenacity.desktop.in
diff --git a/src/tenacity.xml b/src/org.tenacityaudio.Tenacity.xml
similarity index 100%
rename from src/tenacity.xml
rename to src/org.tenacityaudio.Tenacity.xml