debian/changelog

+glib2.0 (2.58.0-4) unstable; urgency=medium
+
+  [ Simon McVittie ]
+  * Adjust installation path of gdb scripts to match GLib itself.
+    We used to put libglib-2.0.so.0 in /lib/MULTIARCH, but this is no
+    longer the case since 2.56.0-5.
+  * Wrap and sort (build-)dependency lists (wrap-and-sort -a)
+  * Wrap and sort file lists (wrap-and-sort -a)
+  * Install HTML in /usr/share/gtk-doc/html with symlinks in /usr/share/doc.
+    The gtk-doc documentation is technically a functionally significant
+    part of the package (it affects cross-reference generation during build
+    of other packages) so according to Policy §12.3 it is not appropriate
+    for /usr/share/doc.
+    Using the upstream default installation path for the HTML also makes
+    it more straightforward to switch to the Meson build system, because
+    the Meson build does not have an equivalent of --with-html-dir.
+    - d/debian/libglib2.0-doc.maintscript: Add migration steps
+  * d/p/debian/Look-for-gio-launch-desktop-in-libdir-glib-2.0.patch:
+    Also patch meson build system
+
+  [ Jeremy Bicha ]
+  * Cherry-pick Fix-g_icon_to_string-regression-doc-inconsistency.patch
+    - Have g_icon_new_for_string() go back to only returning a single name
+      when created with a single name since some apps assume that behavior.
+      (Closes: #908705)
+
+ -- Jeremy Bicha <jbicha@debian.org>  Mon, 17 Sep 2018 17:47:57 -0400
+
 glib2.0 (2.58.0-3) unstable; urgency=medium
 
   [ Iain Lane ]

debian/control

@@ -7,35 +7,35 @@ Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Michael Biebl <biebl@debian.org>, Tim Lunn <tim@feathertop.org>
-Build-Depends: debhelper (>= 10.3~),
+Build-Depends: dbus <!nocheck>,
+               debhelper (>= 10.3~),
+               desktop-file-utils <!nocheck>,
                dh-exec,
                dh-python,
-               pkg-config (>= 0.16.0),
+               docbook-xml,
+               docbook-xsl,
+               dpkg-dev (>= 1.17.14),
                gettext,
                gnome-pkg-tools (>= 0.11),
-               dpkg-dev (>= 1.17.14),
+               gtk-doc-tools (>= 1.20),
                libelf-dev (>= 0.142),
+               libffi-dev (>= 3.0.0),
+               libgamin-dev [!linux-any] | libfam-dev [!linux-any],
                libmount-dev (>= 2.28) [linux-any],
                libpcre3-dev (>= 1:8.35),
-               gtk-doc-tools (>= 1.20),
                libselinux1-dev [linux-any],
+               libxml2-utils,
                linux-libc-dev [linux-any],
-               libgamin-dev [!linux-any] | libfam-dev [!linux-any],
-               zlib1g-dev,
-               desktop-file-utils <!nocheck>,
-               dbus <!nocheck>,
-               shared-mime-info <!nocheck>,
-               tzdata <!nocheck>,
-               xterm <!nocheck>,
-               python3:any (>= 2.7.5-5~),
+               pkg-config (>= 0.16.0),
                python3-dbus <!nocheck>,
                python3-distutils,
                python3-gi <!nocheck>,
-               libxml2-utils,
+               python3:any (>= 2.7.5-5~),
+               shared-mime-info <!nocheck>,
+               tzdata <!nocheck>,
                xsltproc,
-               docbook-xml,
-               docbook-xsl,
-               libffi-dev (>= 3.0.0)
+               xterm <!nocheck>,
+               zlib1g-dev
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
 Homepage: http://www.gtk.org/
@@ -60,9 +60,9 @@ Description: GLib library of C routines
 
 Package: libglib2.0-tests
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         shared-mime-info
+Depends: shared-mime-info,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: GLib library of C routines - installed tests
  GLib is a library containing many useful C routines for things such
@@ -93,10 +93,10 @@ Package: libglib2.0-bin
 Section: misc
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
+Depends: libglib2.0-0 (= ${binary:Version}),
+         libglib2.0-data,
          ${misc:Depends},
-         libglib2.0-0 (= ${binary:Version}),
-         libglib2.0-data
+         ${shlibs:Depends}
 Multi-Arch: foreign
 Description: Programs for the GLib library
  GLib is a library containing many useful C routines for things such
@@ -110,15 +110,15 @@ Package: libglib2.0-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ${python3:Depends},
-         libglib2.0-0 (= ${binary:Version}),
+Depends: libglib2.0-0 (= ${binary:Version}),
          libglib2.0-bin (= ${binary:Version}),
          libglib2.0-dev-bin (= ${binary:Version}),
          libpcre3-dev (>= 1:8.31),
          pkg-config,
-         zlib1g-dev
+         zlib1g-dev,
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
 Breaks: libglib2.0-0-dbg (<< 2.51.4-1~)
 Replaces: libglib2.0-0-dbg (<< 2.51.4-1~)
 Suggests: libglib2.0-doc
@@ -134,10 +134,10 @@ Description: Development files for the GLib library
 Package: libglib2.0-dev-bin
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends},
+Depends: python3-distutils,
+         ${misc:Depends},
          ${python3:Depends},
