diff --git a/.gitignore b/.gitignore
index d390fd084..0caa0c05d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,7 +51,6 @@ py-compile
test-driver
INSTALL
-README
ChangeLog
/glib-lcov.info
/glib-lcov/
diff --git a/AUTHORS b/AUTHORS
index 17814caa1..16884db81 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,7 +1,7 @@
Below are just a few of the people who have contributed
to GLib. Please don't mail these people about problems you
-have with GTK+; see the README file for information about
-filing bugs and submitting patches.
+have with GLib; see the README.md file for information about
+filing bugs and submitting changes.
GLib-2.0 Team
-------------
diff --git a/README.commits b/CONTRIBUTING.md
similarity index 100%
rename from README.commits
rename to CONTRIBUTING.md
diff --git a/HACKING b/HACKING
index e04e0dcdd..7c130ab40 100644
--- a/HACKING
+++ b/HACKING
@@ -33,5 +33,5 @@ Note that autogen.sh runs configure for you. If you wish to pass
options like --prefix=/usr to configure you can give those options
to autogen.sh and they will be passed on to configure.
-For information about submitting patches see the README.commits file. For
+For information about submitting patches see the CONTRIBUTING.md file. For
information about major design decisions, see the README.rationale file.
diff --git a/Makefile.am b/Makefile.am
index 284d39590..a888e6df3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,8 +37,8 @@ EXTRA_DIST += \
NEWS.pre-1-3 \
acglib.m4 \
sanity_check \
- README.commits \
- README.in \
+ CONTRIBUTING.md \
+ README.md \
README.rationale \
INSTALL.in \
README.win32 \
@@ -110,7 +110,6 @@ EXTRA_DIST += $(meson_build_files)
# These may be in the builddir too
BUILT_EXTRA_DIST += \
- README \
INSTALL \
ChangeLog \
$(NULL)
diff --git a/README b/README
new file mode 100644
index 000000000..96dc92fbd
--- /dev/null
+++ b/README
@@ -0,0 +1 @@
+See README.md
diff --git a/README.in b/README.md
similarity index 96%
rename from README.in
rename to README.md
index 3e8b2e5fc..677f2dd86 100644
--- a/README.in
+++ b/README.md
@@ -1,7 +1,7 @@
General Information
===================
-This is GLib version @GLIB_VERSION@. GLib is the low-level core
+GLib is the low-level core
library that forms the basis for projects such as GTK+ and GNOME. It
provides data structure handling for C, portability wrappers, and
interfaces for such runtime functionality as an event loop, threads,
@@ -28,8 +28,8 @@ See the file 'INSTALL'
How to report bugs
==================
-Bugs should be reported to the GNOME bug tracking system.
-(http://bugzilla.gnome.org, product glib.) You will need
+Bugs should be reported to the GNOME issue tracking system.
+(https://gitlab.gnome.org/GNOME/glib/issues/new). You will need
to create an account for yourself.
In the bug report please include:
@@ -58,14 +58,13 @@ In the bug report please include:
Patches
=======
-Patches should also be submitted to bugzilla.gnome.org. If the
-patch fixes an existing bug, add the patch as an attachment
-to that bug report.
+Patches should also be submitted as merge requests to gitlab.gnome.org. If the
+patch fixes an existing issue, please refer to the issue in your commit message
+with the following notation (for issue 123):
+Closes: #123
-Otherwise, enter a new bug report that describes the patch,
-and attach the patch to that bug report.
-
-Patches should be in unified diff form. (The -up option to GNU diff.)
+Otherwise, create a new merge request that introduces the change, filing a
+separate issue is not required.
Notes about GLib 2.48
=====================
diff --git a/autogen.sh b/autogen.sh
index 4bbc00d98..9e4ba4c39 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -25,10 +25,10 @@ if test -z $AUTORECONF; then
exit 1
fi
-# README and INSTALL are required by automake, but may be deleted by clean
-# up rules. to get automake to work, simply touch these here, they will be
-# regenerated from their corresponding *.in files by ./configure anyway.
-touch README INSTALL
+# INSTALL is required by automake, but may be deleted by clean
+# up rules. to get automake to work, simply touch it here. It will be
+# regenerated from its corresponding *.in file by ./configure anyway.
+touch INSTALL
autoreconf --force --install --verbose || exit $?
diff --git a/configure.ac b/configure.ac
index b93ebb4eb..afbf34edb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,7 @@ m4_define([glib_debug_default],
AC_INIT(glib, [glib_version],
- [http://bugzilla.gnome.org/enter_bug.cgi?product=glib])
+ [https://gitlab.gnome.org/GNOME/glib/issues/new])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([glib/glib.h])
@@ -3520,7 +3520,6 @@ chmod 0755 gobject/glib-mkenums])
if false; then
AC_CONFIG_FILES([
INSTALL
- README
glib/glib.rc
gmodule/gmodule.rc
gobject/gobject.rc
diff --git a/docs/reference/gio/gdbus-codegen.xml b/docs/reference/gio/gdbus-codegen.xml
index 3e1a9d668..e4192084d 100644
--- a/docs/reference/gio/gdbus-codegen.xml
+++ b/docs/reference/gio/gdbus-codegen.xml
@@ -1038,7 +1038,7 @@ on_handle_hello_world (MyAppFrobber *interface,
Please send bug reports to either the distribution bug tracker
or the upstream bug tracker at
- https://bugzilla.gnome.org/enter_bug.cgi?product=glib.
+ https://gitlab.gnome.org/GNOME/glib/issues/new.
diff --git a/docs/reference/gio/gdbus.xml b/docs/reference/gio/gdbus.xml
index efcec33fe..0e6c14db1 100644
--- a/docs/reference/gio/gdbus.xml
+++ b/docs/reference/gio/gdbus.xml
@@ -399,7 +399,7 @@ $ gdbus wait --session --timeout 30 org.bar.SomeName
Please send bug reports to either the distribution bug tracker
or the upstream bug tracker at
- .
+ .
diff --git a/docs/reference/gio/migrating-gnome-vfs.xml b/docs/reference/gio/migrating-gnome-vfs.xml
index ba3987cad..27194aa9a 100644
--- a/docs/reference/gio/migrating-gnome-vfs.xml
+++ b/docs/reference/gio/migrating-gnome-vfs.xml
@@ -127,7 +127,7 @@ start_monitoring_trash (void)
since we have not found a compelling use case where
#GnomeVFSMIMEMonitor was used. If you think you have such a use
case, please report it at
- bugzilla.gnome.org.
+ https://gitlab.gnome.org/GNOME/glib/issues/new.
diff --git a/docs/reference/gio/xml/meson.build b/docs/reference/gio/xml/meson.build
index 6d1e295b8..6aeb74514 100644
--- a/docs/reference/gio/xml/meson.build
+++ b/docs/reference/gio/xml/meson.build
@@ -1,6 +1,6 @@
ent_conf = configuration_data()
ent_conf.set('PACKAGE', 'glib')
-ent_conf.set('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=glib')
+ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/glib/issues/new')
ent_conf.set('PACKAGE_NAME', 'glib')
ent_conf.set('PACKAGE_STRING', 'glib')
ent_conf.set('PACKAGE_TARNAME', 'glib')
diff --git a/docs/reference/glib/resources.xml b/docs/reference/glib/resources.xml
index 186bbf744..80e6f4cd2 100644
--- a/docs/reference/glib/resources.xml
+++ b/docs/reference/glib/resources.xml
@@ -21,11 +21,10 @@ Getting help with GLib
If you encounter a bug, misfeature, or missing feature in GLib, please
-file a bug report on
-http://bugzilla.gnome.org.
+file a bug report on the issue tracker at
+https://gitlab.gnome.org/GNOME/glib/issues/new.
We'd also appreciate reports of incomplete or misleading information in
-the GLib documentation; file those against the "docs" component of the "glib"
-product in Bugzilla.
+the GLib documentation; file those with the ‘Documentation’ label.
@@ -36,30 +35,28 @@ discussed, we'll add a note to that effect in the report.
-The bug tracker should definitely be used for feature requests, it's
-not only for bugs. We track all GLib development in Bugzilla, so it's
+The issue tracker should definitely be used for feature requests, it's
+not only for bugs. We track all GLib development in GitLab, so it's
the way to be sure the GLib developers won't forget about an issue.
-Submitting Patches
+Code Contributions
-If you develop a bugfix or enhancement for GLib, please file that in
-Bugzilla as well. Bugzilla allows you to attach files; please attach a
-patch generated by the diff utility, using the
- option to make the patch more readable. All patches
-must be offered under the terms of the GNU LGPL license, so be sure you
-are authorized to give us the patch under those terms.
+If you develop a bugfix or enhancement for GLib, please open a merge request
+for that in GitLab as well. All branches must be offered under the terms of
+the GNU LGPL license, so be sure you are authorized to give us the branch
+under those terms.
-If you want to discuss your patch before or after developing it, mail
+If you want to discuss your branch before or after developing it, mail
gtk-devel-list@gnome.org.
-But be sure to file the Bugzilla report as well; if the patch is only on the
-list and not in Bugzilla, it's likely to slip through the cracks.
+But be sure to create the GitLab merge request as well; if the branch is only
+on the list and not in GitLab, it's likely to slip through the cracks.
@@ -92,7 +89,7 @@ questions.
gtk-devel-list is for discussion of work on GTK+ (and GLib) itself, it is
not for asking questions about how to use GTK+ (or GLib)
-in applications. gtk-devel-list is appropriate for discussion of patches,
+in applications. gtk-devel-list is appropriate for discussion of branches,
bugs, proposed features, and so on.
diff --git a/docs/reference/glib/xml/meson.build b/docs/reference/glib/xml/meson.build
index 6d1e295b8..6aeb74514 100644
--- a/docs/reference/glib/xml/meson.build
+++ b/docs/reference/glib/xml/meson.build
@@ -1,6 +1,6 @@
ent_conf = configuration_data()
ent_conf.set('PACKAGE', 'glib')
-ent_conf.set('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=glib')
+ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/glib/issues/new')
ent_conf.set('PACKAGE_NAME', 'glib')
ent_conf.set('PACKAGE_STRING', 'glib')
ent_conf.set('PACKAGE_TARNAME', 'glib')
diff --git a/docs/reference/gobject/xml/meson.build b/docs/reference/gobject/xml/meson.build
index 6d1e295b8..6aeb74514 100644
--- a/docs/reference/gobject/xml/meson.build
+++ b/docs/reference/gobject/xml/meson.build
@@ -1,6 +1,6 @@
ent_conf = configuration_data()
ent_conf.set('PACKAGE', 'glib')
-ent_conf.set('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=glib')
+ent_conf.set('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/glib/issues/new')
ent_conf.set('PACKAGE_NAME', 'glib')
ent_conf.set('PACKAGE_STRING', 'glib')
ent_conf.set('PACKAGE_TARNAME', 'glib')
diff --git a/gio/gthreadedresolver.c b/gio/gthreadedresolver.c
index dad268c33..9e110cd0b 100644
--- a/gio/gthreadedresolver.c
+++ b/gio/gthreadedresolver.c
@@ -878,7 +878,7 @@ do_lookup_records (GTask *task,
#elif defined(HAVE_RES_NCLOSE)
res_nclose (&res);
#elif defined(HAVE_RES_NINIT)
-#error "Your platform has res_ninit() but not res_nclose() or res_ndestroy(). Please file a bug at https://bugzilla.gnome.org/enter_bug.cgi?product=glib"
+#error "Your platform has res_ninit() but not res_nclose() or res_ndestroy(). Please file a bug at https://gitlab.gnome.org/GNOME/glib/issues/new"
#endif
#endif /* HAVE_RES_NQUERY */
diff --git a/glib-gettextize.in b/glib-gettextize.in
index b07078bc5..af7052f6f 100755
--- a/glib-gettextize.in
+++ b/glib-gettextize.in
@@ -35,7 +35,7 @@ Usage: glib-gettextize [OPTION]... [package-dir]
--version print version information and exit
-c, --copy copy files instead of making symlinks
-f, --force force writing of new files even if old exist
-Report bugs to http://bugzilla.gnome.org/."
+Report bugs to https://gitlab.gnome.org/GNOME/glib/issues/new."
package=@PACKAGE@
version=@VERSION@
try_ln_s=:
diff --git a/glib.doap b/glib.doap
index 0f43d3b34..8743257da 100644
--- a/glib.doap
+++ b/glib.doap
@@ -14,7 +14,7 @@
-
+
diff --git a/glib.supp b/glib.supp
index e3ce6bc49..7a3fe6bc3 100644
--- a/glib.supp
+++ b/glib.supp
@@ -17,7 +17,7 @@
# This file should be updated if GLib introduces a new deliberate one-time leak,
# or another false race positive in Valgrind: please file bugs at:
#
-# https://bugzilla.gnome.org/enter_bug.cgi?product=glib
+# https://gitlab.gnome.org/GNOME/glib/issues/new
{
gnutls-init-calloc
diff --git a/meson.build b/meson.build
index f08321c28..9c981245b 100644
--- a/meson.build
+++ b/meson.build
@@ -90,7 +90,7 @@ glib_conf.set('GLIB_MICRO_VERSION', micro_version)
glib_conf.set('GLIB_INTERFACE_AGE', interface_age)
glib_conf.set('GLIB_BINARY_AGE', binary_age)
glib_conf.set_quoted('GETTEXT_PACKAGE', 'glib20')
-glib_conf.set_quoted('PACKAGE_BUGREPORT', 'http://bugzilla.gnome.org/enter_bug.cgi?product=glib')
+glib_conf.set_quoted('PACKAGE_BUGREPORT', 'https://gitlab.gnome.org/GNOME/glib/issues/new')
glib_conf.set_quoted('PACKAGE_NAME', 'glib')
glib_conf.set_quoted('PACKAGE_STRING', 'glib @0@'.format(meson.project_version()))
glib_conf.set_quoted('PACKAGE_TARNAME', 'glib')
diff --git a/sanity_check b/sanity_check
index 5f6e66e20..44ae7f1f3 100755
--- a/sanity_check
+++ b/sanity_check
@@ -13,7 +13,7 @@ echo "Checking glib-$VERSION.tar.gz..."
tar xfz glib-$VERSION.tar.gz
-for file in INSTALL NEWS README
+for file in INSTALL NEWS
do
echo -n "$file... "
if [ "x`grep $VERSION glib-$VERSION/$file | wc -l | awk -F' ' '{print $1}'`" = "x0" ]; then