Commit graph

79 commits

Author SHA1 Message Date
Jehan cadde8fbff desktop: adding test-desktop.sh in EXTRA_DIST.
Otherwise make check would fail from distributed packages (e.g. make
distcheck)!
2018-05-20 19:20:46 +02:00
Michael Natterer c34eb2bf8f desktop: clarify where the feature policy is relaxed: "stable micro releases" 2018-05-20 18:31:09 +02:00
Jehan 7a27d81eba configure, desktop: fix desktop-file-validate test.
Double copy-paste error! Must have been sleep-coding.
2018-05-20 18:10:00 +02:00
Jehan 4b34dde0b7 desktop: fix and uncomment the 2.10.2 <release> tag.
Argh! Apologies to translators! I completely forgot to uncomment this
tag, so this text would not have appeared on your radars sooner!
2018-05-20 17:58:14 +02:00
Jehan 660926eb3d desktop: add a desktop file test with desktop-file-validate utils. 2018-05-13 15:57:28 +02:00
Jehan 0492157dd2 desktop: remove the double <releases> trick.
This was added in commits 447d9bbc56 and fb6328b9ad.
With it, the validation succeeds. Still I am actually not sure that is
proper appdata format. Also we have issues of metadata not shown for our
flatpak package, and I am wondering if this could be the issue.
So let's get rid of this hack.

Also temporarily commenting out the appdata unit test because it fails
without, because of a bug in appstream-util. This bug has been fixed
since, but there are no releases containing this fix yet.
See: https://github.com/hughsie/appstream-glib/issues/234
We'll reactivate the tests later.
2018-05-13 15:34:54 +02:00
Jehan 39a1680043 desktop: preparing appdata <release> tag for 2.10.2.
Please everyone, review and update before we comment the tag out, hence
pushing for translations.
2018-05-11 23:24:29 +02:00
Jehan 0c4cbbfffa Revert "desktop: add an <icon> tag in appdata."
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.
2018-04-28 18:03:07 +02:00
Jehan e5dcd80957 desktop: add an <icon> tag in appdata.
Apparently not having it is a problem (at least for flathub), even
though we already had this information in the desktop file.
See: https://github.com/flathub/org.gimp.GIMP/issues/8
2018-04-28 12:18:03 +02:00
Jehan 9cb91971ea desktop: update release date… again…
Let's hope it's the last time!
2018-04-27 02:59:57 +02:00
Jehan 6057828582 desktop: use tilde for 'rc' separation in version scheme.
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.
2018-04-26 13:24:06 +02:00
Jehan bd86c5f603 desktop, NEWS: release date and NEWS updated. 2018-04-26 00:50:44 +02:00
Jehan fb6328b9ad desktop: preparing appdata for 2.10.0 release.
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
2018-04-25 20:10:53 +02:00
Jehan 21f891955f desktop: fix a few links and a release date in appdata file. 2018-04-24 04:46:37 +02:00
Jehan 12ec7976d5 NEWS, desktop: small fixes in NEWS and in <release> appdata. 2018-04-11 01:15:52 +02:00
Jehan 0a1dd37719 desktop: preparing a new <release> tag for 2.10.0 RC2. 2018-04-11 01:12:19 +02:00
Alexandre Prokoudine dd77b05967 2.10: updates for appdata 2018-04-10 21:18:09 +03:00
Jehan f6255ae70b desktop: changes in appdata and 2.10 <release> now uncommented.
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!
2018-04-10 16:56:27 +02:00
Jeremy Bicha f242bf4d92 appdata: Install appstream metadata to non-deprecated directory
https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location

https://bugzilla.gnome.org/show_bug.cgi?id=794884
2018-04-02 01:09:21 +02:00
Michael Natterer 347acb16d3 desktop: add gimp-data-extras.metainfo.xml to .gitignore
and some cosmetic cleanup in Makefile.am
2018-03-30 15:53:19 +02:00
Jehan 2cf6d88ac1 desktop: 2.10.0-rc1 will actually be released on the 26th. 2018-03-26 01:31:26 +02:00
Jehan 6a825f18bb desktop, po: also update the appdata description.
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.
2018-03-25 14:44:42 +02:00
Jehan f8de23877f desktop: so the accurate naming of the release is "2.10.0-rc1". 2018-03-25 14:31:57 +02:00
Jehan c0343a5969 desktop: update the release date.
Seems it will be today after all!
2018-03-25 14:23:28 +02:00
Jehan a9c3b4c54d desktop: add a <release> tag for GIMP 2.10 RC1. 2018-03-23 19:48:40 +01:00
Jehan 1eedbdc942 desktop: <release> tag texts for upcoming 2.10 reworded a bit. 2018-03-17 16:31:47 +01:00
Michael Natterer 447d9bbc56 desktop: make org.gimp.GIMP.appdata.xml validate again
This commit is to be reverted when the fix for

https://github.com/hughsie/appstream-glib/issues/222

has been released and we can depend on it.
2018-02-22 00:13:53 +01:00
Jehan 1750d97b11 desktop: make the <release> tag texts translatable. 2018-02-01 19:53:36 +01:00
Jehan 5fc91e92e1 desktop: fix the appstream unit tests.
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.
2018-02-01 17:45:05 +01:00
Jehan 78f251b0a7 Bug 779839 - Add <releases>-Tag to the gimp.appdata.xml.in.
- 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.
2018-02-01 17:45:05 +01:00
Nathaniel Graham 6d26f78cd6 desktop: added release information to the AppStream file...
... pre-populated with release notes from version 2.9.8.
2018-02-01 17:45:05 +01:00
Jehan abc1fbde79 desktop: minor appdata <release> tag update.
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.
2018-01-29 16:53:31 +01:00
Jehan 458e313000 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!).
2018-01-14 03:54:17 +01:00
Jehan 54dda25cfc desktop: update the appdata to take care of the id 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.
»
2018-01-14 02:35:34 +01:00
Nathaniel Graham d39f7d6fbe Bug 791861 - Update appdata.xml AppStream ID to match rDNS-style...
... 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.
»
2018-01-14 02:35:34 +01:00
Jehan a017668b09 desktop: add (commented-out) release tag for 2.10.
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.
2017-12-27 23:04:26 +01:00
Jehan 3595ef9dc5 desktop: add <release> tags for 2.8.x.
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.
2017-12-27 22:14:42 +01:00
Jehan b9c2c9ac59 desktop: use HTTPS everywhere.
We now use HTTPS everywhere on the website. The link would be anyway
redirected, but we may as well write down the good link directly.
2017-12-27 03:35:38 +01:00
Jehan 60f09c3482 desktop: make the appstream metainfo file translatable.
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`.
2017-06-17 04:31:22 +02:00
Jiri Eischmann 46843c840b Bug 763398 - Shipping AppStream metadata file for gimp-data-extras 2017-06-17 03:33:16 +03:00
Michael Natterer f3d827d082 desktop: add test-appdata.sh to EXTRA_DIST 2017-06-02 19:40:17 +02:00
Jehan 7e25248f3c desktop: add a test for strict validation of appdata file.
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).
2017-05-23 17:43:01 +02:00
Jehan 7e22488848 desktop: use https for everything, even the screenshots.
Even though there is automatic redirection anyway, better to explicitly
set https. :-)
2017-05-23 16:09:29 +02:00
Jehan 7d2edec2b5 Bug 782759 - strict validation of appdata file fails.
Adding a second screenshot showing painting capabilities.
2017-05-22 23:32:50 +02:00
Jehan c4701c484a Bug 782759 - strict validation of appdata file fails.
Thanks to a new photo-editing screenshot from Patrick David.
A second screenshot for painting coming up soon as well.
2017-05-22 22:32:32 +02:00
Jehan 5b4dcbfb3e Bug 782759 - strict validation of appdata file fails.
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.
2017-05-18 14:18:12 +02:00
Piotr Drąg 1f9451b878 desktop: fix keywords
The semicolons should be used instead of spaces if we want
it to work and validate.

Also adds a translator comment to avoid broken translations.
2016-09-22 19:04:03 +02:00
Jehan 472608fe75 desktop: add "GIMP" in keywords to fix search with flatpak.
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.
2016-09-22 14:24:35 +02:00
Jehan 8a37c928eb app, plug-ins, libgimp*: clean out all remaining trailing spaces/tabs.
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.
2016-06-02 02:04:26 +02:00
Richard Hughes cfa6f58d0e Add a missing tag to the AppData file 2016-01-25 16:22:23 +00:00