-         ${shlibs:Depends},
-         python3-distutils
+         ${shlibs:Depends}
 Suggests: libgdk-pixbuf2.0-bin (>= 2.36.12-2~) | libgdk-pixbuf2.0-dev,
           libxml2-utils
 Breaks: libglib2.0-bin (<< 2.54.2-5~),
@@ -182,8 +182,8 @@ Description: Documentation files for the GLib library
 
 Package: libgio-fam
 Architecture: hurd-any kfreebsd-any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: gamin
 Multi-Arch: same
 Description: GLib Input, Output and Streaming Library (fam module)

debian/control.in

@@ -3,35 +3,35 @@ Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 10.3~),
+Build-Depends: dbus <!nocheck>,
+               debhelper (>= 10.3~),
+               desktop-file-utils <!nocheck>,
                dh-exec,
                dh-python,
-               pkg-config (>= 0.16.0),
+               docbook-xml,
+               docbook-xsl,
+               dpkg-dev (>= 1.17.14),
                gettext,
                gnome-pkg-tools (>= 0.11),
-               dpkg-dev (>= 1.17.14),
+               gtk-doc-tools (>= 1.20),
                libelf-dev (>= 0.142),
+               libffi-dev (>= 3.0.0),
+               libgamin-dev [!linux-any] | libfam-dev [!linux-any],
                libmount-dev (>= 2.28) [linux-any],
                libpcre3-dev (>= 1:8.35),
-               gtk-doc-tools (>= 1.20),
                libselinux1-dev [linux-any],
+               libxml2-utils,
                linux-libc-dev [linux-any],
-               libgamin-dev [!linux-any] | libfam-dev [!linux-any],
-               zlib1g-dev,
-               desktop-file-utils <!nocheck>,
-               dbus <!nocheck>,
-               shared-mime-info <!nocheck>,
-               tzdata <!nocheck>,
-               xterm <!nocheck>,
-               python3:any (>= 2.7.5-5~),
+               pkg-config (>= 0.16.0),
                python3-dbus <!nocheck>,
                python3-distutils,
                python3-gi <!nocheck>,
-               libxml2-utils,
+               python3:any (>= 2.7.5-5~),
+               shared-mime-info <!nocheck>,
+               tzdata <!nocheck>,
                xsltproc,
-               docbook-xml,
-               docbook-xsl,
-               libffi-dev (>= 3.0.0)
+               xterm <!nocheck>,
+               zlib1g-dev
 Rules-Requires-Root: no
 Standards-Version: 4.1.3
 Homepage: http://www.gtk.org/
@@ -56,9 +56,9 @@ Description: GLib library of C routines
 
 Package: libglib2.0-tests
 Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         shared-mime-info
+Depends: shared-mime-info,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: GLib library of C routines - installed tests
  GLib is a library containing many useful C routines for things such
@@ -89,10 +89,10 @@ Package: libglib2.0-bin
 Section: misc
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends},
+Depends: libglib2.0-0 (= ${binary:Version}),
+         libglib2.0-data,
          ${misc:Depends},
-         libglib2.0-0 (= ${binary:Version}),
-         libglib2.0-data
+         ${shlibs:Depends}
 Multi-Arch: foreign
 Description: Programs for the GLib library
  GLib is a library containing many useful C routines for things such
@@ -106,15 +106,15 @@ Package: libglib2.0-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         ${python3:Depends},
-         libglib2.0-0 (= ${binary:Version}),
+Depends: libglib2.0-0 (= ${binary:Version}),
          libglib2.0-bin (= ${binary:Version}),
          libglib2.0-dev-bin (= ${binary:Version}),
          libpcre3-dev (>= 1:8.31),
          pkg-config,
-         zlib1g-dev
+         zlib1g-dev,
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
 Breaks: libglib2.0-0-dbg (<< 2.51.4-1~)
 Replaces: libglib2.0-0-dbg (<< 2.51.4-1~)
 Suggests: libglib2.0-doc
@@ -130,10 +130,10 @@ Description: Development files for the GLib library
 Package: libglib2.0-dev-bin
 Section: libdevel
 Architecture: any
-Depends: ${misc:Depends},
+Depends: python3-distutils,
+         ${misc:Depends},
          ${python3:Depends},
-         ${shlibs:Depends},
-         python3-distutils
+         ${shlibs:Depends}
 Suggests: libgdk-pixbuf2.0-bin (>= 2.36.12-2~) | libgdk-pixbuf2.0-dev,
           libxml2-utils
 Breaks: libglib2.0-bin (<< 2.54.2-5~),
@@ -178,8 +178,8 @@ Description: Documentation files for the GLib library
 
 Package: libgio-fam
 Architecture: hurd-any kfreebsd-any
-Depends: ${shlibs:Depends},
-         ${misc:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: gamin
 Multi-Arch: same
 Description: GLib Input, Output and Streaming Library (fam module)

debian/libglib2.0-bin.install

@@ -5,9 +5,9 @@ usr/bin/gresource
 usr/bin/gsettings
 usr/share/bash-completion
 usr/share/man/man1/gapplication.1*
+usr/share/man/man1/gdbus.1*
 usr/share/man/man1/gio-querymodules.1*
 usr/share/man/man1/gio.1*
 usr/share/man/man1/glib-compile-schemas.1*
-usr/share/man/man1/gdbus.1*
 usr/share/man/man1/gresource.1*
 usr/share/man/man1/gsettings.1*

debian/libglib2.0-dev-bin.install

+usr/bin/gdbus-codegen
+usr/bin/glib-compile-resources
+usr/bin/glib-genmarshal
+usr/bin/glib-gettextize
+usr/bin/glib-mkenums
+usr/bin/gobject-query
+usr/bin/gtester
+usr/bin/gtester-report
 usr/share/aclocal
 usr/share/glib-2.0/codegen/*.py
 usr/share/glib-2.0/gettext
 usr/share/man/man1/gdbus-codegen.1*
 usr/share/man/man1/glib-compile-resources.1*
 usr/share/man/man1/glib-genmarshal.1*
-usr/share/man/man1/glib-mkenums.1*
 usr/share/man/man1/glib-gettextize.1*
+usr/share/man/man1/glib-mkenums.1*
 usr/share/man/man1/gobject-query.1*
-usr/share/man/man1/gtester.1*
 usr/share/man/man1/gtester-report.1*
-usr/bin/gdbus-codegen
-usr/bin/glib-compile-resources
-usr/bin/glib-genmarshal
-usr/bin/glib-mkenums
-usr/bin/glib-gettextize
-usr/bin/gobject-query
-usr/bin/gtester
-usr/bin/gtester-report
+usr/share/man/man1/gtester.1*

debian/libglib2.0-dev.install

 usr/include/*
+usr/lib/*/glib-2.0
 usr/lib/*/lib*.a
+usr/lib/*/libgio*.so
 usr/lib/*/libglib*.so
-usr/lib/*/libgobject*.so
 usr/lib/*/libgmodule*.so
+usr/lib/*/libgobject*.so
 usr/lib/*/libgthread*.so
-usr/lib/*/libgio*.so
-usr/lib/*/glib-2.0
 usr/lib/*/pkgconfig
 usr/share/gdb
 usr/share/gettext/its

debian/libglib2.0-doc.doc-base.gio

@@ -10,5 +10,5 @@ Abstract: GIO is striving to provide a modern, easy-to-use VFS API that sits at
 Section: Programming/C
 
 Format: HTML
-Index: /usr/share/doc/libglib2.0-doc/gio/index.html
-Files: /usr/share/doc/libglib2.0-doc/gio/*.html
+Index: /usr/share/gtk-doc/html/gio/index.html
+Files: /usr/share/gtk-doc/html/gio/*.html

debian/libglib2.0-doc.doc-base.glib

@@ -8,5 +8,5 @@ Abstract: The GLib C library is used in GTK+ and GNOME
 Section: Programming/C
 
 Format: HTML
-Index: /usr/share/doc/libglib2.0-doc/glib/index.html
-Files: /usr/share/doc/libglib2.0-doc/glib/*.html
+Index: /usr/share/gtk-doc/html/glib/index.html
+Files: /usr/share/gtk-doc/html/glib/*.html

debian/libglib2.0-doc.doc-base.gobject

@@ -11,5 +11,5 @@ Abstract: Most modern programming languages come with their own native object
 Section: Programming/C
 
 Format: HTML
-Index: /usr/share/doc/libglib2.0-doc/gobject/index.html
-Files: /usr/share/doc/libglib2.0-doc/gobject/*.html
+Index: /usr/share/gtk-doc/html/gobject/index.html
+Files: /usr/share/gtk-doc/html/gobject/*.html

debian/libglib2.0-doc.install

-usr/share/doc/libglib2.0-doc
+usr/share/gtk-doc/html/gio
+usr/share/gtk-doc/html/glib
+usr/share/gtk-doc/html/gobject

debian/libglib2.0-doc.links

-usr/share/doc/libglib2.0-doc/gio usr/share/gtk-doc/html/gio
-usr/share/doc/libglib2.0-doc/glib usr/share/gtk-doc/html/glib
-usr/share/doc/libglib2.0-doc/gobject usr/share/gtk-doc/html/gobject
+usr/share/gtk-doc/html/gio usr/share/doc/libglib2.0-doc/gio
+usr/share/gtk-doc/html/glib usr/share/doc/libglib2.0-doc/glib
+usr/share/gtk-doc/html/gobject usr/share/doc/libglib2.0-doc/gobject

debian/libglib2.0-doc.maintscript

+dir_to_symlink /usr/share/doc/libglib2.0-doc/gio ../../gtk-doc/html/gio 2.58.0-4~
+dir_to_symlink /usr/share/doc/libglib2.0-doc/glib ../../gtk-doc/html/glib 2.58.0-4~
+dir_to_symlink /usr/share/doc/libglib2.0-doc/gobject ../../gtk-doc/html/gobject 2.58.0-4~
+symlink_to_dir /usr/share/gtk-doc/html/gio ../../doc/libglib2.0-doc/gio 2.58.0-4~
+symlink_to_dir /usr/share/gtk-doc/html/glib ../../doc/libglib2.0-doc/glib 2.58.0-4~
+symlink_to_dir /usr/share/gtk-doc/html/gobject ../../doc/libglib2.0-doc/gobject 2.58.0-4~

debian/libglib2.0-tests.install

-usr/share/installed-tests
 usr/lib/glib2.0/installed-tests
+usr/share/installed-tests

debian/patches/Fix-g_icon_to_string-regression-doc-inconsistency.patch

+From: Jehan <jehan@girinstud.io>
+Date: Wed, 5 Sep 2018 14:51:18 +0200
+Subject: Fix g_icon_to_string() regression (doc inconsistency).
+
+g_icon_new_for_string() docs states that it should return a single name
+when created with a single name. I add a second condition to this case:
+the themed icon must not include default fallbacks (i.e. it must not
+have been created with `g_themed_icon_new_with_default_fallbacks()`).
+Otherwise the return value of `g_icon_new_for_string()` would not
+recreate the same icon list when passed to `g_icon_new_for_string()`
+(which would be another documentation inconsistency).
+
+g_icon_new_for_string() is now back to old behavior for this specific
+case.
+
+I also revert the unit test for this case, and add a new unit test when
+using g_themed_icon_new_with_default_fallbacks() with a single name as
+well.
+
+Closes #1513.
+---
+ gio/gicon.c        | 20 ++++++++++++++------
+ gio/tests/g-icon.c | 12 +++++++++++-
+ 2 files changed, 25 insertions(+), 7 deletions(-)
+
+diff --git a/gio/gicon.c b/gio/gicon.c
+index 5f943f5..4f73d75 100644
+--- a/gio/gicon.c
++++ b/gio/gicon.c
+@@ -199,8 +199,8 @@ g_icon_to_string_tokenized (GIcon *icon, GString *s)
+  *   native, the returned string is the result of g_file_get_uri()
+  *   (such as `sftp://path/to/my%20icon.png`).
+  * 
+- * - If @icon is a #GThemedIcon with exactly one name, the encoding is
+- *    simply the name (such as `network-server`).
++ * - If @icon is a #GThemedIcon with exactly one name and no fallbacks,
++ *   the encoding is simply the name (such as `network-server`).
+  *
+  * Virtual: to_tokens
+  * Returns: (nullable): An allocated NUL-terminated UTF8 string or
+@@ -237,15 +237,23 @@ g_icon_to_string (GIcon *icon)
+     }
+   else if (G_IS_THEMED_ICON (icon))
+     {
+-      const char * const *names;
+-
+-      names = g_themed_icon_get_names (G_THEMED_ICON (icon));
++      char     **names                 = NULL;
++      gboolean   use_default_fallbacks = FALSE;
++
++      g_object_get (G_OBJECT (icon),
++                    "names",                 &names,
++                    "use-default-fallbacks", &use_default_fallbacks,
++                    NULL);
++      /* Themed icon initialized with a single name and no fallbacks. */
+       if (names != NULL &&
+ 	  names[0] != NULL &&
+ 	  names[0][0] != '.' && /* Allowing icons starting with dot would break G_ICON_SERIALIZATION_MAGIC0 */
+ 	  g_utf8_validate (names[0], -1, NULL) && /* Only return utf8 strings */
+-	  names[1] == NULL)
++          names[1] == NULL &&
++          ! use_default_fallbacks)
+ 	ret = g_strdup (names[0]);
++
++      g_strfreev (names);
+     }
+ 
+   if (ret == NULL)
+diff --git a/gio/tests/g-icon.c b/gio/tests/g-icon.c
+index 7f87e49..13985d6 100644
+--- a/gio/tests/g-icon.c
++++ b/gio/tests/g-icon.c
+@@ -119,7 +119,17 @@ test_g_icon_to_string (void)
+ 
+   icon = g_themed_icon_new ("network-server");
+   data = g_icon_to_string (icon);
+-  g_assert_cmpstr (data, ==, ". GThemedIcon network-server network-server-symbolic");
++  g_assert_cmpstr (data, ==, "network-server");
++  icon2 = g_icon_new_for_string (data, &error);
++  g_assert_no_error (error);
++  g_assert (g_icon_equal (icon, icon2));
++  g_free (data);
++  g_object_unref (icon);
++  g_object_unref (icon2);
++
++  icon = g_themed_icon_new_with_default_fallbacks ("network-server");
++  data = g_icon_to_string (icon);
++  g_assert_cmpstr (data, ==, ". GThemedIcon network-server network network-server-symbolic network-symbolic");
+   icon2 = g_icon_new_for_string (data, &error);
+   g_assert_no_error (error);
+   g_assert (g_icon_equal (icon, icon2));

