~tenacity/tenacity

198d49b773ffbe42de619c626fbfb77fe56566c0 — lmarz 8 months ago e776c2f
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
6 files changed, 8 insertions(+), 9 deletions(-)

M help/CMakeLists.txt
R help/{tenacity.metainfo.xml => org.tenacityaudio.Tenacity.metainfo.xml}
M packaging/flatpak/org.tenacity.Tenacity.json
M src/CMakeLists.txt
R src/{tenacity.desktop.in => org.tenacityaudio.Tenacity.desktop.in}
R src/{tenacity.xml => org.tenacityaudio.Tenacity.xml}
M help/CMakeLists.txt => help/CMakeLists.txt +3 -3
@@ 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" )


R help/tenacity.metainfo.xml => help/org.tenacityaudio.Tenacity.metainfo.xml +0 -0
M packaging/flatpak/org.tenacity.Tenacity.json => packaging/flatpak/org.tenacity.Tenacity.json +2 -3
@@ 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"
          ]
        }
      ]

M src/CMakeLists.txt => src/CMakeLists.txt +3 -3
@@ 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(

R src/tenacity.desktop.in => src/org.tenacityaudio.Tenacity.desktop.in +0 -0
R src/tenacity.xml => src/org.tenacityaudio.Tenacity.xml +0 -0