Hi, Federico Bruni has been creating a flatpak for Denemo and has suggested renaming the file
pixmaps/denemo.desktop to pixmaps/org.denemo.Denemo.desktop I'm not familiar with this desktop configuration stuff, but I recall that you made patches to this file and so I would appreciate it if you could say whether this is ok or if I should create a symbolic link between the new and old names to retain all current functionality. best wishes Richard Shann Attached is the patch proposed.
From 82a3402d94ad8f1ba6b08d950b21e2e9e95523b7 Mon Sep 17 00:00:00 2001 From: Federico Bruni <[email protected]> Date: Sun, 22 Aug 2021 23:26:02 +0200 Subject: [PATCH] Change application id to org.denemo.Denemo The reverse-DNS schema is the standard recommended by freedesktop.org and Flathub. --- Makefile.am | 6 +++--- denemo.spec.in | 4 ++-- ...ta.xml.in => org.denemo.Denemo.appdata.xml.in | 0 pixmaps/Makefile.am | 4 ++-- ...{denemo.desktop => org.denemo.Denemo.desktop} | 2 +- pixmaps/org.denemo.Denemo.png | Bin 0 -> 5630 bytes po/POTFILES.in | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename denemo.appdata.xml.in => org.denemo.Denemo.appdata.xml.in (100%) rename pixmaps/{denemo.desktop => org.denemo.Denemo.desktop} (96%) create mode 100644 pixmaps/org.denemo.Denemo.png diff --git a/Makefile.am b/Makefile.am index 3ab1e36d6..20ba74199 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ @INTLTOOL_XML_RULE@ appdatadir = $(datarootdir)/appdata appdata_DATA = $(appdata_in_files:.xml.in=.xml) -appdata_in_files = denemo.appdata.xml.in +appdata_in_files = org.denemo.Denemo.appdata.xml.in SUBDIRS = \ tools \ @@ -32,7 +32,7 @@ EXTRA_DIST = \ intltool-merge.in \ intltool-update.in \ po/$(GETTEXT_PACKAGE).pot \ - denemo.appdata.xml.in + org.denemo.Denemo.appdata.xml.in MAINTAINERCLEANFILES = \ Makefile.in \ @@ -91,7 +91,7 @@ potfile: @rm -f $(srcdir)/po/POTFILES.skip @cd $(srcdir) && find src -name '*.c' -o -name '*.h' ! -name 'pathconfig.h' | sort >> po/POTFILES.in @cd $(srcdir) && find actions -name '*.xml' -o -name '*.scm' | sort >> po/POTFILES.in - @cd $(srcdir) && echo denemo.appdata.xml.in >> po/POTFILES.in + @cd $(srcdir) && echo org.denemo.Denemo.appdata.xml.in >> po/POTFILES.in @cd $(srcdir) && find tools -name '*.c' -o -name '*.h' | sort >> po/POTFILES.skip @cd $(srcdir) && find src -name 'pathconfig.h' | sort >> po/POTFILES.skip @cd $(srcdir) && find src -name 'lilypond.lang' | sort >> po/POTFILES.skip diff --git a/denemo.spec.in b/denemo.spec.in index aba5718b3..bae888ca8 100644 --- a/denemo.spec.in +++ b/denemo.spec.in @@ -40,7 +40,7 @@ make install DESTDIR=$RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT/%{prefix}/include desktop-file-install --vendor="" \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ -%{buildroot}/%{_datadir}/applications/denemo.desktop +%{buildroot}/%{_datadir}/applications/org.denemo.Denemo.desktop %find_lang %{name} %clean @@ -52,7 +52,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/denemo %{_datadir}/icons/denemo.png %{_datadir}/fonts/truetype/denemo -%{_datadir}/applications/denemo.desktop +%{_datadir}/applications/org.denemo.Denemo.desktop %{_bindir}/denemo %doc COPYING README README.lilypond ChangeLog diff --git a/denemo.appdata.xml.in b/org.denemo.Denemo.appdata.xml.in similarity index 100% rename from denemo.appdata.xml.in rename to org.denemo.Denemo.appdata.xml.in diff --git a/pixmaps/Makefile.am b/pixmaps/Makefile.am index d05133ea1..3df32331c 100644 --- a/pixmaps/Makefile.am +++ b/pixmaps/Makefile.am @@ -135,10 +135,10 @@ icon-rest-4.svg \ icon-rest-5.svg icondir=$(datadir)/pixmaps -icon_DATA=$(srcdir)/denemo.png +icon_DATA=$(srcdir)/org.denemo.Denemo.png desktopdir = $(datadir)/applications -desktop_DATA = denemo.desktop +desktop_DATA = org.denemo.Denemo.desktop EXTRA_DIST = $(pixmaps_DATA) $(icon_DATA) $(desktop_DATA) CLEANFILES = *~ #*# diff --git a/pixmaps/denemo.desktop b/pixmaps/org.denemo.Denemo.desktop similarity index 96% rename from pixmaps/denemo.desktop rename to pixmaps/org.denemo.Denemo.desktop index b9959f97d..12d03d70e 100644 --- a/pixmaps/denemo.desktop +++ b/pixmaps/org.denemo.Denemo.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Exec=denemo %F -Icon=denemo +Icon=org.denemo.Denemo StartupNotify=true Terminal=false Type=Application diff --git a/pixmaps/org.denemo.Denemo.png b/pixmaps/org.denemo.Denemo.png new file mode 100644 index 0000000000000000000000000000000000000000..0f9b04a5d8e21aa9f616e3dcc43beea7ac24410e GIT binary patch literal 5630 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 YKM2Hzz|kMcU;qFB07*qoM6N<$g4&V%wg3PC literal 0 HcmV?d00001 diff --git a/po/POTFILES.in b/po/POTFILES.in index a2845f532..0fb37df3e 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -2380,4 +2380,4 @@ actions/palettes.xml actions/quote.l.scm actions/silex.scm actions/Simple.scm -denemo.appdata.xml.in +org.denemo.Denemo.appdata.xml.in -- 2.31.1
