Improve Linux support

.gitignore

@@ -58,7 +58,7 @@ lib-src/soundtouch/include/soundtouch_config.h
 lib-src/twolame/doc/html/Doxyfile
 lib-src/twolame/libtwolame/config.h
 locale/POTFILES
-src/saucedacity.desktop
+src/io.github.saucedacity.Saucedacity.desktop
 src/RevisionIdent.h
 src/configunix.h
 src/configwin.h

CMakeLists.txt

@@ -452,6 +452,9 @@ else()
    set( APP_NAME "saucedacity" )
 endif()
 
+# Define Application ID
+set( APP_ID "io.github.saucedacity.Saucedacity" )
+
 # Create short and full version strings
 set( AUDACITY_DIST_VERSION ${AUDACITY_VERSION}.${AUDACITY_RELEASE}.${AUDACITY_REVISION} )
 set( AUDACITY_INFO_VERSION ${AUDACITY_VERSION}.${AUDACITY_RELEASE}.${AUDACITY_REVISION}.${AUDACITY_MODLEVEL} )

help/CMakeLists.txt

@@ -58,7 +58,7 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
                DESTINATION "${_DATADIR}/audacity/help" )
       install( FILES "${_SRCDIR}/audacity.1"
                DESTINATION "${_MANDIR}/man1" )
-      install( FILES "${_SRCDIR}/audacity.appdata.xml"
+      install( FILES "${_SRCDIR}/${APP_ID}.metainfo.xml"
                DESTINATION "${_DATADIR}/metainfo" )
    endif()
 endif()

help/audacity.appdata.xml → help/io.github.saucedacity.Saucedacity.metainfo.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.audacityteam.Audacity</id>
-  <launchable type="desktop-id">saucedacity.desktop</launchable>
+  <id>io.github.saucedacity.Saucedacity</id>
+  <launchable type="desktop-id">io.github.saucedacity.Saucedacity.desktop</launchable>
   <project_license>GPL-2.0 and CC-BY-3.0</project_license>
   <metadata_license>CC0-1.0</metadata_license>
-  <name>Audacity</name>
+  <name>Saucedacity</name>
+  <developer_name>Saucedacity Community</developer_name>
   <summary>Record and edit audio files</summary>
   <description>
-    <p>Audacity® is a free, easy-to-use, multi-track audio editor and recorder for Windows, Mac OS X, GNU/Linux and other operating systems. The interface is translated into many languages.</p>
-    <p>You can use Audacity to:</p>
+    <p>Saucedacity is a free, easy-to-use, multi-track audio editor and recorder for Windows, Mac OS X, GNU/Linux and other operating systems. The interface is translated into many languages.</p>
+    <p>You can use Saucedacity to:</p>
     <ul>
       <li>Record live audio</li>
       <li>Convert tapes and records into digital recordings or CDs</li>
@@ -23,20 +24,19 @@
     <category>Audio</category>
   </categories>
   <content_rating type="oars-1.1" />
-  <url type="homepage">https://www.audacityteam.org/</url>
-  <url type="bugtracker">https://bugzilla.audacityteam.org/</url>
-  <url type="faq">https://manual.audacityteam.org/man/faq.html</url>
-  <url type="help">https://manual.audacityteam.org/</url>
-  <url type="translate">https://www.audacityteam.org/community/translators/</url>
-  <screenshots>
-    <screenshot type="default">
-      <image type="source">https://www.audacityteam.org/wp-content/uploads/2016/01/audacity-212-linux.png</image>
-    </screenshot>
-    <screenshot>
-      <image type="source">https://www.audacityteam.org/wp-content/uploads/2015/11/Audacity-2-2-0-on-Linux.png</image>
-    </screenshot>
-  </screenshots>
-  <update_contact>[email protected]</update_contact>
+  <url type="homepage">https://saucedacity.github.io/</url>
+  <url type="bugtracker">https://github.com/saucedacity/saucedacity/issues</url>
+  <!-- <url type="help">https://manual.audacityteam.org/</url> -->
+  <!-- <url type="translate">https://www.audacityteam.org/community/translators/</url> -->
+  <!-- <screenshots> -->
+  <!--   <screenshot type="default"> -->
+  <!--     <image type="source">https://www.audacityteam.org/wp-content/uploads/2016/01/audacity-212-linux.png</image> -->
+  <!--   </screenshot> -->
+  <!--   <screenshot> -->
+  <!--     <image type="source">https://www.audacityteam.org/wp-content/uploads/2015/11/Audacity-2-2-0-on-Linux.png</image> -->
+  <!--   </screenshot> -->
+  <!-- </screenshots> -->
+  <!-- <update_contact>[email protected]</update_contact> -->
   <releases>
     <release version="2.3.0" date="2018-09-29">
      <description>
@@ -60,4 +60,8 @@
       </description>
     </release>
   </releases>
+  <supports>
+    <control>pointing</control>
+    <control>keyboard</control>
+  </supports>
 </component>

src/CMakeLists.txt

@@ -1339,7 +1339,7 @@ else()
    endif()
 
    # Create the desktop file
-   configure_file( saucedacity.desktop.in ${_INTDIR}/saucedacity.desktop )
+   configure_file( ${APP_ID}.desktop.in ${_INTDIR}/${APP_ID}.desktop )
 
    # Copy the required wxWidgets libs into the bundle
    add_custom_command(
@@ -1424,7 +1424,7 @@ else()
                DESTINATION "${_LIBDIR}"
                USE_SOURCE_PERMISSIONS
                FILES_MATCHING PATTERN "*.so*" )
-      install( FILES "${_INTDIR}/saucedacity.desktop"
+      install( FILES "${_INTDIR}/${APP_ID}.desktop"
                DESTINATION "${_DATADIR}/applications" )
       install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.md"
                DESTINATION "${_DATADIR}/doc/${APP_NAME}" )

src/saucedacity.desktop.in → src/io.github.saucedacity.Saucedacity.desktop.in

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Saucedacity
+Name=@APP_NAME@
 GenericName=Sound Editor
 GenericName[ar]=محرر أصوات
 GenericName[ca]=Editor d'àudio
@@ -45,12 +45,14 @@ Comment[uk]=Запис і редагування звукових файлів
 Comment[zh_CN]=录音和编辑音频文件
 Comment[zh_TW]=錄音和編輯音訊檔案
 
-Icon=@APP_NAME@
+Icon=@APP_ID@
+StartupWMClass=@APP_NAME@
 
 Type=Application
-Categories=AudioVideo;Audio;AudioVideoEditing;
+Categories=AudioVideo;Audio;AudioVideoEditing;Midi;Recorder;
+Keywords=audio;editor;audacity;sound;ton;wave;
 
-Exec=env UBUNTU_MENUPROXY=0 @APP_NAME@ %F
+Exec=env UBUNTU_MENUPROXY=0 @APP_ID@ %F
 StartupNotify=false
 Terminal=false
 MimeType=@MIMETYPES@;