From dce0ef0eabd634044ed504a75fe5ec02edae66f4 Mon Sep 17 00:00:00 2001
From: Morten Welinder <terra@gnome.org>
Date: Tue, 22 May 2018 18:19:02 -0400
Subject: [PATCH] Update links

---
 BUGS                    | 2 +-
 README                  | 8 ++++----
 configure.ac            | 2 +-
 gnumeric.appdata.xml.in | 2 +-
 gnumeric.doap           | 6 ++++--
 tools/news-to-html      | 6 ++++--
 6 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/BUGS b/BUGS
index d16d02444..70991bbd8 100644
--- a/BUGS
+++ b/BUGS
@@ -1,4 +1,4 @@
-   To report Gnumeric bugs, please visit bugzilla.gnome.org.
+   To report Gnumeric bugs, please visit https://gitlab.gnome.org/GNOME/gnumeric/issues
 
     This file is used as a scratch pad by developers.  It is a list of known
 issues that need to be addressed.  Divided into, things that will prevent
diff --git a/README b/README
index 3984ea581..83d161cd6 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ The project aims to become a drop in replacement for proprietary spreadsheets.
 If you are interested in contributing to its development please send us some
 email, there are lots of projects available.
 
-To report Gnumeric bugs, please visit bugzilla.gnome.org.
+To report Gnumeric bugs, please visit https://gitlab.gnome.org/GNOME/gnumeric/issues
 
 Gnumeric is licensed under the terms of the GNU GPL included in the
 file COPYING.
@@ -14,10 +14,10 @@ Requirements
 ------------
 
 You need:				Debian package name
-	glib		>= 2.38.0	libglib2.0-dev
+	glib		>= 2.40.0	libglib2.0-dev
 	gtk+		>= 3.8.7	libgtk3.0-dev
-	libgsf		>= 1.14.24	libgsf-1-dev
-	libgoffice	>= 0.10.9	libgoffice-0-8-dev
+	libgsf		>= 1.14.33	libgsf-1-dev
+	libgoffice	>= 0.10.42	libgoffice-0-8-dev
 	gnome-xml   	>= 2.4.12	libxml2-dev
 	pango		>= 1.24.0	libpango1.0-dev
 	NOTE: gnome-xml is also known as libxml
diff --git a/configure.ac b/configure.ac
index 546b57d28..57b2bb1d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ m4_define([BIG_CHECKING], [AC_MSG_CHECKING([
 ======== $1])])
 
 AC_INIT([gnumeric], [gnumeric_version_full],
-	[https://bugzilla.gnome.org/enter_bug.cgi?product=gnumeric],,
+	[https://gitlab.gnome.org/GNOME/gnumeric/issues],,
 	[http://www.gnumeric.org/])
 
 AC_CONFIG_SRCDIR(src/sheet.h)
diff --git a/gnumeric.appdata.xml.in b/gnumeric.appdata.xml.in
index fc43de8f7..c978d2016 100644
--- a/gnumeric.appdata.xml.in
+++ b/gnumeric.appdata.xml.in
@@ -24,7 +24,7 @@ files with Microsoft Excel and programs supporting the ODS standard.</_p>
   </kudos>
   <project_group>GNOME</project_group>
   <_developer_name>The Gnumeric Team</_developer_name>
-  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=gnumeric</url>
+  <url type="bugtracker">https://gitlab.gnome.org/GNOME/gnumeric/issues</url>
   <!-- These guys need your donations more than we do: -->
   <url type="donation">http://www.amnestyusa.org/</url>
   <url type="help">https://help.gnome.org/users/gnumeric/stable/gnumeric.html</url>
diff --git a/gnumeric.doap b/gnumeric.doap
index 71ef8508c..7c2fda11d 100644
--- a/gnumeric.doap
+++ b/gnumeric.doap
@@ -6,12 +6,14 @@
 
   <name xml:lang="en">Gnumeric</name>
   <shortdesc xml:lang="en">The Gnome Office Spreadsheet - Free, Fast, Accurate: Pick any 3!</shortdesc>
+  <description>Gnumeric is a spreadsheet application aiming to be Free, Fast, and Accurate.</description>
   <homepage rdf:resource="http://www.gnumeric.org/" />
   <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnumeric-list" />
   <download-page rdf:resource="http://download.gnome.org/sources/gnumeric/" />
-  <bug-database rdf:resource="http://bugzilla.gnome.org/browse.cgi?product=gnumeric" />
+  <bug-database rdf:resource="https://gitlab.gnome.org/GNOME/gnumeric/issues" />
 
-  <category rdf:resource="http://api.gnome.org/doap-extensions#productivity" />
+  <category rdf:resource="http://api.gnome.org/doap-extensions#apps" />
+  <programming-language>C</programming-language>
 
   <maintainer>
     <foaf:Person>
diff --git a/tools/news-to-html b/tools/news-to-html
index 213640da5..b5951db5b 100644
--- a/tools/news-to-html
+++ b/tools/news-to-html
@@ -9,7 +9,8 @@ die "$0: must specify version number as argument.\n" unless $version;
 my $version2 = $version;
 $version2 =~ s/^(\d+\.\d+)\..*/$1/;
 
-my $bug_prefix = "https://bugzilla.gnome.org/show_bug.cgi?id=";
+my $bug_prefix = "https://gitlab.gnome.org/GNOME/gnumeric/issues/";
+my $bug_prefix_old = "https://bugzilla.gnome.org/show_bug.cgi?id=";
 my $debian_bug_prefix = "http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=";
 my $redhat_bug_prefix = "https://bugzilla.redhat.com/show_bug.cgi?id=";
 my $ubuntu_bug_prefix = "https://bugs.launchpad.net/ubuntu/+bug/";
@@ -106,7 +107,8 @@ sub add_to_item {
     $txt =~ s{Debian\s+\#(\d\d\d\d\d+)}{Debian <a href=\"$debian_bug_prefix$1\"\>Bug $1</a>}g;
     $txt =~ s{Redhat\s+\#(\d\d\d\d\d+)}{Redhat <a href=\"$redhat_bug_prefix$1\"\>Bug $1</a>}g;
     $txt =~ s{Ubuntu\s+\#(\d\d\d\d\d+)}{Ubuntu <a href=\"$ubuntu_bug_prefix$1\"\>Bug $1</a>}g;
-    $txt =~ s{\#(\d\d\d\d\d+)}{<a href=\"$bug_prefix$1\"\>Bug $1</a>}g;
+    $txt =~ s{\#(\d\d\d\d\d+)}{<a href=\"$bug_prefix_old$1\"\>Bug $1</a>}g;
+    $txt =~ s{\#(\d\d\d+)}{<a href=\"$bug_prefix$1\"\>Bug $1</a>}g;
 
     $item .= "\n\t      $txt";
     $have_item = 1;
-- 
2.11.4.GIT