debian/patches/debian/Look-for-gio-launch-desktop-in-libdir-glib-2.0.patch

@@ -10,7 +10,8 @@ Forwarded: not-needed, Debian-specific
 ---
  gio/Makefile.am       | 1 +
  gio/gdesktopappinfo.c | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ gio/meson.build       | 1 +
+ 3 files changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/gio/Makefile.am b/gio/Makefile.am
 index e14cad2..a493084 100644
@@ -40,3 +41,15 @@ index d0ffbac..11b245a 100644
            g_once_init_leave (&gio_launch_desktop_path, tmp);
          }
  
+diff --git a/gio/meson.build b/gio/meson.build
+index b83d8f5..b8b4a9f 100644
+--- a/gio/meson.build
++++ b/gio/meson.build
+@@ -1,6 +1,7 @@
+ gio_c_args = [
+   '-DG_LOG_DOMAIN="GLib-GIO"',
+   '-DGIO_COMPILATION',
++  '-DGIO_LIBDIR="@0@"'.format(get_option('libdir')),
+   '-DGIO_MODULE_DIR="@0@"'.format(glib_giomodulesdir),
+ ]
+ 

debian/patches/series

 tests-timer-Skip-test_timeval_to_iso8601_overflow-if-we-c.patch
+Fix-g_icon_to_string-regression-doc-inconsistency.patch
 01_gettext-desktopfiles.patch
 07_disable_tests_on_slow_archs.patch
 81-skip-monitor-test-on-non-linux.patch

debian/rules

@@ -104,7 +104,6 @@ export VERBOSE=1
 
 # configure flags
 DEB_CONFIGURE_EXTRA_FLAGS := \
-			--with-html-dir=\$${prefix}/share/doc/libglib2.0-doc \
 			--libexecdir=\$${prefix}/lib/glib2.0 \
 			--with-python=/usr/bin/python3 \
 			--with-pcre=system
@@ -180,10 +179,6 @@ ifneq ($(filter %-udeb,$(binaries)),)
 	rm -fr debian/install/udeb/usr/share/man
 	dh_install -plibglib2.0-udeb --sourcedir=debian/install/udeb
 endif
-	# Put the gdb script in .../gdb/auto-load/lib, as we install libglib*.so in there
-	mkdir -p debian/install/deb/usr/share/gdb/auto-load/lib/${DEB_HOST_MULTIARCH}/
-	mv debian/install/deb/usr/share/gdb/auto-load/usr/lib/${DEB_HOST_MULTIARCH}/libglib*so*py \
-		debian/install/deb/usr/share/gdb/auto-load/lib/${DEB_HOST_MULTIARCH}/
 	dh_install --remaining-packages --sourcedir=debian/install/deb
 
 override_dh_missing: