Commit 458e3130 authored by Jehan's avatar Jehan

Rename gimp.appdata.xml.in to org.gimp.GIMP.appdata.xml.in.in.

I completely forgot to rename the appstream file according to the new
ID. While doing so, I also make it a .in.in file, with initial
processing by the autotools. Indeed I need @GIMP_COMMAND@ to be replaced
by AC_CONFIG_FILES().
Finally I fix a badly closed XML tag (which reminds me I should always
test a commit, even when it's a simple non-C 1-liner change!).
parent b1d413db
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
"sdk": "org.gnome.Sdk", "sdk": "org.gnome.Sdk",
"command": "gimp-2.9", "command": "gimp-2.9",
"rename-desktop-file": "gimp.desktop", "rename-desktop-file": "gimp.desktop",
"rename-appdata-file": "gimp.appdata.xml",
"rename-icon": "gimp", "rename-icon": "gimp",
"finish-args": ["--share=ipc", "--socket=x11", "--share=network", "finish-args": ["--share=ipc", "--socket=x11", "--share=network",
"--filesystem=host", "--filesystem=xdg-config/GIMP", "--filesystem=host", "--filesystem=xdg-config/GIMP",
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
"sdk": "org.gnome.Sdk", "sdk": "org.gnome.Sdk",
"command": "gimp-2.9", "command": "gimp-2.9",
"rename-desktop-file": "gimp.desktop", "rename-desktop-file": "gimp.desktop",
"rename-appdata-file": "gimp.appdata.xml",
"rename-icon": "gimp", "rename-icon": "gimp",
"finish-args": ["--share=ipc", "--socket=x11", "--share=network", "finish-args": ["--share=ipc", "--socket=x11", "--share=network",
"--filesystem=host", "--filesystem=xdg-config/GIMP", "--filesystem=host", "--filesystem=xdg-config/GIMP",
......
...@@ -2672,6 +2672,7 @@ data/tool-presets/Selection/Makefile ...@@ -2672,6 +2672,7 @@ data/tool-presets/Selection/Makefile
data/tool-presets/Sketch/Makefile data/tool-presets/Sketch/Makefile
desktop/Makefile desktop/Makefile
desktop/gimp.desktop.in desktop/gimp.desktop.in
desktop/org.gimp.GIMP.appdata.xml.in
etc/Makefile etc/Makefile
m4macros/Makefile m4macros/Makefile
po/Makefile.in po/Makefile.in
......
/Makefile.in /Makefile.in
/Makefile /Makefile
/gimp.appdata.xml /org.gimp.GIMP.appdata.xml.in
/org.gimp.GIMP.appdata.xml
/gimp.desktop.in /gimp.desktop.in
/gimp.desktop /gimp.desktop
/.thumbnails /.thumbnails
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
desktop_in_files = gimp.desktop.in.in desktop_in_files = gimp.desktop.in.in
desktop_files = $(desktop_in_files:.desktop.in.in=.desktop) desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
appstream_in_files = gimp.appdata.xml.in gimp-data-extras.metainfo.xml.in appstream_in_files = org.gimp.GIMP.appdata.xml.in gimp-data-extras.metainfo.xml.in
appstream_files = $(appstream_in_files:.xml.in=.xml) appstream_files = $(appstream_in_files:.xml.in=.xml)
if DESKTOP_DATADIR if DESKTOP_DATADIR
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<!-- Fix the ID renaming, and things like past reviews made on the <!-- Fix the ID renaming, and things like past reviews made on the
older ID in software installers. --> older ID in software installers. -->
<id>gimp.desktop</id> <id>gimp.desktop</id>
<provides> </provides>
<releases> <releases>
<!-- <!--
......
#!/bin/sh #!/bin/sh
appstream-util validate-strict ${GIMP_TESTING_ABS_TOP_SRCDIR}/desktop/gimp.appdata.xml.in appstream-util validate-strict ${GIMP_TESTING_ABS_TOP_SRCDIR}/desktop/org.gimp.GIMP.appdata.xml.in.in
appstream-util validate-strict ${GIMP_TESTING_ABS_TOP_SRCDIR}/desktop/gimp-data-extras.metainfo.xml.in appstream-util validate-strict ${GIMP_TESTING_ABS_TOP_SRCDIR}/desktop/gimp-data-extras.metainfo.xml.in
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
to sort out issues with their builds. to sort out issues with their builds.
( ) If this is a stable release, make sure we have a <release> tag ( ) If this is a stable release, make sure we have a <release> tag
inside desktop/gimp.appdata.xml.in for this upcoming version. Some inside desktop/org.gimp.GIMP.appdata.xml.in for this upcoming version.
installers may feature more prominently software with recent Some installers may feature more prominently software with recent
releases if the appropriate tag was set (e.g. GNOME Software has a releases if the appropriate tag was set (e.g. GNOME Software has a
"Recent Releases" category). "Recent Releases" category).
If a description is added, it may be featured in installers and If a description is added, it may be featured in installers and
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
[encoding: UTF-8] [encoding: UTF-8]
desktop/gimp.appdata.xml.in desktop/org.gimp.GIMP.appdata.xml.in.in
desktop/gimp-data-extras.metainfo.xml.in desktop/gimp-data-extras.metainfo.xml.in
desktop/gimp.desktop.in.in desktop/gimp.desktop.in.in
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment