This reverts commit e5dcd80957.
So apparently this is not the right fix (for the original flatpak issue)
and we already have the icon specified in the desktop file.
Let's just cancel this commit until we understand better the problem.
In other words, number the release candidates: 2.10.0~rc*.
In any case, this makes `rpmdev-vercmp` to consider them before 2.10.0,
unlike using a hyphen separator.
Though I still leave the <releases> trick from commit fb6328b9ad so that
our unit test succeeds, since `appstream-util` still considers the other
order.
Adding today's (hopeful) date.
Also removing the trick from commit 447d9bbc56 because the bug in
appstream-util has been fixed, but adding the same trick elsewhere for
another bug in this validation script:
https://github.com/hughsie/appstream-glib/issues/234
I was hoping others would review this <release> text before submitting
it to translators, but no such luck there. Anyway let's uncomment now
because translators need to get the text sooner than later if we want as
many localized version of the appdata text as possible at release.
Everyone if you want to review the English and the contents of this tag,
do it now!
GIMP 2.10 is 2.10.0 and "2.10 RC1" is "2.10.0-RC1".
I also update directly the Polish msgid and msgstr (only language having
a translation on time, though it's our fault!) to avoid the translation
getting fuzzy uselessly.
I let the "rc" as lowercase in version property of <release> tag,
assuming the more official/parsable name should be lowercase. Not sure
if it makes sense.
The first validation command was actually failing but the test was not,
because only the last return value is taken into account, obviously. Add
a '&&' between the commands.
Also test against the built files, not the templates (in particular
because `appstream-util` doesn't like .in.in templates, and anyway it's
always better to test against the finale file).
Finally move to "validate-relax" test for the time being.
"validate-strict" actually makes a bunch of errors, but I can't make the
time to look at these now. Let's just settle with basic validation at
least.
- appstream-util returns a "style-invalid" error: "<ul> cannot start a
description [(null)]". So I add a <p> introduction to the 2.9.8
<release> tag. This was part of unit test failure on the appdata file.
- I also add a type property for 2.9.8. This is a new property which I
proposed and which just got accepted in the appstream specification:
https://github.com/ximion/appstream/pull/158
- I add <release> tags for all previous 2.9.x releases. No description
for these, just a type property. But feel free to propose patches
adding short non-technical description for these.
Note: it was originally proposed in the bug report to use the appdata
file in place of NEWS (and have this one generated from appdata). But
after discussion with appstream project, appdata is expected to be
concise, non-technical and more "marketing" than exhaustive. This is
quite a different usage than NEWS which is more an exhaustive summary of
new features and major changes. So these 2 files will likely remain
distinct.
Please everyone, review the contents of this <release> tag so that we
can quickly uncomment it and submit it for translation. This is what
will be featured in software installers. Let's make it a concise yet
interesting overview of the 2.10 release.
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!).
From AppStream docs:
«
In previous AppStream releases, the <id/> was used to associate metainfo
files with their .desktop files to merge in data from .desktop files
into the AppStream generator's final output. In modern metainfo files,
the component-ID for desktop-application components can be an arbitrary
string (matching the naming rules applying to all AppStream metadata),
while the <launchable/> tag is used to associate .desktop files with
their metainfo files.
»
... used for Flatpak.
Additional comments by Jehan after review:
«
This is not only to sync with flatpak. This format is the recommended
format in AppStream spec, even though many historical application still
use the old format.
If ever we decide to propose a dbus service, this may even become
required.
However just changing this is not enough for a proper ID change. I will
make additional change in further commits.
»
Let's start from here. I don't think it needs to be too long, just a
summary of the most awesome changes, I'd say.
Let's leave it commented out for now, until the description is finished
and ready for localization. This is the description which may appear in
software installers using appstream metadata.
Did a bit of archeology to get all the dates back.
I didn't add any description. Not sure if we should bother that much for
older versions (but most probably for upcoming version, would be
useful).
I also wanted to add URLs to the various news for each release, but
appstream-util would fail, telling that hyperlinks are not allowed
inside <p>. Unfortunately <release> tag cannot have a <url> child (nor a
property) according to appstream docs. So for now, I'll just stick to
date listing.
To have the name and summary translatable, rename as .in file, add
underscore on localizable tags and add to POTFILES.in.
Also clean out trailing whitespace and weird characters, add indentation
and fix tag s/updatecontact/update_contact/.
Finally add an appstream-util validation so that the file syntax is
checked during a `make check`.
This way we can be warned quickly about any AppStream issue (cf. bug
782759). This test requires web access for screenshot verification.
Packagers are invited to use --without-appdata-test option if they want
to skip the test (for instance if build environment has restricted
network access).
Command line: appstream-util validate-strict gimp.appdata.xml.in
This fixes only the following warning:
value-missing : <!-- Copyright [year] [name] --> is not present
Screenshot has not the right ratio. We will have to find one or more
replacement screenshots.
The only reason "gimp" can be used to search for the software (for
instance in GNOME overview) is because it is the Exec (the short name
is written neither in the Name nor Comment sections). When packaged by
systems like flatpak, this key is changed to `flatpak run ...` and
searching "gimp" does not even return the software!
Adding a Keywords entry to our desktop file fixes this.
Apart from "gimp", I take the opportunity to add other relevant keywords
from our website which currently would not display GIMP as a result:
graphic design illustration painting.
Rather than just discovering them by chance, a simple grep and some
search and replace are much more efficient! :-)
Cleaning only done on C and automake files.
Make gimp.doap compliant to the new DOAP file style (GUADEC 2014):
* Add new mandatory fields 'description' and 'programming-language'.
Add download page URL.
Add bug-tracker URL.
Add programming language.
Set category to Apps.
Move Sven Neumann from maintainer list to AUTHORS after querying him.
Unify description in gimp.doap and gimp.appdata.xml.in.
2008-01-06 Sven Neumann <sven@gimp.org>
* configure.in: compile a list of MIME types that GIMP can read.
* desktop/gimp.desktop.in.in: use the list of MIME types as
compiled by the configure script. Fixes bug #507318.
* desktop/Makefile.am
* desktop/gimp.applications.in
* desktop/gimp.keys.in: removed, the gimp.application and
gimp.keys files are obsolete.
* plug-ins/psd/psd.c (MAIN): corrected MIME type in unused code.
svn path=/trunk/; revision=24550
2007-09-03 Michael Natterer <mitch@gimp.org>
* data/tips/Makefile.am
* desktop/Makefile.am:
s/.intltool-merge-cachemake/.intltool-merge-cache/ to fix
distcheck, probably a "make" was entered in the wrong window.
svn path=/trunk/; revision=23450
2006-12-20 Sven Neumann <sven@gimp.org>
* configure.in: set variable GIMP_COMMAND depending on whether
gimp-remote is being built or not.
* desktop/gimp.applications.in (command)
* desktop/gimp.desktop.in.in (Exec): use @GIMP_COMMAND@. Fixes
bug #361768.
2006-08-24 Sven Neumann <sven@gimp.org>
* desktop/gimp.desktop.in.in (Categories): removed "Application"
which is not any longer in the Desktop Menu spec.
2006-07-26 Michael Natterer <mitch@gimp.org>
* desktop/gimp.desktop.in.in: added X-GNOME-Bugzilla-Component,
X-GNOME-Bugzilla-Version and X-GNOME-Bugzilla-OtherBinaries to
make new bug-buddy happy. Fixes bug #348859.
2006-04-03 Sven Neumann <sven@gimp.org>
* desktop/Makefile.am: added an install hook that touches the
toplevel icon theme directory as required by the spec.
2005-06-16 Sven Neumann <sven@gimp.org>
* INSTALL
* configure.in
* desktop/Makefile.am: allow to skip installation of desktop files
by passing --without-desktop-dir.
2005-06-16 Sven Neumann <sven@gimp.org>
Redid the framework that deals with installing desktop files.
Fixes bug #307705:
* data/misc/*: removed.
* desktop/*: readded the desktop files in a new directory.
* Makefile.am
* configure.in
* data/Makefile.am: changed accordingly.
Jehan