[gimp/gimp-2-10] configure, desktop: update the bug report URL.

[Jehan <jehanp src gnome org>]

commit 117beee244a56e7343fa5848183c73816cb32af8
Author: Jehan <jehan girinstud io>
Date:   Fri May 25 15:05:47 2018 +0200

    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 6ebff7b3c5df9e6ecc2c9d378452697ec37e788b)

 HACKING                                                            | 7 ++++---
 configure.ac                                                       | 5 ++++-
 ...-extras.metainfo.xml.in => gimp-data-extras.metainfo.xml.in.in} | 2 +-
 desktop/org.gimp.GIMP.appdata.xml.in.in                            | 2 +-
 devel-docs/bugzilla-milestones.txt                                 | 2 +-
 po/POTFILES.in                                                     | 2 +-
 6 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/HACKING b/HACKING
index b4eb9273e5..9bffd0a8bd 100644
--- a/HACKING
+++ b/HACKING
@@ -99,9 +99,10 @@ The best way to submit patches is to provide files created with
 git-format-patch.
 
 It is recommended that you file a bug report at
-http://bugzilla.gnome.org/ and attach your patch to it as a plain text
-file, not compressed. If your patch is reasonably small you can submit
-it to the gimp-developer-list gnome org mailing list.
+https://gitlab.gnome.org/GNOME/gimp
+and either create a merge request or attach your patch to it as a plain
+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
 mailing list instead of Bugzilla because bug reports tend to be hard
diff --git a/configure.ac b/configure.ac
index c0008ea756..3d27ed1563 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ m4_define([libheif_required_version], [1.1.0])
 m4_define([xgettext_recommended_version], [0.19])
 
 AC_INIT([GIMP], [gimp_version],
-        [http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP],
+        [https://gitlab.gnome.org/GNOME/gimp/issues/new],
         [gimp])
 
 AC_CONFIG_HEADERS([config.h])
@@ -2312,8 +2312,10 @@ if test "x$with_bug_report_url" = "x"; then
   with_bug_report_url="$PACKAGE_BUGREPORT"
 fi
 
+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])
+AC_SUBST(BUG_REPORT_URL)
 
 override_bug_report_url=
 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/Sketch/Makefile
 desktop/Makefile
+desktop/gimp-data-extras.metainfo.xml.in
 desktop/gimp.desktop.in
 desktop/org.gimp.GIMP.appdata.xml.in
 etc/Makefile
diff --git a/desktop/gimp-data-extras.metainfo.xml.in b/desktop/gimp-data-extras.metainfo.xml.in.in
similarity index 86%
rename from desktop/gimp-data-extras.metainfo.xml.in
rename to desktop/gimp-data-extras.metainfo.xml.in.in
index 0d7cc39594..47b355a6f1 100644
--- a/desktop/gimp-data-extras.metainfo.xml.in
+++ b/desktop/gimp-data-extras.metainfo.xml.in.in
@@ -6,7 +6,7 @@
   <_name>Extra files for GIMP</_name>
   <_summary>Patterns, gradients, and other extra files for GIMP</_summary>
   <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>
   <project_license>GPL-3.0+</project_license>
   <update_contact>alexandre prokoudine gmail com</update_contact>
diff --git a/desktop/org.gimp.GIMP.appdata.xml.in.in b/desktop/org.gimp.GIMP.appdata.xml.in.in
index 3139756cb1..57c47a0084 100644
--- a/desktop/org.gimp.GIMP.appdata.xml.in.in
+++ b/desktop/org.gimp.GIMP.appdata.xml.in.in
@@ -35,7 +35,7 @@
       Microsoft Windows and OS X.
     </_p>
   </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="help">https://www.gimp.org/docs/</url>
   <url type="homepage">https://www.gimp.org/</url>
diff --git a/devel-docs/bugzilla-milestones.txt b/devel-docs/bugzilla-milestones.txt
index 8309fdd0f9..aca5125e13 100644
--- a/devel-docs/bugzilla-milestones.txt
+++ b/devel-docs/bugzilla-milestones.txt
@@ -3,7 +3,7 @@ bugzilla-milestones.txt
 
 This document describes how the GIMP project uses milestones in the
 Bugzilla bugtracker found at:
-https://bugzilla.gnome.org/browse.cgi?product=GIMP.
+https://gitlab.gnome.org/GNOME/gimp
 
 
 Stable milestone
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 61a4ee7724..db7ac17ea2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,7 +4,7 @@
 [encoding: UTF-8]
 
 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
 
 app/about.h