diff --git a/meson.build b/meson.build index 735dfc72..b71733e6 100644 --- a/meson.build +++ b/meson.build @@ -63,6 +63,13 @@ config_h = configuration_data() package_bugreport = 'http://bugzilla.gnome.org/enter_bug.cgi?product=' + meson.project_name() +# release tag for the about dialog and metainfo release infos +if development_release + release_tag = calendar_version.replace('.', '~') +else + release_tag = calendar_version +endif + # package set_defines = [ ['PACKAGE', meson.project_name()], @@ -71,7 +78,8 @@ set_defines = [ ['PACKAGE_STRING', '@0@ @1@'.format(meson.project_name(), calendar_version)], ['PACKAGE_TARNAME', meson.project_name()], ['PACKAGE_URL', 'https://apps.gnome.org/Calendar/'], - ['MAJOR_VERSION', calendar_major_version + '.' + '0'], + ['MAJOR_VERSION', calendar_major_version], + ['RELEASE_TAG', release_tag], ['PACKAGE_VERSION', calendar_version + rev], ['VERSION', calendar_version + rev], ['GETTEXT_PACKAGE', meson.project_name()], diff --git a/src/appdata/org.gnome.Calendar.metainfo.xml.in.in b/src/appdata/org.gnome.Calendar.metainfo.xml.in.in index 48fab2e0..3ab9e1f8 100644 --- a/src/appdata/org.gnome.Calendar.metainfo.xml.in.in +++ b/src/appdata/org.gnome.Calendar.metainfo.xml.in.in @@ -115,6 +115,8 @@ gbsneto@gnome.org + +

diff --git a/src/gui/gcal-application.c b/src/gui/gcal-application.c index 03a00a46..b0917cc4 100644 --- a/src/gui/gcal-application.c +++ b/src/gui/gcal-application.c @@ -242,7 +242,7 @@ gcal_application_show_about (GSimpleAction *simple, copyright = build_about_copyright (self); troubleshooting = build_system_information (); - about = adw_about_dialog_new_from_appdata ("/org/gnome/calendar/appdata", MAJOR_VERSION); + about = adw_about_dialog_new_from_appdata ("/org/gnome/calendar/appdata", RELEASE_TAG); adw_about_dialog_set_designers (ADW_ABOUT_DIALOG (about), designers); adw_about_dialog_set_copyright (ADW_ABOUT_DIALOG (about), copyright);