1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-11 16:08:13 +00:00

Rename emacs.appdata.xml to emacs.metainfo.xml and add more data

* Makefile.in: Replace "appdata" with "metainfo".

This is the name currently recommended by the spec at
<https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html>.

* etc/emacs.metainfo.xml: Populate more fields, based on those
available in
https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html
(bug#48662).

Copyright-paperwork-exempt: yes
This commit is contained in:
Peter Oliver 2021-05-29 04:15:28 +02:00 committed by Lars Ingebrigtsen
parent 459f89f3bc
commit ee7752aac5
2 changed files with 26 additions and 13 deletions

View File

@ -185,8 +185,8 @@ x_default_search_path=@x_default_search_path@
# Where the etc/emacs.desktop file is to be installed. # Where the etc/emacs.desktop file is to be installed.
desktopdir=$(datarootdir)/applications desktopdir=$(datarootdir)/applications
# Where the etc/emacs.appdata.xml file is to be installed. # Where the etc/emacs.metainfo.xml file is to be installed.
appdatadir=$(datarootdir)/metainfo metainfodir=$(datarootdir)/metainfo
# Where the etc/emacs.service file is to be installed. # Where the etc/emacs.service file is to be installed.
# The system value (typically /usr/lib/systemd/user) can be # The system value (typically /usr/lib/systemd/user) can be
@ -721,11 +721,11 @@ install-etc:
${srcdir}/etc/emacsclient.desktop > $${tmp}; \ ${srcdir}/etc/emacsclient.desktop > $${tmp}; \
${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}.desktop"; \ ${INSTALL_DATA} $${tmp} "$(DESTDIR)${desktopdir}/$${client_name}.desktop"; \
rm -f $${tmp} rm -f $${tmp}
umask 022; ${MKDIR_P} "$(DESTDIR)${appdatadir}" umask 022; ${MKDIR_P} "$(DESTDIR)${metainfodir}"
tmp=etc/emacs.tmpappdata; rm -f $${tmp}; \ tmp=etc/emacs.tmpmetainfo; rm -f $${tmp}; \
sed -e "s/emacs\.desktop/${EMACS_NAME}.desktop/" \ sed -e "s/emacs\.desktop/${EMACS_NAME}.desktop/" \
${srcdir}/etc/emacs.appdata.xml > $${tmp}; \ ${srcdir}/etc/emacs.metainfo.xml > $${tmp}; \
${INSTALL_DATA} $${tmp} "$(DESTDIR)${appdatadir}/${EMACS_NAME}.appdata.xml"; \ ${INSTALL_DATA} $${tmp} "$(DESTDIR)${metainfodir}/${EMACS_NAME}.metainfo.xml"; \
rm -f $${tmp} rm -f $${tmp}
umask 022; $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)" umask 022; $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
tmp=etc/emacs.tmpservice; rm -f $${tmp}; \ tmp=etc/emacs.tmpservice; rm -f $${tmp}; \
@ -811,7 +811,7 @@ uninstall: uninstall-$(NTDIR) uninstall-doc
"hicolor/scalable/mimetypes/${EMACS_NAME}-document23.svg"; \ "hicolor/scalable/mimetypes/${EMACS_NAME}-document23.svg"; \
fi) fi)
-rm -f "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop" -rm -f "$(DESTDIR)${desktopdir}/${EMACS_NAME}.desktop"
-rm -f "$(DESTDIR)${appdatadir}/${EMACS_NAME}.appdata.xml" -rm -f "$(DESTDIR)${metainfodir}/${EMACS_NAME}.metainfo.xml"
-rm -f "$(DESTDIR)$(systemdunitdir)/${EMACS_NAME}.service" -rm -f "$(DESTDIR)$(systemdunitdir)/${EMACS_NAME}.service"
ifneq (,$(use_gamedir)) ifneq (,$(use_gamedir))
for file in snake-scores tetris-scores; do \ for file in snake-scores tetris-scores; do \

View File

@ -3,9 +3,9 @@
<component type="desktop-application"> <component type="desktop-application">
<id>org.gnu.emacs</id> <id>org.gnu.emacs</id>
<metadata_license>GFDL-1.3+</metadata_license> <metadata_license>GFDL-1.3+</metadata_license>
<project_license>GPL-3.0+ and GFDL-1.3+</project_license>
<name>GNU Emacs</name> <name>GNU Emacs</name>
<summary>An extensible text editor</summary> <summary>An extensible text editor</summary>
<icon type="remote" width="128" height="128">https://www.gnu.org/software/emacs/images/emacs.png</icon>
<description> <description>
<p> <p>
GNU Emacs is an extensible, customizable text editor - and more. GNU Emacs is an extensible, customizable text editor - and more.
@ -23,13 +23,26 @@
interface, calendar, and more</li> interface, calendar, and more</li>
</ul> </ul>
</description> </description>
<categories>
<category>Development</category>
<category>TextEditor</category>
</categories>
<url type="homepage">https://www.gnu.org/software/emacs</url>
<url type="bugtracker">https://debbugs.gnu.org/</url>
<url type="faq">https://www.gnu.org/software/emacs/manual/html_mono/efaq.html</url>
<url type="help">https://www.gnu.org/software/emacs/documentation.html</url>
<url type="donation">https://my.fsf.org/donate/</url>
<url type="contact">https://lists.gnu.org/mailman/listinfo/emacs-devel/</url>
<launchable type="desktop-id">emacs.desktop</launchable>
<launchable type="service">emacs.service</launchable>
<project_group>GNU</project_group>
<project_license>GPL-3.0+ and GFDL-1.3+</project_license>
<developer_name>Free Software Foundation</developer_name>
<screenshots> <screenshots>
<screenshot type="default"> <screenshot type="default">
<image type="source" width="632" height="354">https://www.gnu.org/software/emacs/images/appdata-26.png</image> <image type="source" width="632" height="354">https://www.gnu.org/software/emacs/images/appdata-26.png</image>
</screenshot> <caption>Editing a Lisp program whilst viewing the Emacs manual.</caption>
</screenshot>
</screenshots> </screenshots>
<launchable type="desktop-id">emacs</launchable>
<url type="homepage">https://www.gnu.org/software/emacs</url>
<update_contact>emacs-devel_AT_gnu.org</update_contact> <update_contact>emacs-devel_AT_gnu.org</update_contact>
<project_group>GNU</project_group>
</component> </component>