From e594cf299e778a1a07f3a3748920acfd0d4ebca0 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Fri, 22 Feb 2019 20:41:06 +0100 Subject: [PATCH] Rename desktop and appdata files --- dist/CMakeLists.txt | 4 ++-- dist/fedora/strawberry.spec.in | 8 ++++---- dist/opensuse/strawberry.spec.in | 12 ++++++------ ...ppdata.xml => org.strawbs.strawberry.appdata.xml} | 0 ...wberry.desktop => org.strawbs.strawberry.desktop} | 0 snap/snapcraft.yaml | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename dist/unix/{strawberry.appdata.xml => org.strawbs.strawberry.appdata.xml} (100%) rename dist/unix/{strawberry.desktop => org.strawbs.strawberry.desktop} (100%) diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt index 978704d4a..a1a20cfa5 100644 --- a/dist/CMakeLists.txt +++ b/dist/CMakeLists.txt @@ -20,8 +20,8 @@ if (UNIX AND NOT APPLE) install(FILES ../data/icons/64x64/strawberry.png DESTINATION share/icons/hicolor/64x64/apps/) install(FILES ../data/icons/128x128/strawberry.png DESTINATION share/icons/hicolor/128x128/apps/) install(FILES ../data/icons/128x128/strawberry.svg DESTINATION share/icons/hicolor/scalable/apps/) - install(FILES unix/strawberry.desktop DESTINATION share/applications) - install(FILES unix/strawberry.appdata.xml DESTINATION share/metainfo) + install(FILES unix/org.strawbs.strawberry.desktop DESTINATION share/applications) + install(FILES unix/org.strawbs.strawberry.appdata.xml DESTINATION share/metainfo) install(FILES man/strawberry.1 man/strawberry-tagreader.1 DESTINATION share/man/man1) endif() diff --git a/dist/fedora/strawberry.spec.in b/dist/fedora/strawberry.spec.in index f8d7a2323..cc073312c 100644 --- a/dist/fedora/strawberry.spec.in +++ b/dist/fedora/strawberry.spec.in @@ -93,8 +93,8 @@ make install DESTDIR=%{buildroot} -C %{_target_platform} mv %{buildroot}%{_datadir}/metainfo %{buildroot}%{_datadir}/appdata %check -desktop-file-validate %{buildroot}%{_datadir}/applications/strawberry.desktop -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/strawberry.appdata.xml +desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawbs.strawberry.desktop +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/org.strawbs.strawberry.appdata.xml %files %defattr(-,root,root,-) @@ -102,12 +102,12 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/strawberry %license COPYING %{_bindir}/strawberry %{_bindir}/strawberry-tagreader -%{_datadir}/applications/strawberry.desktop +%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/48x48/apps/strawberry.png %{_datadir}/icons/hicolor/64x64/apps/strawberry.png %{_datadir}/icons/hicolor/128x128/apps/strawberry.png %{_datadir}/icons/hicolor/scalable/apps/strawberry.svg -%{_datadir}/appdata/strawberry.appdata.xml +%{_datadir}/appdata/*.appdata.xml %{_mandir}/man1/strawberry.1.* %{_mandir}/man1/strawberry-tagreader.1.* diff --git a/dist/opensuse/strawberry.spec.in b/dist/opensuse/strawberry.spec.in index f154a0f2d..a98891e84 100644 --- a/dist/opensuse/strawberry.spec.in +++ b/dist/opensuse/strawberry.spec.in @@ -97,11 +97,11 @@ cd build make clean %check -desktop-file-validate %{buildroot}%{_datadir}/applications/strawberry.desktop +desktop-file-validate %{buildroot}%{_datadir}/applications/org.strawbs.strawberry.desktop %if 0%{?suse_version} >= 1500 -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/strawberry.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/org.strawbs.strawberry.appdata.xml %else -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/strawberry.appdata.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/org.strawbs.strawberry.appdata.xml %endif %files @@ -110,15 +110,15 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/strawberry %license COPYING %{_bindir}/strawberry %{_bindir}/strawberry-tagreader -%{_datadir}/applications/strawberry.desktop +%{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/48x48/apps/strawberry.png %{_datadir}/icons/hicolor/64x64/apps/strawberry.png %{_datadir}/icons/hicolor/128x128/apps/strawberry.png %{_datadir}/icons/hicolor/scalable/apps/strawberry.svg %if 0%{?suse_version} >= 1500 -%{_datadir}/metainfo/strawberry.appdata.xml +%{_datadir}/metainfo/*.appdata.xml %else -%{_datadir}/appdata/strawberry.appdata.xml +%{_datadir}/appdata/*.appdata.xml %endif %{_mandir}/man1/%{name}.1%{?ext_man} %{_mandir}/man1/%{name}-tagreader.1%{?ext_man} diff --git a/dist/unix/strawberry.appdata.xml b/dist/unix/org.strawbs.strawberry.appdata.xml similarity index 100% rename from dist/unix/strawberry.appdata.xml rename to dist/unix/org.strawbs.strawberry.appdata.xml diff --git a/dist/unix/strawberry.desktop b/dist/unix/org.strawbs.strawberry.desktop similarity index 100% rename from dist/unix/strawberry.desktop rename to dist/unix/org.strawbs.strawberry.desktop diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 7f30b4f1a..2582a9823 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -91,7 +91,7 @@ parts: apps: strawberry: command: desktop-launch $SNAP/bin/strawberry - desktop: share/applications/strawberry.desktop + desktop: share/applications/org.strawbs.strawberry.desktop environment: LD_LIBRARY_PATH: $LD_LIBRARY_PATH:$SNAP/usr/lib/$SNAPCRAFT_ARCH_TRIPLET/pulseaudio plugs: