configure, desktop: update the bug report URL.

Also make so that the metadata URL is taken from the one of the package
set with configure.

(cherry picked from commit 6ebff7b3c5)
This commit is contained in:
Jehan
2018-05-25 15:05:47 +02:00
parent 2511286e43
commit 117beee244
6 changed files with 12 additions and 8 deletions

View File

@ -99,9 +99,10 @@ The best way to submit patches is to provide files created with
git-format-patch. git-format-patch.
It is recommended that you file a bug report at It is recommended that you file a bug report at
http://bugzilla.gnome.org/ and attach your patch to it as a plain text https://gitlab.gnome.org/GNOME/gimp
file, not compressed. If your patch is reasonably small you can submit and either create a merge request or attach your patch to it as a plain
it to the gimp-developer-list@gnome.org mailing list. text file, not compressed. If your patch is reasonably small you can
submit it to the gimp-developer-list@gnome.org mailing list.
If the patch needs to be discussed, you should also consider using the If the patch needs to be discussed, you should also consider using the
mailing list instead of Bugzilla because bug reports tend to be hard mailing list instead of Bugzilla because bug reports tend to be hard

View File

@ -88,7 +88,7 @@ m4_define([libheif_required_version], [1.1.0])
m4_define([xgettext_recommended_version], [0.19]) m4_define([xgettext_recommended_version], [0.19])
AC_INIT([GIMP], [gimp_version], AC_INIT([GIMP], [gimp_version],
[http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP], [https://gitlab.gnome.org/GNOME/gimp/issues/new],
[gimp]) [gimp])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
@ -2312,8 +2312,10 @@ if test "x$with_bug_report_url" = "x"; then
with_bug_report_url="$PACKAGE_BUGREPORT" with_bug_report_url="$PACKAGE_BUGREPORT"
fi fi
BUG_REPORT_URL="$with_bug_report_url"
AC_DEFINE_UNQUOTED(BUG_REPORT_URL, "$with_bug_report_url", AC_DEFINE_UNQUOTED(BUG_REPORT_URL, "$with_bug_report_url",
[The URL to open in order to report bugs]) [The URL to open in order to report bugs])
AC_SUBST(BUG_REPORT_URL)
override_bug_report_url= override_bug_report_url=
if test "x$with_bug_report_url" = "x$PACKAGE_BUGREPORT"; then if test "x$with_bug_report_url" = "x$PACKAGE_BUGREPORT"; then
@ -2769,6 +2771,7 @@ data/tool-presets/Paint/Makefile
data/tool-presets/Selection/Makefile data/tool-presets/Selection/Makefile
data/tool-presets/Sketch/Makefile data/tool-presets/Sketch/Makefile
desktop/Makefile desktop/Makefile
desktop/gimp-data-extras.metainfo.xml.in
desktop/gimp.desktop.in desktop/gimp.desktop.in
desktop/org.gimp.GIMP.appdata.xml.in desktop/org.gimp.GIMP.appdata.xml.in
etc/Makefile etc/Makefile

View File

@ -6,7 +6,7 @@
<_name>Extra files for GIMP</_name> <_name>Extra files for GIMP</_name>
<_summary>Patterns, gradients, and other extra files for GIMP</_summary> <_summary>Patterns, gradients, and other extra files for GIMP</_summary>
<url type="homepage">http://www.gimp.org/</url> <url type="homepage">http://www.gimp.org/</url>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=GIMP</url> <url type="bugtracker">@BUG_REPORT_URL@</url>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license> <project_license>GPL-3.0+</project_license>
<update_contact>alexandre.prokoudine@gmail.com</update_contact> <update_contact>alexandre.prokoudine@gmail.com</update_contact>

View File

@ -35,7 +35,7 @@
Microsoft Windows and OS X. Microsoft Windows and OS X.
</_p> </_p>
</description> </description>
<url type="bugtracker">https://bugzilla.gnome.org/page.cgi?id=browse.html&amp;product=GIMP</url> <url type="bugtracker">@BUG_REPORT_URL@</url>
<url type="donation">https://www.gimp.org/donating/</url> <url type="donation">https://www.gimp.org/donating/</url>
<url type="help">https://www.gimp.org/docs/</url> <url type="help">https://www.gimp.org/docs/</url>
<url type="homepage">https://www.gimp.org/</url> <url type="homepage">https://www.gimp.org/</url>

View File

@ -3,7 +3,7 @@ bugzilla-milestones.txt
This document describes how the GIMP project uses milestones in the This document describes how the GIMP project uses milestones in the
Bugzilla bugtracker found at: Bugzilla bugtracker found at:
https://bugzilla.gnome.org/browse.cgi?product=GIMP. https://gitlab.gnome.org/GNOME/gimp
Stable milestone Stable milestone

View File

@ -4,7 +4,7 @@
[encoding: UTF-8] [encoding: UTF-8]
desktop/org.gimp.GIMP.appdata.xml.in.in desktop/org.gimp.GIMP.appdata.xml.in.in
desktop/gimp-data-extras.metainfo.xml.in desktop/gimp-data-extras.metainfo.xml.in.in
desktop/gimp.desktop.in.in desktop/gimp.desktop.in.in
app/about.h app/about.h