Skip to content

Instantly share code, notes, and snippets.

@pwithnall

pwithnall/debian.diff

Last active February 21, 2019 14:41
Show Gist options
  • Save pwithnall/f3deaa0843e5802ada8852660757ff84 to your computer and use it in GitHub Desktop.
Save pwithnall/f3deaa0843e5802ada8852660757ff84 to your computer and use it in GitHub Desktop.
Download ZIP
git diff new-master..debian-master -- debian/
Raw
debian.diff
diff --git a/debian/changelog b/debian/changelog
index c9166cfea..f383da5c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,609 +1,49 @@
-glib2.0 (2.59.3-1endless0) experimental; urgency=medium
+glib2.0 (2.54.2-1endless4) eos; urgency=medium
- * Rebase on git-based Debian packaging of glib-2.0 (T25384)
- This obsoletes the debian-master branch. The debian/ directory will now
- be kept in master.
- + Reapplied patches from debian/patches/ directory.
- + Dropped a load of patches which have since been applied upstream.
- + Dropped “tests: disable some more slow tests on ARM”, as those tests
- have changed upstream, our ARM builder has got faster, and Debian has
- been doing some work on identifying slow tests.
- + Dropped “gutils: add API to get user special directory for desktop ID”;
- see T25445.
+ * Backport gspawn/posix_spawn improvements
+ https://phabricator.endlessm.com/T23273
- -- Philip Withnall <[email protected]>> Thu, 21 Feb 2019 14:03:00 +0000
+ -- Daniel Drake <[email protected]> Thu, 02 Aug 2018 13:42:26 +0800
-glib2.0 (2.59.3-1) experimental; urgency=medium
+glib2.0 (2.54.2-1endless3) unstable; urgency=medium
- * New upstream release
- + Fix support for g_get_user_special_dir() on macOS, including support for
- the Downloads directory
- + Ensure that cancelling a GTask cannot cause its callback to be called
- synchronously (in the same call chain as the original *_async() call)
- + Further fixes to the Happy Eyeballs (RFC 8305) implementation
- + Various fixes for installation of installed tests
- * Refresh and drop patches.
- Drop gio-tests-Install-test1.overlay-file-when-building-instal.patch,
- tests-Install-the-slow-connect-preload.so-library-and-use.patch,
- fixed upstream.
-
- -- Iain Lane <[email protected]> Wed, 20 Feb 2019 14:25:13 +0000
-
-glib2.0 (2.59.2-2) experimental; urgency=medium
-
- * Install `test1.overlay' file, which is needed for the installed tests.
- * tests: Install the slow-connect-preload.so library and use it
-
- -- Iain Lane <[email protected]> Mon, 11 Feb 2019 10:25:27 +0000
-
-glib2.0 (2.59.2-1) experimental; urgency=medium
-
- * New upstream release
- + Fix check on GDBusMessage size when reading it.
- + Add async GIO API: g_file_query_default_handler_async(),
- g_app_info_launch_uris_async()
- + Fix some bugs in the Happy Eyeballs implementation.
- + Install a new generated header with enum types for Unicode enums.
- + Support the XDG trash portal.
- + Autotools support is gone.
- + g_format_size() now uses a no-break space to separate digits and units;
- translations will need to be updated accordingly.
- + New g_queue_clear_full() API.
- + Fix argument quoting on win32 when spawning subprocesses.
- + Allow polling more than 64 handles on win32 using g_poll().
- + Tag various tests as ‘flaky’. These are no longer run routinely on our
- upstream CI machines, and downstream packagers may want to not run them
- (or not treat those test failures as package build failures) on their
- test machines either. They are in the `flaky` test suite.
- + Add overlay support to g_resources_get_info().
- + Support defaults and locks in the keyfile GSettings backend. This will
- be used for flatpaks.
- + Accept unquoted strings in the keyfile GSettings backend to simplify
- things for sysadmins.
- + Update our contribution guidelines (`CONTRIBUTING.md`).
- + Add writev() and writev_all() APIs to GOutputStream and
- GPollableOutputStream, and provide implementations of them for many
- subclasses.
- * Refresh patches, drop trash test patches which are upstream now
- * build-time tests: Run "flaky" suite separately and non fatally
- * debian/libglib2.0-0.symbols: Add new symbols from 2.59.{1,2}
-
- -- Iain Lane <[email protected]> Wed, 06 Feb 2019 17:09:28 +0000
-
-glib2.0 (2.59.0-1) experimental; urgency=medium
-
- * New upstream release
- * Update patches and drop upstreamed ones
- * debian/control: Update meson BD to ≥ 0.48.0 per upstream
- * debian/rules: enable-selinux takes "enabled" or "disabled" now.
- Not true/false.
- * debian/*: Update for experimental
- * debian/libglib2.0-0.symbols: Update with new symbols for this release
-
- -- Iain Lane <[email protected]> Thu, 17 Jan 2019 18:43:00 +0000
-
-glib2.0 (2.58.2-4) unstable; urgency=medium
-
- [ Simon McVittie ]
- * Update patch metadata
-
- [ Iain Lane ]
- * trash-test-Don-t-assume-that-.local-exists.patch,
- trash-test-Don-t-rely-on-being-able-to-determine-mount-po.patch:
- Cherry pick two patches by Simon McVittie (slightly modified by Iain Lane)
- to fix the trash test on Launchpad autobuilders.
-
- -- Iain Lane <[email protected]> Thu, 17 Jan 2019 11:27:34 +0000
+ * Backport new GDateTime and GTimeZone methods:
+ - g_date_time_get_timezone()
+ - g_time_zone_get_identifier()
+ - See https://bugzilla.gnome.org/show_bug.cgi?id=795165
-glib2.0 (2.58.2-3) unstable; urgency=medium
+ -- Philip Withnall <[email protected]> Thu, 12 Apr 2018 14:23:00 +0100
- * Team upload
- * Release to unstable
- * Standards-Version: 4.3.0 (no changes required)
- * d/p/gvariant-test-Also-force-alignment-for-tuple-test-data.patch:
- Mark as forwarded
- * debian/Skip-unreliable-test_threaded_singleton-by-default.patch:
- Don't run test_threaded_singleton() at build-time or in the part of
- the autopkgtest run that must succeed. Run it from d/tests/flaky
- instead.
+glib2.0 (2.54.2-1endless2) unstable; urgency=medium
- -- Simon McVittie <[email protected]> Fri, 04 Jan 2019 08:43:36 +0000
+ * Backport new utility functions:
+ - g_clear_handle_id(): https://bugzilla.gnome.org/show_bug.cgi?id=788489
+ - g_date_time_new_from_iso8601():
+ https://bugzilla.gnome.org/show_bug.cgi?id=753459
-glib2.0 (2.58.2-2) experimental; urgency=medium
+ -- Philip Withnall <[email protected]> Fri, 09 Mar 2018 15:05:00 +0000
- * Team upload
- * d/p/gvariant-test-Also-force-alignment-for-tuple-test-data.patch:
- Fix gvariant test failure on s390x by forcing more test data to be aligned
- (Closes: #917980)
- * d/p/debian/closures-test-Skip-on-arm-unless-flaky-tests-are-allowed.patch,
- d/tests/flaky:
- Only run closures test on arm* as part of a separate, flaky autopkgtest.
- This test does not seem to be reliable enough for its failures to be
- treated as release-critical, at least on arm*. If we run too many
- iterations, it fails on CPUs where 16-bit accesses are slow; if we run
- too few, it occasionally fails when one thread starves another.
- (Closes: #917983)
- * d/p/debian/Disable-some-tests-on-slow-architectures-which-keep-faili.patch,
- d/p/debian/Skip-test-which-performs-some-unreliable-floating-point-c.patch:
- d/tests/flaky:
- Use g_test_skip() for flaky tests, and run them from d/tests/flaky
-
- -- Simon McVittie <[email protected]> Thu, 03 Jan 2019 09:35:04 +0000
-
-glib2.0 (2.58.2-1) experimental; urgency=medium
+glib2.0 (2.54.2-1endless1) unstable; urgency=medium
- * Team upload
- * New upstream release
- * Drop many patches that were applied upstream
- * d/p/tests-Allocate-gvariant-data-from-the-heap-to-guarantee-a.patch:
- Add patch from upstream to fix alignment of GVariant test data
- * d/libglib2.0-0.symbols: Update for new ABI
- * d/tests/installed-tests: Log execution environment
- * postinst: Convert triggers into a function
- * postinst: Quote strings with #TOKENS# to fix syntax highlighting
- * postinst: Add a vim modeline
+ * Backport structured logging changes to enable -Wformat warnings again
+ https://bugzilla.gnome.org/show_bug.cgi?id=793074
- -- Simon McVittie <[email protected]> Tue, 01 Jan 2019 10:59:39 +0000
+ -- Philip Withnall <[email protected]> Fri, 09 Feb 2018 16:38:00 +0000
-glib2.0 (2.58.1-6) experimental; urgency=medium
+glib2.0 (2.54.2-1endless0) unstable; urgency=medium
- * Team upload
- * d/p/closures-test-Avoid-timeout-on-ARM64-CPUs.patch:
- Rename from
- d/p/debian/closures-test-Run-fewer-iterations-on-ARM64-and-armhf.patch,
- increase the test timeout to prevent this test from timing out on
- Cortex-A57 CPUs when building with Meson, and mark as forwarded
- upstream
- * Disable xattr support on kFreeBSD.
- kFreeBSD has stub implementations of getxattr() etc. which will
- always fail. Autoconf considers these to be present, but Meson
- detects them and treats them as absent, resulting in configuration
- failure.
-
- -- Simon McVittie <[email protected]> Tue, 06 Nov 2018 14:19:18 +0000
-
-glib2.0 (2.58.1-5) experimental; urgency=medium
+ * Rebase Endless changes on latest Debian Sid package
+ - Only difference from upstream is the
+ g_get_user_special_dir_for_desktop_id() symbol
+ - Apply all 13 patches from debian/patches/ to git and drop them from
+ the Debian directory
+ - Some of these patches were not applied in the previous Endless GLib
+ package, but I can see no reason why we had diverged from Debian;
+ they’re all unconditionally applied now
+ - Rebase the code on upstream/glib-2-54, including some patches which will
+ eventually be released in 2.54.3
- * Team upload
- * d/p/*:
- Update to upstream glib-2-58 branch as of 2.58.1-89-g7aa52a7d5,
- except for translations
- * d/p/mainloop-test-Fix-race-conditions.patch:
- Add patch from upstream git master to fix race conditions in
- mainloop test
- * d/p/meson-Define-__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4-on-GNU-Li.patch:
- Add proposed patch to fix detection of atomic operations on armel
- * Respect nocheck in DEB_BUILD_OPTIONS
- * Adjust test timeouts:
- - Increase armel, armhf, hppa timeout multiplier from x3 to x5
- - Reduce mips*, sparc* timeout multiplier from x10 to x5
- - Reduce timeout multiplier for architectures known to have qemu
- buildds from x50 to x20
- * d/rules: Set Meson cross properties using a modified debcrossgen.
- This avoids embedding a local copy of GNUlib (v)(sn)printf when
- cross-compiling. (Workaround for #912559)
-
- -- Simon McVittie <[email protected]> Fri, 02 Nov 2018 19:05:22 +0000
-
-glib2.0 (2.58.1-4) experimental; urgency=medium
-
- * Team upload
- * d/rules: Deduplicate test invocation
- * Use `meson test` directly, instead of going via `ninja test`
- * Multiply Meson test timeouts.
- Use x3 timeouts for most architectures (in general the timeouts in
- the upstream Meson build system are somewhat optimistic), x10 for
- the mips and sparc families, and x50 for architectures known to
- use qemu for buildds.
- * Enable FAM support on Hurd and kFreeBSD.
- In the Autotools build system this was auto-detected, but in Meson it
- is off by default and must be explicitly enabled if wanted.
- * d/p/meson-Mark-1bit-emufutex-test-as-slow.patch:
- Increase timeout for the 1bit-emufutex test
-
- -- Simon McVittie <[email protected]> Fri, 19 Oct 2018 09:55:19 +0100
-
-glib2.0 (2.58.1-3) experimental; urgency=medium
-
- * Team upload
- * Upload to experimental to check that everything is OK with the
- switch to Meson
- * Switch build system to Meson as recommended by upstream
- - Stop removing .la files: Meson doesn't build those
- - d/p/debian/61_glib-compile-binaries-path.patch: Change the same
- path if we build with Meson
- - d/patches: Apply patches proposed for backport from master to
- glib-2-58 in upstream MR 392. These fix various build issues,
- mostly around Meson. Some of these patch Windows-specific code,
- but they are likely to be in 2.58.2 and upstream asked for wider
- testing, so I'm applying them anyway, to test the complete set.
- - d/p/Spelling-*.patch:
- MR 392 also applies patches from upstream git master to fix various
- spelling mistakes detected by Lintian
- * Always generate testmarshal.h, even when cross-compiling
- (Closes: #908334)
- * Fix static linking and make sure it won't regress, prompted by
- comparing the Autotools and Meson builds:
- - Add missing -dev dependencies on libffi-dev, libmount-dev,
- libselinux1-dev
- - d/p/Autotools-Move-libmount-from-Libs.private-to-Requires.pri.patch:
- Add patch from upstream git master to fix static linking with libgio
- - d/tests/build: Exercise all libraries
- - d/tests/build-static: Exercise static linking
- * d/rules: Fix some permissions (equivalent of #1539 upstream)
- * Add Lintian override for a spelling-error-in-binary false positive
- * Add some Lintian overrides for hardening-no-fortify-functions.
- These objects mostly don't use libc directly.
- * Remove /usr/bin/gio-launch-desktop symlink.
- It's an implementation detail of libgio, and isn't intended to be
- run directly. Removing it from PATH silences a Lintian warning about
- it not having a man page.
- * Don't delete compiled GSettings schemas during purge if the dpkg
- reference count is greater than 1. This avoids deleting and regenerating
- it unnecessarily if another architecture's libglib2.0-0 is still
- installed. (Closes: #775854)
- * d/tests/installed-tests: Replace deprecated $ADTTMP with $AUTOPKGTEST_TMP
- * d/tests/control: Mark build tests as superficial (see #904979)
-
- -- Simon McVittie <[email protected]> Thu, 18 Oct 2018 18:32:21 +0100
-
-glib2.0 (2.58.1-2) unstable; urgency=medium
-
- * Fix dh_missing rule for arch:all build with compat 11
-
- -- Jeremy Bicha <[email protected]> Fri, 21 Sep 2018 23:53:00 -0400
-
-glib2.0 (2.58.1-1) unstable; urgency=medium
-
- * New upstream release
- * Drop patches applied in new release:
- - Fix-g_icon_to_string-regression-doc-inconsistency.patch
- - tests-timer-Skip-test_timeval_to_iso8601_overflow-if-we-c.patch
- * Refresh 61_glib-compile-binaries-path.patch
- * Bump Standards-Version to 4.2.1
- * Bump debhelper compat to 11
-
- -- Jeremy Bicha <[email protected]> Fri, 21 Sep 2018 20:11:06 -0400
-
-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 <[email protected]> Mon, 17 Sep 2018 17:47:57 -0400
-
-glib2.0 (2.58.0-3) unstable; urgency=medium
-
- [ Iain Lane ]
- * Run fewer iterations of clousures test on armhf too
-
- -- Jeremy Bicha <[email protected]> Fri, 07 Sep 2018 13:51:53 -0400
-
-glib2.0 (2.58.0-2) unstable; urgency=medium
-
- * Cherry-pick upstream patch to fix test_timeval_to_iso8601_overflow on
- 32-bit, fixing FTBFS there.
-
- -- Iain Lane <[email protected]> Tue, 04 Sep 2018 15:29:53 +0100
-
-glib2.0 (2.58.0-1) unstable; urgency=medium
-
- [ Jeremy Bicha ]
- * New upstream release
- * Drop patches applied in new release:
- - date-test-Use-g_test_skip-not-g_test_incomplete.patch
- - g_binding_unbind-make-it-more-introspection-friendly-allo.patch:
- * Release to unstable
-
- [ Simon McVittie ]
- * d/p/debian/closures-test-Run-fewer-iterations-on-ARM64.patch:
- Update metadata
- * libglib2.0-dev-bin: Add Suggests for the packages containing
- xmllint and gdk-pixbuf-pixdata, which are sometimes invoked by
- glib-compile-resources (Closes: #834998)
- * Invoke dh_python3 twice so that we correctly rewrite the shebang
- line for /usr/bin scripts (Closes: #876009)
- * Don't install very old changelogs and NEWS files
- * Install README.md instead of stub README
-
- -- Jeremy Bicha <[email protected]> Sun, 02 Sep 2018 08:57:46 -0400
-
-glib2.0 (2.57.2-2) experimental; urgency=medium
-
- * Cherry-pick g_binding_unbind-make-it-more-introspection-friendly-allo.patch
- to fix pygobject build (LP: #1787474)
-
- -- Jeremy Bicha <[email protected]> Mon, 20 Aug 2018 12:54:49 -0400
-
-glib2.0 (2.57.2-1) experimental; urgency=medium
-
- * Team upload
- * New upstream development release
- * d/watch: Look for odd-numbered releases
- * Rebase patch series
- * Install gio-launch-desktop in libglib2.0-0's private libdir to avoid
- a circular dependency between libglib2.0-0 and libglib2.0-bin
- - d/p/debian/Look-for-gio-launch-desktop-in-libdir-glib-2.0.patch:
- Look for it there
- * d/copyright: Update
- * d/libglib2.0-0.symbols: Update
- * Use upstream autogen.sh for autoreconf
- * Don't clean org.gtk.test.gschema.override.orig
- * d/gbp.conf: Use upstream/latest branch
- * d/p/Drop-a-questionable-test-from-the-refstring-suite.patch:
- Add patch to fix FTBFS on i386
- * d/p/date-test-Use-g_test_skip-not-g_test_incomplete.patch:
- Add patch to fix autopkgtest failures without locales-all
- * d/gbp.conf: Don't number patches
-
- -- Simon McVittie <[email protected]> Thu, 02 Aug 2018 17:44:16 +0100
-
-glib2.0 (2.56.1-2) unstable; urgency=medium
-
- [ Tim Lunn ]
- * libglib2.0-0.triggers:use interest-await trigger for schemas
-
- [ Iain Lane ]
- * debian/patches/tests-network-monitor-Always-use-the-dummy-proxy-res.patch:
- Take patch from upstream to ignore the system's proxy settings for the
- network-monitor test - it's testing an "abstract" network unrelated to the
- system's network, and these settings interfere with that. This fixes a
- failure in the Ubuntu autopkgtest machines, which have a proxy set.
-
- -- Iain Lane <[email protected]> Tue, 10 Apr 2018 18:12:27 +0100
-
-glib2.0 (2.56.1-1) unstable; urgency=medium
-
- [ Tim Lunn ]
- * New upstream release
- * Drop patches included in new release
- * libglib2.0-0.triggers: Use interest-noawait triggers, generating caches
- doesn't need to block configuration. flagged by lintian
- uses-implicit-await-trigger warning.
-
- [ Simon McVittie ]
- * Explicitly use autoconf build system, even with debhelper 11.2
- (see #895174)
-
- -- Tim Lunn <[email protected]> Mon, 09 Apr 2018 19:03:24 +1000
-
-glib2.0 (2.56.0-6) unstable; urgency=medium
-
- * Team upload
- * d/p/0002-gapplication-Tighten-up-application-ID-validation.patch:
- Transliterate commit message into ASCII so git-buildpackage doesn't
- export it as a blob of base64
- * d/p/g_test_dbus_down-Ensure-next-test-does-not-use-old-c.patch:
- Add patch to address a race condition that sometimes makes D-Bus-based
- tests fail (Closes: #894677)
- * d/patches: Improve metadata on various patches
-
- -- Simon McVittie <[email protected]> Thu, 05 Apr 2018 09:24:45 +0100
-
-glib2.0 (2.56.0-5) unstable; urgency=medium
-
- [ Simon McVittie ]
- * Use `set -e` in the (empty) prerm to avoid a Lintian warning
- * Add Lintian override for the empty prerm used to work around
- #887629
-
- [ Michael Biebl ]
- * Stop installing libglib to /lib.
- Late mounting of /usr is no longer supported, so this is not necessary
- anymore.
- * Drop maintscript migration code from pre-jessie.
- * Drop obsolete Breaks.
-
- -- Michael Biebl <[email protected]> Sun, 01 Apr 2018 17:59:50 +0200
-
-glib2.0 (2.56.0-4) unstable; urgency=medium
-
- * Fix typo: libglib2.0-dev-bin Depends on python3-distutils, not
- distuils (Closes: #893773)
- * Restore `set -x` in debian/tests/build
-
- -- Simon McVittie <[email protected]> Thu, 22 Mar 2018 09:08:05 +0000
-
-glib2.0 (2.56.0-3) unstable; urgency=medium
-
- [ Iain Lane ]
- * debian/tests/build: Add Restrictions: allow-stderr. We run this test with
- `set -x', which outputs to stderr, and would like to continue doing so.
-
- [ Jeremy Bicha ]
- * Depend and Build-Depend on python3-distutils to fix build failures
- since python3 no longer depends on python3-distutils (Closes: #893736)
-
- -- Jeremy Bicha <[email protected]> Thu, 22 Mar 2018 00:27:02 -0400
-
-glib2.0 (2.56.0-2) unstable; urgency=medium
-
- [ Simon McVittie ]
- * Merge from experimental to unstable
- * d/tests/build: Don't rely on having unmerged /usr
- * d/watch: Only watch for stable releases
- * d/gbp.conf: Use debian/master, upstream/2.56.x branches
- * d/control: Update Vcs-* for default branch
-
- -- Jeremy Bicha <[email protected]> Sat, 17 Mar 2018 08:49:26 -0400
-
-glib2.0 (2.56.0-1) experimental; urgency=medium
-
- * Team upload
- * New upstream stable release 2.56.0
- * d/p/000?-gdbus-tool-*.patch:
- Drop patches that came from upstream
- * Refresh remaining patches
- * d/p/0001-tests-Use-modern-test-assertions-in-GApplication-tes.patch,
- d/p/0002-gapplication-Tighten-up-application-ID-validation.patch:
- Cherry-pick GApplication ID fixes from upstream 2.56 branch
- (GNOME #793400)
-
- -- Simon McVittie <[email protected]> Tue, 13 Mar 2018 18:53:02 +0000
-
-glib2.0 (2.55.2-2) experimental; urgency=medium
-
- * Merge changes from unstable, in particular:
- + d/libglib2.0-dev.prerm: Add an empty prerm to make sure that we have a
- way to recover from #887629 in stretch (Closes: #887863)
- * d/p/0001-gdbus-tool-Ignore-unknown-options-for-the-emit-subco.patch,
- d/p/0002-gdbus-tool-Make-dest-optional-for-emit-again.patch,
- d/p/0003-gdbus-tool-Don-t-repeatedly-complete-signal.patch,
- d/p/0004-gdbus-tool-Factor-out-common-GOptionContext-construc.patch:
- Cherry-pick from upstream. Fix `gdbus emit' to not require `--dest', and
- improve its bash completion. Should fix the dbus-test-runner autopkgtest,
- which relied on this behaviour.
-
- -- Iain Lane <[email protected]> Thu, 22 Feb 2018 10:02:17 +0000
-
-glib2.0 (2.55.2-1) experimental; urgency=medium
-
- * debian/control{,.in}: Update Vcs-* to specify debian/experimental branch.
- * New upstream release 2.55.2:
- + GFile now has API to get the path without copying
- * debian/patches/gdbus-threading-test-Allow-even-longer-for-test_method_ca.patch,
- debian/patches/gdatetime-Avoid-repeated-floating-point-multiplies-w.patch,
- debian/patches/gdatetime-Mark-the-usecs-as-volatile.patch:
- Drop, applied upstream in this release.
- * debian/libglib2.0-0.symbols: New symbols for 2.55.2
-
- -- Iain Lane <[email protected]> Thu, 15 Feb 2018 10:23:05 +0000
-
-glib2.0 (2.55.1-1) experimental; urgency=medium
-
- * debian/gbp.conf, debian/watch: Update for experimental
- * New upstream development release 2.55.1
- * debian/libglib2.0-0.symbols: Update with new symbols in this release.
- * debian/patches/gdatetime-Avoid-repeated-floating-point-multiplies-w.patch,
- debian/patches/gdatetime-Mark-the-usecs-as-volatile.patch: Cherry-pick two
- patches from upstream. Fix some precision problems within GDateTime, that
- in some cases resulted in incorrect answers on i386.
-
- -- Iain Lane <[email protected]> Mon, 15 Jan 2018 12:26:35 +0000
-
-glib2.0 (2.54.3-2) unstable; urgency=medium
-
- * Team upload
- * d/libglib2.0-dev.prerm: Add an empty prerm to make sure that we have
- a way to recover from #887629 in stretch (Closes: #887863)
- * d/p/gdbus-threading-test-Allow-even-longer-for-test_method_ca.patch:
- Mark as applied upstream
- * d/p/gmain-Partial-revert-of-recent-wakeup-changes-to-gmain.c.patch:
- Apply patch from upstream glib-2-54 branch to revert GWakeup changes
- that appear to have broken WebKit and/or LibreOffice
- (Closes: #887492)
-
- -- Simon McVittie <[email protected]> Mon, 22 Jan 2018 12:39:58 +0000
-
-glib2.0 (2.54.3-1) unstable; urgency=medium
-
- [ Simon McVittie ]
- * Move Vcs-* to salsa.debian.org
- * New upstream stable release
- - Fix a race condition when a GCancellable is cancelled in another
- thread (Closes: #884654)
- - Drop patches for #884661, fixed upstream
- * d/p/gdbus-peer-Skip-test-during-Debian-package-build.patch:
- Drop. We should no longer need to skip this test now that #884654
- is fixed.
- * d/p/Do-not-attempt-to-autolaunch-a-session-dbus-daemon-w.patch:
- Drop patch. It has not been necessary since 2.50.
- * d/p/0001-Fix-trashing-on-overlayfs.patch,
- d/p/0001-timer-test-use-volatile-for-locals.patch,
- d/p/gdbus-threading-test-Allow-even-longer-for-test_method_ca.patch:
- Mark as forwarded upstream
- * d/patches: Move non-upstreamable patches (Debian-specific changes
- and workarounds) to d/p/debian, and to the bottom of d/p/series
- * d/watch: Only watch for the upstream stable branch
-
- [ Iain Lane ]
- * debian/gbp.conf: Update upstream branch to upstream/2.54.x following
- DEP-14.
-
- -- Iain Lane <[email protected]> Tue, 09 Jan 2018 18:02:53 +0000
-
-glib2.0 (2.54.2-5) unstable; urgency=medium
-
- * Set Rules-Requires-Root to no. This package builds successfully
- with the same content in that mode.
- * d/p/61_glib-compile-binaries-path.patch: Only use the multiarch
- path for glib-compile-schemas, not for glib-compile-resources
- * Install glib-compile-resources into PATH in libglib2.0-dev-bin,
- not libglib2.0-bin: it is a development tool used at compile-time
- - libglib2.0-dev-bin Breaks/Replaces older libglib2.0-bin
- * Install the glib-compile-resources binary in libglib2.0-dev-bin,
- not libglib2.0-0. This means we get an executable version of that
- binary when cross-compiling (Closes: #885019)
- * Bump Standards-Version to 4.1.3
-
- -- Simon McVittie <[email protected]> Fri, 29 Dec 2017 22:07:56 +0000
-
-glib2.0 (2.54.2-4) unstable; urgency=medium
-
- * Team upload
- * d/p/closures-test-Run-fewer-iterations-on-ARM64.patch:
- Run more iterations on ARM64 than in 2.54.2-3, but fewer than in
- 2.54.2-2. If we don't run enough iterations, we get an assertion
- failure when the main thread starves the other threads.
- * d/p/gmenumodel*.patch: Mark as upstreamed in 2.54.3 and 2.55.1
- * d/rules: Set DEB_BUILD_TIME_TESTS when running dh_auto_test, so that
- tests can distinguish between autopkgtest and `make check`
- * d/p/gdbus-peer-Skip-test-during-Debian-package-build.patch:
- Skip the gdbus-peer test during package build, so that its known
- race condition does not cause intermittent FTBFS (mitigates: #884654)
-
- -- Simon McVittie <[email protected]> Thu, 21 Dec 2017 14:41:40 +0000
-
-glib2.0 (2.54.2-3) unstable; urgency=medium
-
- * Team upload
- * d/patches: Re-export with gbp pq
- * d/patches: Use `gbp pq export`-style metadata, retrieving authors
- and dates from d/changelog where needed
- * d/p/closures-test-Run-fewer-iterations-on-ARM64.patch: New patch.
- tests/refcount/closures: Run fewer iterations on ARM64
- (mitigates: #880883)
- * d/p/gdbus-threading-test-Allow-even-longer-for-test_method_ca.patch:
- New patch. Allow even longer for the gdbus-threading test, and
- re-enable it on 32-bit ARM now that the timeout is longer
- (Closes: #884660)
- * d/p/gmenumodel-test-If-something-goes-wrong-don-t-wait-foreve.patch,
- d/p/gmenumodel-test-Wait-for-the-expected-events-to-happen.patch:
- Add patches to make the GMenuModel test more patient (Closes: #884661)
- * d/p/gwakeuptest-Be-less-parallel-unless-invoked-with-m-slow.patch:
- Reduce number of threads and number of operations in response to
- timeout on reproducible-builds infrastructure (mitigates: #884659)
-
- -- Simon McVittie <[email protected]> Mon, 18 Dec 2017 21:30:18 +0000
-
-glib2.0 (2.54.2-2) unstable; urgency=medium
-
- * Update Vcs fields for conversion to git
- * Add debian/gbp.conf
- * Bump Standards-Version to 4.1.2
-
- -- Jeremy Bicha <[email protected]> Wed, 13 Dec 2017 21:15:13 -0500
+ -- Philip Withnall <[email protected]> Mon, 27 Nov 2017 08:56:00 +0000
glib2.0 (2.54.2-1) unstable; urgency=medium
@@ -2018,7 +1458,7 @@ glib2.0 (2.38.1-1) experimental; urgency=low
* Build-Depend on python:any. python is Multi-Arch: allowed; this BD allows
the python from any architecture that can be executed on the builder to
satisfy the BD, simplifying cross building of glib2.0.
- * New upstream bugfix release 2.38.1
+ * New upstream bugfix release 2.38.1
+ Fix error code checks when SOCK_CLOEXEC is defined but not supported
(fix support for GNU/Hurd)
+ g_settings_list_children: only list viable schemas (fix gsettings
@@ -2040,7 +1480,7 @@ glib2.0 (2.38.0-1) experimental; urgency=low
Cherry-pick patch from upstream to fix object path typo in gio (LP:
#1227295)
* Add --enable-debug=minimal explicitly to the deb build so the debugging
- level doesn't change between pre-release and stable versions.
+ level doesn't change between pre-release and stable versions.
-- Iain Lane <[email protected]> Wed, 25 Sep 2013 10:37:50 +0000
@@ -2048,7 +1488,7 @@ glib2.0 (2.37.93-1) experimental; urgency=low
* New upstream release 2.37.93 (& .92)
+ new API g_file_measure_disk_usage() similar to du(1)
- * Add new symbols for g_file_measure_disk_usage API added in this release.
+ * Add new symbols for g_file_measure_disk_usage API added in this release.
-- Iain Lane <[email protected]> Wed, 18 Sep 2013 10:07:15 +0000
@@ -2063,7 +1503,7 @@ glib2.0 (2.37.7-1) experimental; urgency=low
glib2.0 (2.37.6-1) experimental; urgency=low
* New upstream release 2.37.6
- * Update symbols file
+ * Update symbols file
* Merge changes from unstable, mainly for build / testsuite fixes.
-- Iain Lane <[email protected]> Wed, 21 Aug 2013 09:48:19 +0000
@@ -2076,16 +1516,16 @@ glib2.0 (2.37.5-1) experimental; urgency=low
key was locked down)
+ add a new API for instance private data: G_DEFINE_TYPE_WITH_PRIVATE
+ add new D-Bus API for async property handling
- * libglib2.0-tests: Depend on shared-mime-info required by contenttype test.
+ * libglib2.0-tests: Depend on shared-mime-info required by contenttype test.
* New upstream release
* 0001-Revert-g_file_set_contents-don-t-fsync-on-ext3-4.patch: Drop, now
upstream.
* debian/tests/installed-tests: Add a new DEP-8 test to run the
installed-tests.
* Refresh patches.
- * Update symbols file.
+ * Update symbols file.
* debian/patches/skip-brokwn-dbus-appinfo-test.patch: Skip a broken new
- dbus-appinfo test which is hanging.
+ dbus-appinfo test which is hanging.
-- Iain Lane <[email protected]> Fri, 02 Aug 2013 16:54:51 +0000
@@ -2106,13 +1546,13 @@ glib2.0 (2.37.2-1) experimental; urgency=low
trigger a warning.
+ GApplication Support org.freedesktop.Application, including D-Bus
activation from desktop files
- * Refresh patches.
- * Update symbols file with new symbols in this release.
- * Enable installed tests and install into a libglib2.0-tests package.
+ * Refresh patches.
+ * Update symbols file with new symbols in this release.
+ * Enable installed tests and install into a libglib2.0-tests package.
* clean debian/{install,build,stamp-makefile-check} and
- gio/gdbus-2.0/codegen/*.pyc
+ gio/gdbus-2.0/codegen/*.pyc
* Set $XDG_RUNTIME_DIR to a writable directory we control; now required by
- the testsuite.
+ the testsuite.
-- Iain Lane <[email protected]> Fri, 21 Jun 2013 15:28:46 +0100
@@ -2144,8 +1584,8 @@ glib2.0 (2.36.3-3) unstable; urgency=low
* Use gcc-4.8 on sparc to fix misbuild causing test failure (closes: #709781).
[ Josselin Mouette ]
- * Only make the testsuite fatal on linux. Although the other
- architectures don’t pass, we have to keep a pair of reverse
+ * Only make the testsuite fatal on linux. Although the other
+ architectures don’t pass, we have to keep a pair of reverse
dependencies working.
-- Josselin Mouette <[email protected]> Sat, 06 Jul 2013 15:51:11 +0200
@@ -2163,9 +1603,9 @@ glib2.0 (2.36.3-2) unstable; urgency=low
glib2.0 (2.36.3-1) unstable; urgency=low
[ Josselin Mouette ]
- * Make the testsuite fatal on all architectures. If it fails, we need
+ * Make the testsuite fatal on all architectures. If it fails, we need
to fix it or drop the architecture, not to ignore it.
- * Break libgnome-desktop-3-2 < 3.4.2-2 for the thumbnails location
+ * Break libgnome-desktop-3-2 < 3.4.2-2 for the thumbnails location
change.
[ Emilio Pozuelo Monfort ]
@@ -2184,7 +1624,7 @@ glib2.0 (2.36.1-2) unstable; urgency=low
glib2.0 (2.36.1-1) experimental; urgency=low
* New upstream release
- * Refresh debian/patches/06_thread_test_ignore_prctl_fail.patch
+ * Refresh debian/patches/06_thread_test_ignore_prctl_fail.patch
-- Iain Lane <[email protected]> Tue, 23 Apr 2013 10:20:47 +0100
@@ -2276,8 +1716,8 @@ glib2.0 (2.35.8-1) experimental; urgency=low
* Refresh patches and slightly rework debian/patches/04_homedir_env.patch:
g_get_home_dir() now respects the HOME environment variable but we'll keep
G_HOME for now as packages in Debian rely on it.
- * gdbus-codegen .py files have moved to /usr/share/glib-2.0
- * Update symbols file
+ * gdbus-codegen .py files have moved to /usr/share/glib-2.0
+ * Update symbols file
[ Martin Pitt ]
* New upstream release 2.35.4
@@ -2338,7 +1778,7 @@ glib2.0 (2.34.1-2) experimental; urgency=low
glib2.0 (2.34.1-1) experimental; urgency=low
[ Josselin Mouette ]
- * Require libelfg0-dev, not libelf-dev which has nothing to do with
+ * Require libelfg0-dev, not libelf-dev which has nothing to do with
it.
[ Iain Lane ]
@@ -2347,7 +1787,7 @@ glib2.0 (2.34.1-1) experimental; urgency=low
+ Leak in glib-compile-resources
+ g_settings_bind: use canonical property name
+ Port gio tests from pygobject to pygi
- * Switch python-gobject-2 BD to python-gi, folowing porting of tests.
+ * Switch python-gobject-2 BD to python-gi, folowing porting of tests.
* debian/patches/50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch:
Cherry-pick upstream patch to fix crash when GBusNameVanishedCallback is
called with a NULL GDBusConnection. (LP: #1044322)
@@ -2395,7 +1835,7 @@ glib2.0 (2.33.14-1) experimental; urgency=low
+ gresource tests: srcdir != builddir fixes
+ tests/gvariant: Fix test on big endian architectures
+ Fix regression in g_shell_parse_argv()
- * Dropped 07_tests_gvariant_big_endian.patch: applied upstream.
+ * Dropped 07_tests_gvariant_big_endian.patch: applied upstream.
[ Michael Biebl ]
* Bump all 2.33.x symbol versions to 2.33.14 to ensure a tight enough
@@ -2478,7 +1918,7 @@ glib2.0 (2.33.8-1) experimental; urgency=low
values have been changed to 2 and 15*1000, respectively.
* debian/control{,.in}: XC-Package-Type → Package-Type, thanks to Lintian.
* debian/libglib2.0-0.symbols: Update for new symbols in this release and
- remove Debian revisions which aren't necessary.
+ remove Debian revisions which aren't necessary.
-- Iain Lane <[email protected]> Tue, 07 Aug 2012 14:38:25 +0100
@@ -2560,7 +2000,7 @@ glib2.0 (2.33.3-1) experimental; urgency=low
glib2.0 (2.33.2-1) experimental; urgency=low
- * Track unstable versions in the experimental branch.
+ * Track unstable versions in the experimental branch.
* New upstream release 2.33.2
- GLIB_VERSION_MIN_REQUIRED now defaults to the current stable version
- GIO input and output stream classes have grown GBytes-based methods
@@ -2615,12 +2055,12 @@ glib2.0 (2.33.12+really2.32.4-3) unstable; urgency=low
glib2.0 (2.33.12+really2.32.4-2) unstable; urgency=medium
- * Revert link adding for gdbus-object-manager-example. While it is
- useful to have in /usr/share/doc as an example, it must not be
+ * Revert link adding for gdbus-object-manager-example. While it is
+ useful to have in /usr/share/doc as an example, it must not be
shipped with the system documentation.
- * 20_glib-compile-resources_leak.patch: new patch. Fix a leak
+ * 20_glib-compile-resources_leak.patch: new patch. Fix a leak
introduced in version 2.32.4. Thanks Niels Thykier!
- * SECURITY: add 11_CVE-2012-3524_setuid.patch from upstream. Prevents
+ * SECURITY: add 11_CVE-2012-3524_setuid.patch from upstream. Prevents
using DBus in a setuid binary. Fixes CVE-2012-3524.
-- Josselin Mouette <[email protected]> Sat, 06 Oct 2012 01:15:16 +0200
@@ -2628,7 +2068,7 @@ glib2.0 (2.33.12+really2.32.4-2) unstable; urgency=medium
glib2.0 (2.33.12+really2.32.4-1) unstable; urgency=low
* New upstream bugfix release.
- * 10_gdbus_race.patch: stolen from upstream git. Fix a race condition
+ * 10_gdbus_race.patch: stolen from upstream git. Fix a race condition
that would make gnome-shell crash on startup under some conditions.
* libglib2.0-bin.install: bash completions have moved to /usr/share.
* libglib2.0-bin.maintscript: remove old conffiles.
@@ -2815,7 +2255,7 @@ glib2.0 (2.30.2-7) UNRELEASED; urgency=low
* libglib2.0-0.postinst.in:
+ Encapsulate gio-querymodules calls in || true statements.
Closes: #659588.
- + Only run gio-querymodules on the non-multiarch path for the host
+ + Only run gio-querymodules on the non-multiarch path for the host
architecture.
* rules: add substitution for #ARCH# for the above change.
@@ -2947,7 +2387,7 @@ glib2.0 (2.30.1-1) experimental; urgency=low
- Refresh remaining patches.
[ Josselin Mouette ]
- * Break gtk3 < 3.0.12 because it uses an internal symbol that ceases
+ * Break gtk3 < 3.0.12 because it uses an internal symbol that ceases
to work with glib 2.30.
[ Sjoerd Simons ]
@@ -2985,13 +2425,13 @@ glib2.0 (2.28.6-4) unstable; urgency=low
glib2.0 (2.28.6-3) experimental; urgency=low
- * Break gnome-session < 3.0.0-3 for the updated defaults.list taking
+ * Break gnome-session < 3.0.0-3 for the updated defaults.list taking
x-scheme-* into account.
* Break gdm < 3.0.3 to avoid adding a security hole to it.
- * 10_gdesktopappinfo_set_last_used.patch: new patch. When calling
- g_app_info_set_as_last_used_for_type, correctly inherit the default
- filled in the file from the system default. This avoids
- gnome-control-center breaking file associations just by opening the
+ * 10_gdesktopappinfo_set_last_used.patch: new patch. When calling
+ g_app_info_set_as_last_used_for_type, correctly inherit the default
+ filled in the file from the system default. This avoids
+ gnome-control-center breaking file associations just by opening the
info dialog.
-- Josselin Mouette <[email protected]> Sun, 04 Sep 2011 23:07:46 +0200
@@ -3056,9 +2496,9 @@ glib2.0 (2.28.1-1) unstable; urgency=low
glib2.0 (2.28.0-2) unstable; urgency=low
- * 20_mime_extension_point.patch: temporary revert the upstream change
+ * 20_mime_extension_point.patch: temporary revert the upstream change
in URI schemes handling. Closes: #612876.
- Note for later: it must absolutely be reverted in a synchronized
+ Note for later: it must absolutely be reverted in a synchronized
upload with gvfs 1.8 and control-center 3.0.
-- Josselin Mouette <[email protected]> Fri, 18 Feb 2011 19:36:42 +0100
@@ -3333,13 +2773,13 @@ glib2.0 (2.25.11-1) experimental; urgency=low
* debian/libglib2.0-dev.install:
- glib-compile-schemas moved to libglib2.0-bin
* debian/libglib2.0-dev.install:
- - install the new gdb python macros since the gdb version is recent
+ - install the new gdb python macros since the gdb version is recent
enough now to use those
- * Put gio-querymodules and glib-compile-schemas in a private,
+ * Put gio-querymodules and glib-compile-schemas in a private,
versioned directory in libglib2.0-0 to avoid a dependency loop.
* Move back the triggers to libglib2.0-0.
* Add a purge of the necessary files in the postinst.
- * Stop recommending libglib2.0-bin since the necessary stuff is in
+ * Stop recommending libglib2.0-bin since the necessary stuff is in
libglib2.0-0 now.
* Add symlinks to keep the binaries at their place in libglib2.0-bin.
* Tighten the dependency between libglib2.0-bin and libglib2.0-0.
@@ -3639,9 +3079,9 @@ glib2.0 (2.22.1-1) unstable; urgency=low
glib2.0 (2.22.0-2) unstable; urgency=low
- * Don’t install Python GDB macros for now, they only work with an
+ * Don’t install Python GDB macros for now, they only work with an
experimental GDB branch.
- * 30_metadata_symlinks.patch: stolen upstream. Get metadata to work
+ * 30_metadata_symlinks.patch: stolen upstream. Get metadata to work
with symbolic links. Closes: #548142.
-- Josselin Mouette <[email protected]> Wed, 30 Sep 2009 01:02:11 +0200
@@ -3649,10 +3089,10 @@ glib2.0 (2.22.0-2) unstable; urgency=low
glib2.0 (2.22.0-1) unstable; urgency=low
[ Josselin Mouette ]
- * Move libglib-2.0.so.0 to /lib so that DeviceKit (and other potential
+ * Move libglib-2.0.so.0 to /lib so that DeviceKit (and other potential
sources) can work without having /usr mounted.
- * 11_chmod_symlinks.patch: new patch. Fix potential security issue
- when manipulating symlink permissions. Thanks Arand Nash for the
+ * 11_chmod_symlinks.patch: new patch. Fix potential security issue
+ when manipulating symlink permissions. Thanks Arand Nash for the
heads up.
[ Sebastian Dröge ]
@@ -3668,7 +3108,7 @@ glib2.0 (2.22.0-1) unstable; urgency=low
glib2.0 (2.21.6-1) experimental; urgency=low
[ Josselin Mouette ]
- * 10_inotify_init1.patch: fall back on inotify_init when inotify_init1
+ * 10_inotify_init1.patch: fall back on inotify_init when inotify_init1
does not work, as happens with kernel versions < 2.6.27.
Closes: #544354.
@@ -3717,7 +3157,7 @@ glib2.0 (2.20.4-1) unstable; urgency=low
glib2.0 (2.20.3-1) unstable; urgency=low
[ Josselin Mouette ]
- * Only build the libgio-fam package for hurd and kfreebsd, it is
+ * Only build the libgio-fam package for hurd and kfreebsd, it is
totally useless under Linux.
* Make it recommend gamin for kqueue support.
* Make libgamin-dev the primary build-dependency. Closes: #526219.
@@ -3735,7 +3175,7 @@ glib2.0 (2.20.1-2) unstable; urgency=low
glib2.0 (2.20.1-1) unstable; urgency=low
- * New upstream bugfix release:
+ * New upstream bugfix release:
+ 10_log_valist.patch, dropped.
-- Sebastian Dröge <[email protected]> Sat, 11 Apr 2009 17:00:43 +0200
@@ -3743,14 +3183,14 @@ glib2.0 (2.20.1-1) unstable; urgency=low
glib2.0 (2.20.0-3) unstable; urgency=low
* Fix debug package section.
- * 10_log_valist.patch: new patch, stolen upstream. Copy a va_list
+ * 10_log_valist.patch: new patch, stolen upstream. Copy a va_list
before using it twice. Closes: #520484.
-- Josselin Mouette <[email protected]> Thu, 09 Apr 2009 20:11:52 +0200
glib2.0 (2.20.0-2) unstable; urgency=low
- * Remove 02_usr_share_gnome_applications.patch, now gnome-session sets
+ * Remove 02_usr_share_gnome_applications.patch, now gnome-session sets
XDG_DATA_DIRS accordingly.
-- Josselin Mouette <[email protected]> Thu, 19 Mar 2009 22:59:34 +0100
@@ -3826,9 +3266,9 @@ glib2.0 (2.18.4-2) unstable; urgency=low
glib2.0 (2.18.4-1) experimental; urgency=low
[ Josselin Mouette ]
- * 04_homedir_env.patch: new patch. Handle the G_HOME environment
- variable, to override the passwd entry. This will allow to fix
- various kinds of build failures due to restricted build
+ * 04_homedir_env.patch: new patch. Handle the G_HOME environment
+ variable, to override the passwd entry. This will allow to fix
+ various kinds of build failures due to restricted build
environments.
[ Sebastian Dröge ]
@@ -4007,12 +3447,12 @@ glib2.0 (2.16.2-1) unstable; urgency=low
glib2.0 (2.16.1-2) unstable; urgency=low
[ Josselin Mouette ]
- * 02_usr_share_gnome_applications.patch: ported from GnomeVFS. Use
- /usr/share/gnome/applications/defaults.list to obtain the defaults
+ * 02_usr_share_gnome_applications.patch: ported from GnomeVFS. Use
+ /usr/share/gnome/applications/defaults.list to obtain the defaults
for MIME mapping. Currently this file is still shipped by GnomeVFS.
Closes: #469504.
- * 03_blacklist-directories.patch: ported from GnomeVFS. Blacklist more
- FHS directories that are commonly found as Unix mount points,
+ * 03_blacklist-directories.patch: ported from GnomeVFS. Blacklist more
+ FHS directories that are commonly found as Unix mount points,
including those necessary for live-initramfs.
* 04_nfs4.patch: ported from GnomeVFS. Support for nfs4 filesystems.
@@ -4512,7 +3952,7 @@ glib2.0 (2.12.0-1) experimental; urgency=low
Major new features include:
* The Unicode support has been updated to Unicode 5.
* GBookmarkFile: a parser for files containing bookmarks
- stored using the Desktop Bookmark specification
+ stored using the Desktop Bookmark specification
* Base64 encoding support
* debian/rules:
- updated shver number
@@ -4526,7 +3966,7 @@ glib2.0 (2.10.3-3) unstable; urgency=low
* debian/patches/999_ia64_atomic_ops_broken.patch:
- dropped, it's not required with the new gcc and it was breaking the build
(Closes: #376260)
-
+
[ Loic Minier ]
* Sync with overrides and set udeb's Priority to optional instead of extra.
@@ -4543,13 +3983,13 @@ glib2.0 (2.10.3-1) unstable; urgency=low
* New upstream version:
Bugs fixed:
- - g_completion_complete_utf8 crashes when NULL is passed to it
- - update-desktop-database doesn't handle duplicate entries
+ - g_completion_complete_utf8 crashes when NULL is passed to it
+ - update-desktop-database doesn't handle duplicate entries
(Closes: #298668)
- Dereferencing NULL value in g_key_file_get_group_comment
- GKeyFile set_string_list invalid memory reads
- The GObject tutorial say g_object_(un)ref is _not_ thread-safe
- - Fix a memory leak in GOption
+ - Fix a memory leak in GOption
-- Sebastien Bacher <[email protected]> Sat, 27 May 2006 12:54:17 +0200
@@ -4597,7 +4037,7 @@ glib2.0 (2.10.2-1) unstable; urgency=low
- use "-g" for CFLAGS, makes -dbg package useful again
change by Fabio M. Di Nitto <[email protected]> on the Ubuntu package:
* Make sure to pass CFLAGS to configure.
- * Generalize DEB_BUILD_ARCH.
+ * Generalize DEB_BUILD_ARCH.
-- Sebastien Bacher <[email protected]> Fri, 7 Apr 2006 23:23:14 +0200
@@ -4626,7 +4066,7 @@ glib2.0 (2.10.1-1) experimental; urgency=low
in line with control.in .
Josselin Mouette <[email protected]>:
- * Conflict with pango < 1.10 to avoid breakage caused by the unicode
+ * Conflict with pango < 1.10 to avoid breakage caused by the unicode
changes.
-- J.H.M. Dassen (Ray) <[email protected]> Sat, 11 Mar 2006 13:53:16 +0100
@@ -4679,7 +4119,7 @@ glib2.0 (2.8.4-1) unstable; urgency=low
glib2.0 (2.8.3-1) unstable; urgency=medium
- * New upstream release (fix an error that crept in with a change to
+ * New upstream release (fix an error that crept in with a change to
glib-mkenums in 2.8.2, documentation improvements, translation updates).
-- J.H.M. Dassen (Ray) <[email protected]> Mon, 3 Oct 2005 20:52:26 +0200
@@ -4693,7 +4133,7 @@ glib2.0 (2.8.2-1) unstable; urgency=medium
glib2.0 (2.8.1-1) unstable; urgency=medium
- * New (for Debian) upstream version (bug fixes, documentation improvements,
+ * New (for Debian) upstream version (bug fixes, documentation improvements,
translation updates).
* [debian/control.in] Bumped Standards-Version.
* [debian/copyright] Updated FSF's address.
@@ -4887,7 +4327,7 @@ glib2.0 (2.4.6-1) unstable; urgency=medium
glib2.0 (2.4.5-2) unstable; urgency=low
* debian/patches/000_glib-link.patch:
- - patch from Jurij Smakov <[email protected]> to link with all the libs
+ - patch from Jurij Smakov <[email protected]> to link with all the libs
(Closes: #263130).
-- Sebastien Bacher <[email protected]> Tue, 3 Aug 2004 18:03:53 +0200
@@ -4916,9 +4356,9 @@ glib2.0 (2.4.1-2) unstable; urgency=low
* Upload in unstable.
* GNOME Team Upload.
* J.H.M. Dassen (Ray) <[email protected]>:
- + [debian/rules] Make the linker work a bit harder so dynamic loading can
+ + [debian/rules] Make the linker work a bit harder so dynamic loading can
be done faster; safety measure: ensure the build aborts when the library
- still has references to undefined symbols.
+ still has references to undefined symbols.
-- Sebastien Bacher <[email protected]> Sat, 22 May 2004 14:18:23 +0200
@@ -4928,7 +4368,7 @@ glib2.0 (2.4.1-1) experimental; urgency=low
* GNOME Team Upload.
* debian/rules:
- updated shlib version to 2.4.1.
-
+
-- Sebastien Bacher <[email protected]> Sun, 2 May 2004 12:47:25 +0200
glib2.0 (2.4.0-2) experimental; urgency=low
diff --git a/debian/compat b/debian/compat
index b4de39476..f599e28b8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-11
+10
diff --git a/debian/control b/debian/control
index 5fd2245d1..7a564b94f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,47 +1,44 @@
# This file is autogenerated. DO NOT EDIT!
-#
+#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
Source: glib2.0
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <[email protected]>
-Uploaders: Iain Lane <[email protected]>, Jeremy Bicha <[email protected]>
-Build-Depends: dbus <!nocheck>,
- debhelper (>= 11),
- desktop-file-utils <!nocheck>,
+Uploaders: Emilio Pozuelo Monfort <[email protected]>, Iain Lane <[email protected]>, Jeremy Bicha <[email protected]>, Matthias Klumpp <[email protected]>
+Build-Depends: debhelper (>= 10.3~),
dh-exec,
dh-python,
- docbook-xml,
- docbook-xsl,
- dpkg-dev (>= 1.17.14),
+ pkg-config (>= 0.16.0),
gettext,
gnome-pkg-tools (>= 0.11),
- gtk-doc-tools (>= 1.20),
+ dpkg-dev (>= 1.17.14),
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],
- meson (>= 0.48.0),
- pkg-config (>= 0.16.0),
- python3-dbus <!nocheck>,
- python3-distutils,
- python3-gi <!nocheck>,
- python3:any (>= 2.7.5-5~),
+ libgamin-dev [!linux-any] | libfam-dev [!linux-any],
+ zlib1g-dev,
+ desktop-file-utils <!nocheck>,
+ dbus <!nocheck>,
shared-mime-info <!nocheck>,
tzdata <!nocheck>,
- xsltproc,
xterm <!nocheck>,
- zlib1g-dev
-Rules-Requires-Root: no
-Standards-Version: 4.3.0
+ python3:any (>= 2.7.5-5~),
+ python3-dbus <!nocheck>,
+ python3-gi <!nocheck>,
+ libxml2-utils,
+ xsltproc,
+ docbook-xml,
+ docbook-xsl,
+ libffi-dev (>= 3.0.0)
+Standards-Version: 4.1.1
Homepage: http://www.gtk.org/
-Vcs-Browser: https://salsa.debian.org/gnome-team/glib/tree/debian/experimental
-Vcs-Git: https://salsa.debian.org/gnome-team/glib.git -b debian/experimental
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glib2.0/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glib2.0/
Package: libglib2.0-0
Architecture: any
@@ -50,6 +47,9 @@ Depends: ${misc:Depends},
Recommends: libglib2.0-data,
shared-mime-info,
xdg-user-dirs
+Breaks: glib-networking (<< 2.33.12),
+ python-gi (<< 3.7.2),
+ libgnome-desktop-3-2 (<< 3.4.2-2)
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Description: GLib library of C routines
@@ -61,9 +61,9 @@ Description: GLib library of C routines
Package: libglib2.0-tests
Architecture: any
-Depends: shared-mime-info,
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ shared-mime-info
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
@@ -94,10 +94,10 @@ Package: libglib2.0-bin
Section: misc
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: libglib2.0-0 (= ${binary:Version}),
- libglib2.0-data,
+Depends: ${shlibs:Depends},
${misc:Depends},
- ${shlibs:Depends}
+ libglib2.0-0 (= ${binary:Version}),
+ libglib2.0-data
Multi-Arch: foreign
Description: Programs for the GLib library
GLib is a library containing many useful C routines for things such
@@ -111,18 +111,15 @@ Package: libglib2.0-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libffi-dev (>= 3.0.0),
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ ${python3:Depends},
libglib2.0-0 (= ${binary:Version}),
libglib2.0-bin (= ${binary:Version}),
libglib2.0-dev-bin (= ${binary:Version}),
- libmount-dev (>= 2.28) [linux-any],
libpcre3-dev (>= 1:8.31),
- libselinux1-dev [linux-any],
pkg-config,
- zlib1g-dev,
- ${misc:Depends},
- ${python3:Depends},
- ${shlibs:Depends}
+ zlib1g-dev
Breaks: libglib2.0-0-dbg (<< 2.51.4-1~)
Replaces: libglib2.0-0-dbg (<< 2.51.4-1~)
Suggests: libglib2.0-doc
@@ -138,16 +135,11 @@ Description: Development files for the GLib library
Package: libglib2.0-dev-bin
Section: libdevel
Architecture: any
-Depends: python3-distutils,
- ${misc:Depends},
+Depends: ${misc:Depends},
${python3:Depends},
- ${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~),
- libglib2.0-dev (<< 2.53)
-Replaces: libglib2.0-bin (<< 2.54.2-5~),
- libglib2.0-dev (<< 2.53)
+ ${shlibs:Depends},
+Breaks: libglib2.0-dev (<< 2.53)
+Replaces: libglib2.0-dev (<< 2.53)
Multi-Arch: foreign
Description: Development utilities for the GLib library
GLib is a library containing many useful C routines for things such
@@ -186,8 +178,8 @@ Description: Documentation files for the GLib library
Package: libgio-fam
Architecture: hurd-any kfreebsd-any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Recommends: gamin
Multi-Arch: same
Description: GLib Input, Output and Streaming Library (fam module)
diff --git a/debian/control.in b/debian/control.in
index 1d7864ff7..e4825b0b4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,41 +3,38 @@ Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <[email protected]>
Uploaders: @GNOME_TEAM@
-Build-Depends: dbus <!nocheck>,
- debhelper (>= 11),
- desktop-file-utils <!nocheck>,
+Build-Depends: debhelper (>= 10.3~),
dh-exec,
dh-python,
- docbook-xml,
- docbook-xsl,
- dpkg-dev (>= 1.17.14),
+ pkg-config (>= 0.16.0),
gettext,
gnome-pkg-tools (>= 0.11),
- gtk-doc-tools (>= 1.20),
+ dpkg-dev (>= 1.17.14),
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],
- meson (>= 0.48.0),
- pkg-config (>= 0.16.0),
- python3-dbus <!nocheck>,
- python3-distutils,
- python3-gi <!nocheck>,
- python3:any (>= 2.7.5-5~),
+ libgamin-dev [!linux-any] | libfam-dev [!linux-any],
+ zlib1g-dev,
+ desktop-file-utils <!nocheck>,
+ dbus <!nocheck>,
shared-mime-info <!nocheck>,
tzdata <!nocheck>,
- xsltproc,
xterm <!nocheck>,
- zlib1g-dev
-Rules-Requires-Root: no
-Standards-Version: 4.3.0
+ python3:any (>= 2.7.5-5~),
+ python3-dbus <!nocheck>,
+ python3-gi <!nocheck>,
+ libxml2-utils,
+ xsltproc,
+ docbook-xml,
+ docbook-xsl,
+ libffi-dev (>= 3.0.0)
+Standards-Version: 4.1.1
Homepage: http://www.gtk.org/
-Vcs-Browser: https://salsa.debian.org/gnome-team/glib/tree/debian/experimental
-Vcs-Git: https://salsa.debian.org/gnome-team/glib.git -b debian/experimental
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/glib2.0/
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/glib2.0/
Package: libglib2.0-0
Architecture: any
@@ -46,6 +43,9 @@ Depends: ${misc:Depends},
Recommends: libglib2.0-data,
shared-mime-info,
xdg-user-dirs
+Breaks: glib-networking (<< 2.33.12),
+ python-gi (<< 3.7.2),
+ libgnome-desktop-3-2 (<< 3.4.2-2)
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Description: GLib library of C routines
@@ -57,9 +57,9 @@ Description: GLib library of C routines
Package: libglib2.0-tests
Architecture: any
-Depends: shared-mime-info,
- ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ shared-mime-info
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
@@ -90,10 +90,10 @@ Package: libglib2.0-bin
Section: misc
Architecture: any
Pre-Depends: ${misc:Pre-Depends}
-Depends: libglib2.0-0 (= ${binary:Version}),
- libglib2.0-data,
+Depends: ${shlibs:Depends},
${misc:Depends},
- ${shlibs:Depends}
+ libglib2.0-0 (= ${binary:Version}),
+ libglib2.0-data
Multi-Arch: foreign
Description: Programs for the GLib library
GLib is a library containing many useful C routines for things such
@@ -107,18 +107,15 @@ Package: libglib2.0-dev
Section: libdevel
Architecture: any
Multi-Arch: same
-Depends: libffi-dev (>= 3.0.0),
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ ${python3:Depends},
libglib2.0-0 (= ${binary:Version}),
libglib2.0-bin (= ${binary:Version}),
libglib2.0-dev-bin (= ${binary:Version}),
- libmount-dev (>= 2.28) [linux-any],
libpcre3-dev (>= 1:8.31),
- libselinux1-dev [linux-any],
pkg-config,
- zlib1g-dev,
- ${misc:Depends},
- ${python3:Depends},
- ${shlibs:Depends}
+ zlib1g-dev
Breaks: libglib2.0-0-dbg (<< 2.51.4-1~)
Replaces: libglib2.0-0-dbg (<< 2.51.4-1~)
Suggests: libglib2.0-doc
@@ -134,16 +131,11 @@ Description: Development files for the GLib library
Package: libglib2.0-dev-bin
Section: libdevel
Architecture: any
-Depends: python3-distutils,
- ${misc:Depends},
+Depends: ${misc:Depends},
${python3:Depends},
- ${shlibs:Depends}
-Suggests: libgdk-pixbuf2.0-bin (>= 2.36.12-2~) | libgdk-pixbuf2.0-dev,
- libxml2-utils
-Breaks: libglib2.0-bin (<< 2.59.2),
- libglib2.0-dev (<< 2.53)
-Replaces: libglib2.0-bin (<< 2.59.2),
- libglib2.0-dev (<< 2.53)
+ ${shlibs:Depends},
+Breaks: libglib2.0-dev (<< 2.53)
+Replaces: libglib2.0-dev (<< 2.53)
Multi-Arch: foreign
Description: Development utilities for the GLib library
GLib is a library containing many useful C routines for things such
@@ -182,8 +174,8 @@ Description: Documentation files for the GLib library
Package: libgio-fam
Architecture: hurd-any kfreebsd-any
-Depends: ${misc:Depends},
- ${shlibs:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Recommends: gamin
Multi-Arch: same
Description: GLib Input, Output and Streaming Library (fam module)
diff --git a/debian/copyright b/debian/copyright
index 2304e5645..143d4e837 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,12 +33,10 @@ Takuji Nishimura <[email protected]>
Major copyright holders:
- Copyright © 1995-2018 Red Hat, Inc.
+ Copyright © 1995-2011 Red Hat, Inc.
Copyright © 2008-2010 Novell, Inc.
Copyright © 2008-2010 Codethink Limited.
- Copyright © 2008-2018 Collabora, Ltd.
- Copyright © 2018 Endless Mobile, Inc.
- Copyright © 2018 Emmanuele Bassi
+ Copyright © 2008-2010 Collabora, Ltd.
License:
@@ -58,72 +56,3 @@ License:
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL'.
-
-Files:
- gobject/tests/taptestrunner.py
-Copyright:
- 2015 Remko Tronçon
-License: Expat
-
-Files:
- tests/gen-casefold-txt.py
- tests/gen-casemap-txt.py
-Copyright:
- 1998-1999 Tom Tromey
- 2001 Red Hat Software
-License: GPL-2+
-
-Files:
- debian/debcrossgen
-Copyright:
- 2017 Jussi Pakkanen
-License: Apache-2.0
-
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
- http://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, a copy of the Apache license is available in
- <file:///usr/share/common-licenses/Apache-2.0>.
-
-License: Expat
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE.
-
-License: GPL-2+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, see <http://www.gnu.org/licenses/>.
diff --git a/debian/debcrossgen b/debian/debcrossgen
deleted file mode 100755
index 7d18db854..000000000
--- a/debian/debcrossgen
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright 2017 Jussi Pakkanen
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-# http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# This version of debcrossgen has been modified to add the --set option:
-# see https://bugs.debian.org/912559
-
-import sys, os, subprocess
-
-import argparse
-
-parser = argparse.ArgumentParser(description='''Generate cross compilation definition file for the Meson build system.
-
-If you do not specify the --arch argument, Meson assumes that running
-plain 'dpkg-architecture' will return correct information for the
-host system.
-'''
-)
-
-parser.add_argument('--arch', default=None,
- help='The dpkg architecture to generate.')
-parser.add_argument('--gccsuffix', default="",
- help='A particular gcc version suffix if necessary.')
-parser.add_argument('-o', required=True, dest='outfile',
- help='The output file.')
-parser.add_argument('--set', action='append', default=[],
- help='Set a cross property.')
-
-def locate_path(program):
- if os.path.isabs(program):
- return program
- for d in os.get_exec_path():
- f = os.path.join(d, program)
- if os.access(f, os.X_OK):
- return f
- raise ValueError("%s not found on $PATH" % program)
-
-def run(options):
- if options.arch is None:
- cmd = ['dpkg-architecture']
- else:
- cmd = ['dpkg-architecture', '-a' + options.arch]
- output = subprocess.check_output(cmd, universal_newlines=True)
- data = {}
- for line in output.split('\n'):
- line = line.strip()
- if line == '':
- continue
- k, v = line.split('=', 1)
- data[k] = v
- host_arch = data['DEB_HOST_GNU_TYPE']
- host_os = data['DEB_HOST_ARCH_OS']
- host_cpu_family = data['DEB_HOST_GNU_CPU']
- host_cpu = data['DEB_HOST_ARCH'] # Not really correct, should be arm7hlf etc but it is not exposed.
- host_endian = data['DEB_HOST_ARCH_ENDIAN']
- with open(options.outfile, "w") as ofile:
- ofile.write('[binaries]\n')
- c = "%s-gcc%s" % (host_arch, options.gccsuffix)
- ofile.write("c = '%s'\n" % locate_path(c))
- cpp = "%s-g++%s" % (host_arch, options.gccsuffix)
- ofile.write("cpp = '%s'\n" % locate_path(cpp))
- ofile.write("ar = '%s'\n" % locate_path("%s-ar" % host_arch))
- ofile.write("strip = '%s'\n" % locate_path("%s-strip" % host_arch))
- ofile.write("objcopy = '%s'\n" % locate_path("%s-objcopy" % host_arch))
- ofile.write("ld= '%s'\n" % locate_path("%s-ld" % host_arch))
- try:
- ofile.write("pkgconfig = '%s'\n" % locate_path("%s-pkg-config" % host_arch))
- except ValueError:
- pass # pkg-config is optional
- ofile.write('\n[properties]\n')
- for prop in options.set:
- assert '=' in prop
- key, value = prop.split('=', 1)
- ofile.write('%s = %s\n' % (key, value))
- ofile.write('\n[host_machine]\n')
- ofile.write("system = '%s'\n" % host_os)
- ofile.write("cpu_family = '%s'\n" % host_cpu_family)
- ofile.write("cpu = '%s'\n" % host_cpu)
- ofile.write("endian = '%s'\n" % host_endian)
-
-if __name__ == '__main__':
- options = parser.parse_args()
- run(options)
- print('Remember to add the proper --libdir arg to Meson invocation.')
diff --git a/debian/docs b/debian/docs
index 8913f4684..f7891b80d 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1,2 +1,6 @@
NEWS
-README.md
+NEWS.pre-1-3
+README
+ChangeLog.pre-1-2
+ChangeLog.pre-2-0
+ChangeLog.pre-2-2
diff --git a/debian/gbp.conf b/debian/gbp.conf
deleted file mode 100644
index 3ef5c273d..000000000
--- a/debian/gbp.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-[DEFAULT]
-pristine-tar = True
-debian-branch = debian/experimental
-upstream-branch = upstream/latest
-upstream-vcs-tag = %(version)s
-
-[buildpackage]
-sign-tags = True
-
-[dch]
-multimaint-merge = True
-
-[import-orig]
-postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
-
-[pq]
-patch-numbers = False
diff --git a/debian/libglib2.0-0.install b/debian/libglib2.0-0.install
index 296697564..daa0f49bf 100755
--- a/debian/libglib2.0-0.install
+++ b/debian/libglib2.0-0.install
@@ -1,9 +1,10 @@
#!/usr/bin/dh-exec
-usr/lib/*/libglib*.so.*
+usr/lib/*/libglib*.so.* lib/${DEB_HOST_MULTIARCH}
usr/lib/*/libgobject*.so.*
usr/lib/*/libgmodule*.so.*
usr/lib/*/libgthread*.so.*
usr/lib/*/libgio*.so.*
-usr/bin/gio-launch-desktop usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
usr/bin/gio-querymodules usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
+usr/bin/gio-launch-desktop usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
usr/bin/glib-compile-schemas usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
+usr/bin/glib-compile-resources usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
diff --git a/debian/libglib2.0-0.lintian-overrides b/debian/libglib2.0-0.lintian-overrides
index 7fe88b770..e11f00a5b 100644
--- a/debian/libglib2.0-0.lintian-overrides
+++ b/debian/libglib2.0-0.lintian-overrides
@@ -1,5 +1,3 @@
-# GObject uses GLib functions instead of using libc directly
-libglib2.0-0: hardening-no-fortify-functions usr/lib/*/libgobject-2.0.so.*
# It's a deliberate choice of bundling them together
libglib2.0-0: package-name-doesnt-match-sonames libgio-2.0-0 libglib-2.0-0 libgmodule-2.0-0 libgobject-2.0-0 libgthread-2.0-0
# These empty directories are deliberate.
diff --git a/debian/libglib2.0-0.postinst.in b/debian/libglib2.0-0.postinst.in
index 4662e0c14..c0861f137 100644
--- a/debian/libglib2.0-0.postinst.in
+++ b/debian/libglib2.0-0.postinst.in
@@ -1,12 +1,8 @@
#!/bin/sh
set -e
-
-handle_triggers () {
- local trigger
- local dirs
-
- for trigger in "$@"; do
+if [ "$1" = triggered ]; then
+ for trigger in $2; do
if ! [ -d $trigger ]; then
continue
fi
@@ -14,10 +10,10 @@ handle_triggers () {
/usr/share/glib-2.0/schemas)
# This is triggered everytime an application installs a
# GSettings schema
- "/usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas" /usr/share/glib-2.0/schemas || true
+ /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
;;
- "/usr/lib/#MULTIARCH#/gio/modules"|/usr/lib/gio/modules)
+ /usr/lib/#MULTIARCH#/gio/modules|/usr/lib/gio/modules)
# This is triggered everytime an application installs a GIO
# module into /usr/lib/#MULTIARCH#/gio/modules or the
# backwards-compatible /usr/lib/gio/modules directory
@@ -25,18 +21,14 @@ handle_triggers () {
# The /usr/lib/gio/modules directory is no longer shipped by
# libglib2.0 itself so we need to check to avoid a warning from
# gio-querymodules
- dirs="/usr/lib/#MULTIARCH#/gio/modules"
- if [ -d /usr/lib/gio/modules ] && [ $(dpkg --print-architecture) = "#ARCH#" ]; then
+ dirs=/usr/lib/#MULTIARCH#/gio/modules
+ if [ -d /usr/lib/gio/modules ] && [ $(dpkg --print-architecture) = #ARCH# ]; then
dirs="$dirs /usr/lib/gio/modules"
fi
- "/usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules" $dirs || true
+ /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules $dirs || true
;;
esac
done
-}
-
-if [ "$1" = triggered ]; then
- handle_triggers $2
exit 0
fi
@@ -44,13 +36,11 @@ fi
# Also handle the initial installation
if [ -d /usr/share/glib-2.0/schemas ]; then
- "/usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas" /usr/share/glib-2.0/schemas || true
+ /usr/lib/#MULTIARCH#/glib-2.0/glib-compile-schemas /usr/share/glib-2.0/schemas || true
fi
-if [ -d "/usr/lib/#MULTIARCH#/gio/modules" ]; then
- "/usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules" "/usr/lib/#MULTIARCH#/gio/modules" || true
+if [ -d /usr/lib/#MULTIARCH#/gio/modules ]; then
+ /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/#MULTIARCH#/gio/modules || true
fi
-if [ -d /usr/lib/gio/modules ] && [ $(dpkg --print-architecture) = "#ARCH#" ]; then
- "/usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules" /usr/lib/gio/modules || true
+if [ -d /usr/lib/gio/modules ] && [ $(dpkg --print-architecture) = #ARCH# ]; then
+ /usr/lib/#MULTIARCH#/glib-2.0/gio-querymodules /usr/lib/gio/modules || true
fi
-
-# vim:set sw=4 sts=4 et:
diff --git a/debian/libglib2.0-0.postrm.in b/debian/libglib2.0-0.postrm.in
index ffb9056c8..600c797ef 100644
--- a/debian/libglib2.0-0.postrm.in
+++ b/debian/libglib2.0-0.postrm.in
@@ -16,9 +16,16 @@ if [ -d /usr/lib/gio/modules ]; then
fi
fi
-if [ "$1" = purge ] && [ -d /usr/share/glib-2.0/schemas ] && [ "$DPKG_MAINTSCRIPT_PACKAGE_REFCOUNT" = 1 ]; then
- # This is the last multiarch variant to be removed, so drop the
- # architecture-independent compiled schemas
+if [ "$1" = purge ] && [ -d /usr/share/glib-2.0/schemas ]; then
+ # Purge the compiled schemas
rm -f /usr/share/glib-2.0/schemas/gschemas.compiled
rmdir -p --ignore-fail-on-non-empty /usr/share/glib-2.0/schemas
+
+ # With multiarch enabled we can't be certain that the cache file
+ # isn't needed for other architectures since it is not reference
+ # counted. The best we can do is to fire a file trigger which will
+ # regenerate the cache file if required.
+ if [ -d /usr/share/glib-2.0/schemas ]; then
+ dpkg-trigger /usr/share/glib-2.0/schemas
+ fi
fi
diff --git a/debian/libglib2.0-0.symbols b/debian/libglib2.0-0.symbols
index 6614abd30..c14c2464a 100644
--- a/debian/libglib2.0-0.symbols
+++ b/debian/libglib2.0-0.symbols
@@ -60,8 +60,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_app_info_launch_default_for_uri_async@Base 2.49.5
g_app_info_launch_default_for_uri_finish@Base 2.49.5
g_app_info_launch_uris@Base 2.16.0
- g_app_info_launch_uris_async@Base 2.59.2
- g_app_info_launch_uris_finish@Base 2.59.2
g_app_info_monitor_get@Base 2.39.4
g_app_info_monitor_get_type@Base 2.39.4
g_app_info_remove_supports_type@Base 2.16.0
@@ -126,9 +124,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_application_set_default@Base 2.31.8
g_application_set_flags@Base 2.28.0
g_application_set_inactivity_timeout@Base 2.28.0
- g_application_set_option_context_description@Base 2.55.1
- g_application_set_option_context_parameter_string@Base 2.55.1
- g_application_set_option_context_summary@Base 2.55.1
g_application_set_resource_base_path@Base 2.41.2
g_application_unbind_busy_property@Base 2.43.91
g_application_unmark_busy@Base 2.37.0
@@ -210,7 +205,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_content_type_get_description@Base 2.16.0
g_content_type_get_generic_icon_name@Base 2.33.14
g_content_type_get_icon@Base 2.16.0
- g_content_type_get_mime_dirs@Base 2.59.0
g_content_type_get_mime_type@Base 2.16.0
g_content_type_get_symbolic_icon@Base 2.33.14
g_content_type_guess@Base 2.16.0
@@ -218,7 +212,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_content_type_is_a@Base 2.16.0
g_content_type_is_mime_type@Base 2.51.5
g_content_type_is_unknown@Base 2.16.0
- g_content_type_set_mime_dirs@Base 2.59.0
g_content_types_get_registered@Base 2.16.0
g_converter_convert@Base 2.24.0
g_converter_flags_get_type@Base 2.24.0
@@ -324,7 +317,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_dbus_connection_flush_sync@Base 2.26.0
g_dbus_connection_get_capabilities@Base 2.26.0
g_dbus_connection_get_exit_on_close@Base 2.26.0
- g_dbus_connection_get_flags@Base 2.59.0
g_dbus_connection_get_guid@Base 2.26.0
g_dbus_connection_get_last_serial@Base 2.33.14
g_dbus_connection_get_peer_credentials@Base 2.26.0
@@ -582,17 +574,15 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_desktop_app_info_get_implementations@Base 2.41.0
g_desktop_app_info_get_is_hidden@Base 2.16.0
g_desktop_app_info_get_keywords@Base 2.31.8
- g_desktop_app_info_get_locale_string@Base 2.55.1
g_desktop_app_info_get_nodisplay@Base 2.30.0
g_desktop_app_info_get_show_in@Base 2.30.0
g_desktop_app_info_get_startup_wm_class@Base 2.33.14
g_desktop_app_info_get_string@Base 2.35.8
- g_desktop_app_info_get_string_list@Base 2.59.0
g_desktop_app_info_get_type@Base 2.16.0
g_desktop_app_info_has_key@Base 2.35.8
g_desktop_app_info_launch_action@Base 2.37.5
g_desktop_app_info_launch_uris_as_manager@Base 2.28.0
- g_desktop_app_info_launch_uris_as_manager_with_fds@Base 2.57.2
+ g_desktop_app_info_launch_uris_as_manager_with_fds@Base 2.54.2-1endless4
g_desktop_app_info_list_actions@Base 2.37.5
g_desktop_app_info_lookup_get_default_for_uri_scheme@Base 2.28.0
g_desktop_app_info_lookup_get_type@Base 2.28.0
@@ -646,7 +636,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_dtls_connection_get_certificate@Base 2.47.5
g_dtls_connection_get_database@Base 2.47.5
g_dtls_connection_get_interaction@Base 2.47.5
- g_dtls_connection_get_negotiated_protocol@Base 2.59.0
g_dtls_connection_get_peer_certificate@Base 2.47.5
g_dtls_connection_get_peer_certificate_errors@Base 2.47.5
g_dtls_connection_get_rehandshake_mode@Base 2.47.5
@@ -655,7 +644,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_dtls_connection_handshake@Base 2.47.5
g_dtls_connection_handshake_async@Base 2.47.5
g_dtls_connection_handshake_finish@Base 2.47.5
- g_dtls_connection_set_advertised_protocols@Base 2.59.0
g_dtls_connection_set_certificate@Base 2.47.5
g_dtls_connection_set_database@Base 2.47.5
g_dtls_connection_set_interaction@Base 2.47.5
@@ -834,9 +822,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_file_io_stream_query_info_async@Base 2.22.0
g_file_io_stream_query_info_finish@Base 2.22.0
g_file_is_native@Base 2.16.0
- g_file_load_bytes@Base 2.55.1
- g_file_load_bytes_async@Base 2.55.1
- g_file_load_bytes_finish@Base 2.55.1
g_file_load_contents@Base 2.16.0
g_file_load_contents_async@Base 2.16.0
g_file_load_contents_finish@Base 2.16.0
@@ -867,7 +852,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_file_mount_mountable@Base 2.16.0
g_file_mount_mountable_finish@Base 2.16.0
g_file_move@Base 2.16.0
- g_file_new_build_filename@Base 2.55.1
g_file_new_for_commandline_arg@Base 2.16.0
g_file_new_for_commandline_arg_and_cwd@Base 2.35.8
g_file_new_for_path@Base 2.16.0
@@ -882,12 +866,9 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_file_output_stream_query_info_async@Base 2.16.0
g_file_output_stream_query_info_finish@Base 2.16.0
g_file_parse_name@Base 2.16.0
- g_file_peek_path@Base 2.55.2
g_file_poll_mountable@Base 2.22.0
g_file_poll_mountable_finish@Base 2.22.0
g_file_query_default_handler@Base 2.16.0
- g_file_query_default_handler_async@Base 2.59.2
- g_file_query_default_handler_finish@Base 2.59.2
g_file_query_exists@Base 2.16.0
g_file_query_file_type@Base 2.18.0
g_file_query_filesystem_info@Base 2.16.0
@@ -1176,11 +1157,8 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_mount_operation_get_anonymous@Base 2.16.0
g_mount_operation_get_choice@Base 2.16.0
g_mount_operation_get_domain@Base 2.16.0
- g_mount_operation_get_is_tcrypt_hidden_volume@Base 2.57.2
- g_mount_operation_get_is_tcrypt_system_volume@Base 2.57.2
g_mount_operation_get_password@Base 2.16.0
g_mount_operation_get_password_save@Base 2.16.0
- g_mount_operation_get_pim@Base 2.57.2
g_mount_operation_get_type@Base 2.16.0
g_mount_operation_get_username@Base 2.16.0
g_mount_operation_new@Base 2.16.0
@@ -1189,11 +1167,8 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_mount_operation_set_anonymous@Base 2.16.0
g_mount_operation_set_choice@Base 2.16.0
g_mount_operation_set_domain@Base 2.16.0
- g_mount_operation_set_is_tcrypt_hidden_volume@Base 2.57.2
- g_mount_operation_set_is_tcrypt_system_volume@Base 2.57.2
g_mount_operation_set_password@Base 2.16.0
g_mount_operation_set_password_save@Base 2.16.0
- g_mount_operation_set_pim@Base 2.57.2
g_mount_operation_set_username@Base 2.16.0
g_mount_remount@Base 2.16.0
g_mount_remount_finish@Base 2.16.0
@@ -1278,12 +1253,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_output_stream_write_bytes_async@Base 2.33.14
g_output_stream_write_bytes_finish@Base 2.33.14
g_output_stream_write_finish@Base 2.16.0
- g_output_stream_writev@Base 2.59.2
- g_output_stream_writev_all@Base 2.59.2
- g_output_stream_writev_all_async@Base 2.59.2
- g_output_stream_writev_all_finish@Base 2.59.2
- g_output_stream_writev_async@Base 2.59.2
- g_output_stream_writev_finish@Base 2.59.2
g_password_save_get_type@Base 2.16.0
g_permission_acquire@Base 2.26.0
g_permission_acquire_async@Base 2.26.0
@@ -1306,8 +1275,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_pollable_output_stream_get_type@Base 2.28.0
g_pollable_output_stream_is_writable@Base 2.28.0
g_pollable_output_stream_write_nonblocking@Base 2.28.0
- g_pollable_output_stream_writev_nonblocking@Base 2.59.2
- g_pollable_return_get_type@Base 2.59.2
g_pollable_source_new@Base 2.28.0
g_pollable_source_new_full@Base 2.33.14
g_pollable_stream_read@Base 2.33.14
@@ -1352,16 +1319,12 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_resolver_lookup_by_name@Base 2.22.0
g_resolver_lookup_by_name_async@Base 2.22.0
g_resolver_lookup_by_name_finish@Base 2.22.0
- g_resolver_lookup_by_name_with_flags@Base 2.59.0
- g_resolver_lookup_by_name_with_flags_async@Base 2.59.0
- g_resolver_lookup_by_name_with_flags_finish@Base 2.59.0
g_resolver_lookup_records@Base 2.33.14
g_resolver_lookup_records_async@Base 2.33.14
g_resolver_lookup_records_finish@Base 2.33.14
g_resolver_lookup_service@Base 2.22.0
g_resolver_lookup_service_async@Base 2.22.0
g_resolver_lookup_service_finish@Base 2.22.0
- g_resolver_name_lookup_flags_get_type@Base 2.59.0
g_resolver_record_type_get_type@Base 2.33.14
g_resolver_set_default@Base 2.22.0
g_resource_enumerate_children@Base 2.31.18
@@ -1619,9 +1582,7 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_socket_is_closed@Base 2.22.0
g_socket_is_connected@Base 2.22.0
g_socket_join_multicast_group@Base 2.31.18
- g_socket_join_multicast_group_ssm@Base 2.55.1
g_socket_leave_multicast_group@Base 2.31.18
- g_socket_leave_multicast_group_ssm@Base 2.55.1
g_socket_listen@Base 2.22.0
g_socket_listener_accept@Base 2.22.0
g_socket_listener_accept_async@Base 2.22.0
@@ -1649,7 +1610,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_socket_receive_with_blocking@Base 2.26.0
g_socket_send@Base 2.22.0
g_socket_send_message@Base 2.22.0
- g_socket_send_message_with_timeout@Base 2.59.2
g_socket_send_messages@Base 2.43.2
g_socket_send_to@Base 2.22.0
g_socket_send_with_blocking@Base 2.26.0
@@ -1733,7 +1693,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_task_get_check_cancellable@Base 2.35.8
g_task_get_completed@Base 2.43.92
g_task_get_context@Base 2.35.8
- g_task_get_name@Base 2.59.0
g_task_get_priority@Base 2.35.8
g_task_get_return_on_cancel@Base 2.35.8
g_task_get_source_object@Base 2.35.8
@@ -1757,7 +1716,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_task_run_in_thread@Base 2.35.8
g_task_run_in_thread_sync@Base 2.35.8
g_task_set_check_cancellable@Base 2.35.8
- g_task_set_name@Base 2.59.0
g_task_set_priority@Base 2.35.8
g_task_set_return_on_cancel@Base 2.35.8
g_task_set_source_tag@Base 2.35.8
@@ -1798,7 +1756,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_tls_backend_get_file_database_type@Base 2.30.0
g_tls_backend_get_server_connection_type@Base 2.28.0
g_tls_backend_get_type@Base 2.28.0
- g_tls_backend_set_default_database@Base 2.59.0
g_tls_backend_supports_dtls@Base 2.47.5
g_tls_backend_supports_tls@Base 2.28.0
g_tls_certificate_flags_get_type@Base 2.28.0
@@ -1825,7 +1782,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_tls_connection_get_certificate@Base 2.28.0
g_tls_connection_get_database@Base 2.30.0
g_tls_connection_get_interaction@Base 2.30.0
- g_tls_connection_get_negotiated_protocol@Base 2.59.0
g_tls_connection_get_peer_certificate@Base 2.28.0
g_tls_connection_get_peer_certificate_errors@Base 2.28.0
g_tls_connection_get_rehandshake_mode@Base 2.28.0
@@ -1835,7 +1791,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_tls_connection_handshake@Base 2.28.0
g_tls_connection_handshake_async@Base 2.28.0
g_tls_connection_handshake_finish@Base 2.28.0
- g_tls_connection_set_advertised_protocols@Base 2.59.0
g_tls_connection_set_certificate@Base 2.28.0
g_tls_connection_set_database@Base 2.30.0
g_tls_connection_set_interaction@Base 2.30.0
@@ -1921,8 +1876,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_unix_input_stream_new@Base 2.16.0
g_unix_input_stream_set_close_fd@Base 2.20.0
g_unix_is_mount_path_system_internal@Base 2.16.0
- g_unix_is_system_device_path@Base 2.55.1
- g_unix_is_system_fs_type@Base 2.55.1
g_unix_mount_at@Base 2.16.0
g_unix_mount_compare@Base 2.16.0
g_unix_mount_copy@Base 2.53.1
@@ -1932,8 +1885,6 @@ libgio-2.0.so.0 libglib2.0-0 #MINVER#
g_unix_mount_get_device_path@Base 2.16.0
g_unix_mount_get_fs_type@Base 2.16.0
g_unix_mount_get_mount_path@Base 2.16.0
- g_unix_mount_get_options@Base 2.57.2
- g_unix_mount_get_root_path@Base 2.59.0
g_unix_mount_guess_can_eject@Base 2.16.0
g_unix_mount_guess_icon@Base 2.16.0
g_unix_mount_guess_name@Base 2.16.0
@@ -2115,17 +2066,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_atomic_pointer_or@Base 2.30.0
g_atomic_pointer_set@Base 2.12.0
g_atomic_pointer_xor@Base 2.30.0
- g_atomic_rc_box_acquire@Base 2.57.2
- g_atomic_rc_box_alloc@Base 2.57.2
- g_atomic_rc_box_alloc0@Base 2.57.2
- g_atomic_rc_box_dup@Base 2.57.2
- g_atomic_rc_box_get_size@Base 2.57.2
- g_atomic_rc_box_release@Base 2.57.2
- g_atomic_rc_box_release_full@Base 2.57.2
- g_atomic_ref_count_compare@Base 2.57.2
- g_atomic_ref_count_dec@Base 2.57.2
- g_atomic_ref_count_inc@Base 2.57.2
- g_atomic_ref_count_init@Base 2.57.2
g_base64_decode@Base 2.12.0
g_base64_decode_inplace@Base 2.20.0
g_base64_decode_step@Base 2.12.0
@@ -2181,7 +2121,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_bookmark_file_to_data@Base 2.12.0
g_bookmark_file_to_file@Base 2.12.0
g_build_filename@Base 2.12.0
- g_build_filename_valist@Base 2.55.1
g_build_filenamev@Base 2.12.0
g_build_path@Base 2.12.0
g_build_pathv@Base 2.12.0
@@ -2220,7 +2159,7 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_cache_new@Base 2.12.0
g_cache_remove@Base 2.12.0
g_cache_value_foreach@Base 2.12.0
- g_canonicalize_filename@Base 2.57.2
+ g_canonicalize_filename@Base 2.54.2+dev29.40819e3-6bem1
g_chdir@Base 2.12.0
g_checksum_copy@Base 2.16.0
g_checksum_free@Base 2.16.0
@@ -2236,7 +2175,7 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_child_watch_source_new@Base 2.12.0
g_chmod@Base 2.12.0
g_clear_error@Base 2.12.0
- g_clear_handle_id@Base 2.55.1
+ g_clear_handle_id@Base 2.54.2-1endless2
g_clear_pointer@Base 2.33.14
g_close@Base 2.35.8
g_completion_add_items@Base 2.12.0
@@ -2290,7 +2229,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_date_clamp@Base 2.12.0
g_date_clear@Base 2.12.0
g_date_compare@Base 2.12.0
- g_date_copy@Base 2.55.1
g_date_days_between@Base 2.12.0
g_date_free@Base 2.12.0
g_date_get_day@Base 2.12.0
@@ -2347,7 +2285,7 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_date_time_get_month@Base 2.26.0
g_date_time_get_second@Base 2.26.0
g_date_time_get_seconds@Base 2.26.0
- g_date_time_get_timezone@Base 2.57.2
+ g_date_time_get_timezone@Base 2.54.2-1endless3
g_date_time_get_timezone_abbreviation@Base 2.26.0
g_date_time_get_utc_offset@Base 2.26.0
g_date_time_get_week_numbering_year@Base 2.28.0
@@ -2357,7 +2295,7 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_date_time_hash@Base 2.26.0
g_date_time_is_daylight_savings@Base 2.26.0
g_date_time_new@Base 2.26.0
- g_date_time_new_from_iso8601@Base 2.55.1
+ g_date_time_new_from_iso8601@Base 2.54.2-1endless2
g_date_time_new_from_timeval_local@Base 2.26.0
g_date_time_new_from_timeval_utc@Base 2.26.0
g_date_time_new_from_unix_local@Base 2.26.0
@@ -2436,7 +2374,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_get_home_dir@Base 2.35.9
g_get_host_name@Base 2.12.0
g_get_language_names@Base 2.12.0
- g_get_language_names_with_category@Base 2.57.2
g_get_locale_variants@Base 2.28.0
g_get_monotonic_time@Base 2.28.0
g_get_num_processors@Base 2.35.8
@@ -2452,6 +2389,7 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_get_user_name@Base 2.12.0
g_get_user_runtime_dir@Base 2.28.0
g_get_user_special_dir@Base 2.14.0
+ g_get_user_special_dir_for_desktop_id@Base 2.53.6+dev11.b0bf3c8-0bem1
g_getenv@Base 2.12.0
g_hash_table_add@Base 2.31.8
g_hash_table_contains@Base 2.31.8
@@ -2481,7 +2419,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_hash_table_size@Base 2.12.0
g_hash_table_steal@Base 2.12.0
g_hash_table_steal_all@Base 2.12.0
- g_hash_table_steal_extended@Base 2.57.2
g_hash_table_unref@Base 2.12.0
g_hmac_copy@Base 2.30.0
g_hmac_get_digest@Base 2.30.0
@@ -2583,7 +2520,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_key_file_get_integer@Base 2.12.0
g_key_file_get_integer_list@Base 2.12.0
g_key_file_get_keys@Base 2.12.0
- g_key_file_get_locale_for_key@Base 2.55.2
g_key_file_get_locale_string@Base 2.12.0
g_key_file_get_locale_string_list@Base 2.12.0
g_key_file_get_start_group@Base 2.12.0
@@ -2668,7 +2604,7 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_log_set_writer_func@Base 2.49.3
g_log_structured@Base 2.49.3
g_log_structured_array@Base 2.49.3
- g_log_structured_standard@Base 2.55.2
+ g_log_structured_standard@Base 2.54.2-1endless1
g_log_variant@Base 2.49.7
g_log_writer_default@Base 2.49.3
g_log_writer_format_fields@Base 2.49.3
@@ -2900,8 +2836,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_ptr_array_sized_new@Base 2.12.0
g_ptr_array_sort@Base 2.12.0
g_ptr_array_sort_with_data@Base 2.12.0
- g_ptr_array_steal_index@Base 2.57.2
- g_ptr_array_steal_index_fast@Base 2.57.2
g_ptr_array_unref@Base 2.22.0
g_qsort_with_data@Base 2.12.0
g_quark_from_static_string@Base 2.12.0
@@ -2909,7 +2843,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_quark_to_string@Base 2.12.0
g_quark_try_string@Base 2.12.0
g_queue_clear@Base 2.14.0
- g_queue_clear_full@Base 2.59.2
g_queue_copy@Base 2.12.0
g_queue_delete_link@Base 2.12.0
g_queue_find@Base 2.12.0
@@ -2965,13 +2898,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_random_int@Base 2.12.0
g_random_int_range@Base 2.12.0
g_random_set_seed@Base 2.12.0
- g_rc_box_acquire@Base 2.57.2
- g_rc_box_alloc@Base 2.57.2
- g_rc_box_alloc0@Base 2.57.2
- g_rc_box_dup@Base 2.57.2
- g_rc_box_get_size@Base 2.57.2
- g_rc_box_release@Base 2.57.2
- g_rc_box_release_full@Base 2.57.2
g_realloc@Base 2.12.0
g_realloc_n@Base 2.24.0
g_rec_mutex_clear@Base 2.31.8
@@ -2979,16 +2905,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_rec_mutex_lock@Base 2.31.8
g_rec_mutex_trylock@Base 2.31.8
g_rec_mutex_unlock@Base 2.31.8
- g_ref_count_compare@Base 2.57.2
- g_ref_count_dec@Base 2.57.2
- g_ref_count_inc@Base 2.57.2
- g_ref_count_init@Base 2.57.2
- g_ref_string_acquire@Base 2.57.2
- g_ref_string_length@Base 2.57.2
- g_ref_string_new@Base 2.57.2
- g_ref_string_new_intern@Base 2.57.2
- g_ref_string_new_len@Base 2.57.2
- g_ref_string_release@Base 2.57.2
g_regex_check_replacement@Base 2.14.0
g_regex_error_quark@Base 2.14.0
g_regex_escape_nul@Base 2.30.0
@@ -3102,7 +3018,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_set_prgname@Base 2.12.0
g_set_print_handler@Base 2.12.0
g_set_printerr_handler@Base 2.12.0
- g_set_user_dirs@Base 2.59.0
g_setenv@Base 2.12.0
g_shell_error_quark@Base 2.12.0
g_shell_parse_argv@Base 2.12.0
@@ -3183,7 +3098,7 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_source_unref@Base 2.12.0
g_spaced_primes_closest@Base 2.12.0
g_spawn_async@Base 2.12.0
- g_spawn_async_with_fds@Base 2.57.2
+ g_spawn_async_with_fds@Base 2.54.2-1endless4
g_spawn_async_with_pipes@Base 2.12.0
g_spawn_check_exit_status@Base 2.33.14
g_spawn_close_pid@Base 2.12.0
@@ -3299,7 +3214,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_strtod@Base 2.12.0
g_strup@Base 2.12.0
g_strv_contains@Base 2.43.2
- g_strv_equal@Base 2.59.0
g_strv_length@Base 2.12.0
g_test_add_data_func@Base 2.16.0
g_test_add_data_func_full@Base 2.33.14
@@ -3391,12 +3305,11 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_time_zone_adjust_time@Base 2.28.0
g_time_zone_find_interval@Base 2.28.0
g_time_zone_get_abbreviation@Base 2.28.0
- g_time_zone_get_identifier@Base 2.57.2
+ g_time_zone_get_identifier@Base 2.54.2-1endless3
g_time_zone_get_offset@Base 2.28.0
g_time_zone_is_dst@Base 2.28.0
g_time_zone_new@Base 2.26.0
g_time_zone_new_local@Base 2.26.0
- g_time_zone_new_offset@Base 2.57.2
g_time_zone_new_utc@Base 2.26.0
g_time_zone_ref@Base 2.26.0
g_time_zone_unref@Base 2.26.0
@@ -3528,7 +3441,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_utf8_to_ucs4_fast@Base 2.12.0
g_utf8_to_utf16@Base 2.12.0
g_utf8_validate@Base 2.12.0
- g_utf8_validate_len@Base 2.59.0
g_utime@Base 2.18.0
g_uuid_string_is_valid@Base 2.51.2
g_uuid_string_random@Base 2.51.2
@@ -3653,7 +3565,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_variant_ref@Base 2.24.0
g_variant_ref_sink@Base 2.24.0
g_variant_serialised_byteswap@Base 2.24.0
- g_variant_serialised_check@Base 2.59.0
g_variant_serialised_get_child@Base 2.24.0
g_variant_serialised_is_normal@Base 2.24.0
g_variant_serialised_n_children@Base 2.24.0
@@ -3680,7 +3591,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_variant_type_info_member_info@Base 2.24.0
g_variant_type_info_n_members@Base 2.24.0
g_variant_type_info_query@Base 2.24.0
- g_variant_type_info_query_depth@Base 2.58.2
g_variant_type_info_query_element@Base 2.24.0
g_variant_type_info_ref@Base 2.24.0
g_variant_type_info_unref@Base 2.24.0
@@ -3702,7 +3612,6 @@ libglib-2.0.so.0 libglib2.0-0 #MINVER#
g_variant_type_new_tuple@Base 2.24.0
g_variant_type_next@Base 2.24.0
g_variant_type_peek_string@Base 2.24.0
- g_variant_type_string_get_depth_@Base 2.58.2
g_variant_type_string_is_valid@Base 2.24.0
g_variant_type_string_scan@Base 2.24.0
g_variant_type_value@Base 2.24.0
@@ -3844,7 +3753,6 @@ libgobject-2.0.so.0 libglib2.0-0 #MINVER#
g_mapped_file_get_type@Base 2.39.4
g_markup_parse_context_get_type@Base 2.35.8
g_match_info_get_type@Base 2.30.0
- g_normalize_mode_get_type@Base 2.59.2
g_object_add_toggle_ref@Base 2.12.0
g_object_add_weak_pointer@Base 2.12.0
g_object_bind_property@Base 2.26.0
@@ -4083,9 +3991,6 @@ libgobject-2.0.so.0 libglib2.0-0 #MINVER#
g_type_set_qdata@Base 2.12.0
g_type_test_flags@Base 2.12.0
g_type_value_table_peek@Base 2.12.0
- g_unicode_break_type_get_type@Base 2.59.2
- g_unicode_script_get_type@Base 2.59.2
- g_unicode_type_get_type@Base 2.59.2
g_value_array_append@Base 2.12.0
g_value_array_copy@Base 2.12.0
g_value_array_free@Base 2.12.0
diff --git a/debian/libglib2.0-0.triggers.in b/debian/libglib2.0-0.triggers.in
index 7b4b56b09..d507937df 100644
--- a/debian/libglib2.0-0.triggers.in
+++ b/debian/libglib2.0-0.triggers.in
@@ -1,3 +1,3 @@
-interest-noawait /usr/lib/#MULTIARCH#/gio/modules
-interest-noawait /usr/lib/gio/modules
-interest-await /usr/share/glib-2.0/schemas
+interest /usr/lib/#MULTIARCH#/gio/modules
+interest /usr/lib/gio/modules
+interest /usr/share/glib-2.0/schemas
diff --git a/debian/libglib2.0-bin.install b/debian/libglib2.0-bin.install
index 1c406ca3a..edabf0907 100644
--- a/debian/libglib2.0-bin.install
+++ b/debian/libglib2.0-bin.install
@@ -5,9 +5,10 @@ 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-resources.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*
diff --git a/debian/libglib2.0-bin.links b/debian/libglib2.0-bin.links
index 59251e129..b75d2591d 100755
--- a/debian/libglib2.0-bin.links
+++ b/debian/libglib2.0-bin.links
@@ -1,3 +1,5 @@
#!/usr/bin/dh-exec
/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0/gio-querymodules /usr/bin/gio-querymodules
+/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0/gio-launch-desktop /usr/bin/gio-launch-desktop
/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0/glib-compile-schemas /usr/bin/glib-compile-schemas
+/usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0/glib-compile-resources /usr/bin/glib-compile-resources
diff --git a/debian/libglib2.0-bin.lintian-overrides b/debian/libglib2.0-bin.lintian-overrides
deleted file mode 100644
index 50c92038a..000000000
--- a/debian/libglib2.0-bin.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# GLib programs normally use GLib functions instead of using libc directly
-libglib2.0-bin: hardening-no-fortify-functions usr/bin/gio
diff --git a/debian/libglib2.0-bin.maintscript b/debian/libglib2.0-bin.maintscript
new file mode 100644
index 000000000..ef291b4fe
--- /dev/null
+++ b/debian/libglib2.0-bin.maintscript
@@ -0,0 +1,3 @@
+rm_conffile /etc/bash_completion.d/gsettings-bash-completion.sh 2.33.3-1~
+rm_conffile /etc/bash_completion.d/gresource-bash-completion.sh 2.33.3-1~
+rm_conffile /etc/bash_completion.d/gdbus-bash-completion.sh 2.33.3-1~
diff --git a/debian/libglib2.0-dev-bin.install b/debian/libglib2.0-dev-bin.install
index 84156bee9..7eb6c6ad6 100644
--- a/debian/libglib2.0-dev-bin.install
+++ b/debian/libglib2.0-dev-bin.install
@@ -1,19 +1,17 @@
-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-gettextize.1*
usr/share/man/man1/glib-mkenums.1*
+usr/share/man/man1/glib-gettextize.1*
usr/share/man/man1/gobject-query.1*
-usr/share/man/man1/gtester-report.1*
usr/share/man/man1/gtester.1*
+usr/share/man/man1/gtester-report.1*
+usr/bin/gdbus-codegen
+usr/bin/glib-genmarshal
+usr/bin/glib-mkenums
+usr/bin/glib-gettextize
+usr/bin/gobject-query
+usr/bin/gtester
+usr/bin/gtester-report
diff --git a/debian/libglib2.0-dev.install b/debian/libglib2.0-dev.install
index 0bb46ef4c..c5f573fb8 100644
--- a/debian/libglib2.0-dev.install
+++ b/debian/libglib2.0-dev.install
@@ -1,11 +1,10 @@
usr/include/*
-usr/lib/*/glib-2.0
usr/lib/*/lib*.a
-usr/lib/*/libgio*.so
-usr/lib/*/libglib*.so
-usr/lib/*/libgmodule*.so
usr/lib/*/libgobject*.so
+usr/lib/*/libgmodule*.so
usr/lib/*/libgthread*.so
+usr/lib/*/libgio*.so
+usr/lib/*/glib-2.0
usr/lib/*/pkgconfig
usr/share/gdb
usr/share/gettext/its
diff --git a/debian/libglib2.0-dev.links b/debian/libglib2.0-dev.links
new file mode 100755
index 000000000..395649a47
--- /dev/null
+++ b/debian/libglib2.0-dev.links
@@ -0,0 +1,2 @@
+#!/usr/bin/dh-exec
+lib/${DEB_HOST_MULTIARCH}/libglib-2.0.so.0 usr/lib/${DEB_HOST_MULTIARCH}/libglib-2.0.so
diff --git a/debian/libglib2.0-dev.lintian-overrides b/debian/libglib2.0-dev.lintian-overrides
deleted file mode 100644
index 76698a4e1..000000000
--- a/debian/libglib2.0-dev.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Workaround for #887629 in stretch, see #887863
-libglib2.0-dev: maintainer-script-empty prerm
diff --git a/debian/libglib2.0-dev.prerm b/debian/libglib2.0-dev.prerm
deleted file mode 100644
index d67329062..000000000
--- a/debian/libglib2.0-dev.prerm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-# libglib2.0-dev needs a prerm in buster, so that if the old prerm fails
-# due to https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=887629 we can
-# recover by running the new prerm. Keep this workaround until after
-# Debian 10 has been released.
-
-set -e
-
-#DEBHELPER#
diff --git a/debian/libglib2.0-doc.doc-base.gio b/debian/libglib2.0-doc.doc-base.gio
index b5575a032..72ffc955e 100644
--- a/debian/libglib2.0-doc.doc-base.gio
+++ b/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/gtk-doc/html/gio/index.html
-Files: /usr/share/gtk-doc/html/gio/*.html
+Index: /usr/share/doc/libglib2.0-doc/gio/index.html
+Files: /usr/share/doc/libglib2.0-doc/gio/*.html
diff --git a/debian/libglib2.0-doc.doc-base.glib b/debian/libglib2.0-doc.doc-base.glib
index bbff3ba80..d6111988f 100644
--- a/debian/libglib2.0-doc.doc-base.glib
+++ b/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/gtk-doc/html/glib/index.html
-Files: /usr/share/gtk-doc/html/glib/*.html
+Index: /usr/share/doc/libglib2.0-doc/glib/index.html
+Files: /usr/share/doc/libglib2.0-doc/glib/*.html
diff --git a/debian/libglib2.0-doc.doc-base.gobject b/debian/libglib2.0-doc.doc-base.gobject
index a8a98cdc4..adcc6f0e1 100644
--- a/debian/libglib2.0-doc.doc-base.gobject
+++ b/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/gtk-doc/html/gobject/index.html
-Files: /usr/share/gtk-doc/html/gobject/*.html
+Index: /usr/share/doc/libglib2.0-doc/gobject/index.html
+Files: /usr/share/doc/libglib2.0-doc/gobject/*.html
diff --git a/debian/libglib2.0-doc.install b/debian/libglib2.0-doc.install
index a5f4974e5..5e2cd2983 100644
--- a/debian/libglib2.0-doc.install
+++ b/debian/libglib2.0-doc.install
@@ -1,3 +1 @@
-usr/share/gtk-doc/html/gio
-usr/share/gtk-doc/html/glib
-usr/share/gtk-doc/html/gobject
+usr/share/doc/libglib2.0-doc
diff --git a/debian/libglib2.0-doc.links b/debian/libglib2.0-doc.links
index a979f8791..f00de343e 100644
--- a/debian/libglib2.0-doc.links
+++ b/debian/libglib2.0-doc.links
@@ -1,3 +1,3 @@
-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
+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
diff --git a/debian/libglib2.0-doc.maintscript b/debian/libglib2.0-doc.maintscript
deleted file mode 100644
index 807786b48..000000000
--- a/debian/libglib2.0-doc.maintscript
+++ /dev/null
@@ -1,6 +0,0 @@
-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~
diff --git a/debian/libglib2.0-tests.install b/debian/libglib2.0-tests.install
index 5220a21d2..3608ccb17 100644
--- a/debian/libglib2.0-tests.install
+++ b/debian/libglib2.0-tests.install
@@ -1,2 +1,2 @@
-usr/lib/glib2.0/installed-tests
usr/share/installed-tests
+usr/lib/glib2.0/installed-tests
diff --git a/debian/libglib2.0-tests.lintian-overrides b/debian/libglib2.0-tests.lintian-overrides
index 0ee8f3417..3cc540a81 100644
--- a/debian/libglib2.0-tests.lintian-overrides
+++ b/debian/libglib2.0-tests.lintian-overrides
@@ -1,9 +1,7 @@
# Cannot have #! because it is test data for fallback to passing to the shell
libglib2.0-tests: executable-not-elf-or-script usr/lib/glib2.0/installed-tests/glib/echo-script
-# Lots of tests don't use libc functions
-libglib2.0-tests: hardening-no-fortify-functions usr/lib/glib2.0/installed-tests/glib/*
+# Corresponding test data for Windows
+libglib2.0-tests: executable-not-elf-or-script usr/lib/glib2.0/installed-tests/glib/echo-script.bat
# Test data for content-type sniffing, never actually executed
libglib2.0-tests: script-not-executable usr/lib/glib2.0/installed-tests/glib/x-content/unix-software/autorun.sh
libglib2.0-tests: shell-script-fails-syntax-check usr/lib/glib2.0/installed-tests/glib/x-content/unix-software/autorun.sh
-# This is lorem ipsum in a test-case, nothing to do with the Debian Free Software Guidelines
-libglib2.0-tests: spelling-error-in-binary usr/lib/glib2.0/installed-tests/glib/utf8-pointer dsfg dfsg
diff --git a/debian/patches/0001-timer-test-use-volatile-for-locals.patch b/debian/patches/0001-timer-test-use-volatile-for-locals.patch
deleted file mode 100644
index c79c2e483..000000000
--- a/debian/patches/0001-timer-test-use-volatile-for-locals.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Ryan Lortie <[email protected]>
-Date: Tue, 4 Mar 2014 09:20:38 -0500
-Subject: timer test: use 'volatile' for locals
-
-GCC seems to be failing to follow the letter of the C spec by allowing extra
-precision in floating point values to persist across assignments which are
-optimised away.
-
-Force its hand by using 'volatile' on the locals in question.
-
-Bug: https://gitlab.gnome.org/GNOME/glib/issues/820
-Forwarded: yes
----
- glib/tests/timer.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/glib/tests/timer.c b/glib/tests/timer.c
-index 5b2e711..4cd5fba 100644
---- a/glib/tests/timer.c
-+++ b/glib/tests/timer.c
-@@ -27,7 +27,7 @@ static void
- test_timer_basic (void)
- {
- GTimer *timer;
-- gdouble elapsed;
-+ volatile gdouble elapsed;
- gulong micros;
-
- timer = g_timer_new ();
-@@ -44,7 +44,7 @@ static void
- test_timer_stop (void)
- {
- GTimer *timer;
-- gdouble elapsed, elapsed2;
-+ volatile gdouble elapsed, elapsed2;
-
- timer = g_timer_new ();
-
diff --git a/debian/patches/01_gettext-desktopfiles.patch b/debian/patches/01_gettext-desktopfiles.patch
deleted file mode 100644
index 9c47d606b..000000000
--- a/debian/patches/01_gettext-desktopfiles.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From: Debian GNOME Maintainers
- <[email protected]>
-Date: Wed, 13 Jun 2007 10:52:27 +0200
-Subject: If a .desktop file does not have inline translations,
- fall back to calling gettext
-
-Patch from OpenSUSE via Ubuntu, original author unknown. Martin Pitt and
-Vincent Untz appear to be the main authors.
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=569829
-Bug-Ubuntu: https://launchpad.net/bugs/3935
-Applied-upstream: no, rejected because "this will be solved soon" (in 2013)
----
- glib/gkeyfile.c | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- glib/gkeyfile.h | 4 ++++
- 2 files changed, 76 insertions(+)
-
-diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
-index 41883e9..e79f8ed 100644
---- a/glib/gkeyfile.c
-+++ b/glib/gkeyfile.c
-@@ -511,6 +511,7 @@ struct _GKeyFile
- GKeyFileFlags flags;
-
- gchar **locales;
-+ gchar *gettext_domain;
-
- volatile gint ref_count;
- };
-@@ -636,6 +637,7 @@ g_key_file_init (GKeyFile *key_file)
- key_file->list_separator = ';';
- key_file->flags = 0;
- key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
-+ key_file->gettext_domain = NULL;
- }
-
- static void
-@@ -655,6 +657,12 @@ g_key_file_clear (GKeyFile *key_file)
- key_file->parse_buffer = NULL;
- }
-
-+ if (key_file->gettext_domain)
-+ {
-+ g_free (key_file->gettext_domain);
-+ key_file->gettext_domain = NULL;
-+ }
-+
- tmp = key_file->groups;
- while (tmp != NULL)
- {
-@@ -874,6 +882,11 @@ g_key_file_load_from_fd (GKeyFile *key_file,
- return FALSE;
- }
-
-+ key_file->gettext_domain = g_key_file_get_string (key_file,
-+ G_KEY_FILE_DESKTOP_GROUP,
-+ G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
-+ NULL);
-+
- return TRUE;
- }
-
-@@ -930,6 +943,11 @@ g_key_file_load_from_file (GKeyFile *key_file,
- return FALSE;
- }
-
-+ key_file->gettext_domain = g_key_file_get_string (key_file,
-+ G_KEY_FILE_DESKTOP_GROUP,
-+ G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
-+ NULL);
-+
- return TRUE;
- }
-
-@@ -2213,6 +2231,8 @@ g_key_file_get_locale_string (GKeyFile *key_file,
- GError *key_file_error;
- gchar **languages;
- gboolean free_languages = FALSE;
-+ gboolean try_gettext = FALSE;
-+ const gchar *msg_locale;
- gint i;
-
- g_return_val_if_fail (key_file != NULL, NULL);
-@@ -2234,6 +2254,25 @@ g_key_file_get_locale_string (GKeyFile *key_file,
- free_languages = FALSE;
- }
-
-+ /* we're only interested in gettext translation if we don't have a
-+ * translation in the .desktop file itself and if the key is one of the keys
-+ * we know we want to translate: Name, GenericName, Comment, Keywords.
-+ * Blindly doing this for all keys can give strange result for the icons,
-+ * since the Icon is a locale string in the spec, eg. We also only get
-+ * translation in the mo file if the requested locale is the LC_MESSAGES one.
-+ * Ideally, we should do more and change LC_MESSAGES to use the requested
-+ * locale, but there's no guarantee it's installed on the system and it might
-+ * have some side-effects. Since this is a corner case, let's ignore it. */
-+ msg_locale = setlocale (LC_MESSAGES, NULL);
-+ try_gettext = msg_locale && key_file->gettext_domain &&
-+ (strcmp (group_name, G_KEY_FILE_DESKTOP_GROUP) == 0 ||
-+ g_str_has_prefix (group_name, G_KEY_FILE_DESKTOP_ACTION_GROUP_PREFIX)) &&
-+ (strcmp (key, G_KEY_FILE_DESKTOP_KEY_NAME) == 0 ||
-+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_FULLNAME) == 0 ||
-+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME) == 0 ||
-+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_KEYWORDS) == 0 ||
-+ strcmp (key, G_KEY_FILE_DESKTOP_KEY_COMMENT) == 0);
-+
- for (i = 0; languages[i]; i++)
- {
- candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -2250,6 +2289,39 @@ g_key_file_get_locale_string (GKeyFile *key_file,
- translated_value = NULL;
- }
-
-+ /* Fallback to gettext */
-+ if (try_gettext && !translated_value)
-+ {
-+ gchar *orig_value = g_key_file_get_string (key_file, group_name, key, NULL);
-+
-+ if (orig_value)
-+ {
-+ gboolean codeset_set;
-+ const gchar *translated;
-+ gboolean has_gettext;
-+
-+ codeset_set = bind_textdomain_codeset (key_file->gettext_domain, "UTF-8") != NULL;
-+ translated = NULL;
-+
-+ translated = g_dgettext (key_file->gettext_domain,
-+ orig_value);
-+ has_gettext = translated != orig_value;
-+
-+ g_free (orig_value);
-+
-+ if (has_gettext)
-+ {
-+ if (codeset_set)
-+ translated_value = g_strdup (translated);
-+ else
-+ translated_value = g_locale_to_utf8 (translated,
-+ -1, NULL, NULL, NULL);
-+ }
-+ else
-+ translated_value = NULL;
-+ }
-+ }
-+
- /* Fallback to untranslated key
- */
- if (!translated_value)
-diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h
-index 7a10048..aef9113 100644
---- a/glib/gkeyfile.h
-+++ b/glib/gkeyfile.h
-@@ -298,6 +298,7 @@ gboolean g_key_file_remove_group (GKeyFile *key_file,
-
- /* Defines for handling freedesktop.org Desktop files */
- #define G_KEY_FILE_DESKTOP_GROUP "Desktop Entry"
-+#define G_KEY_FILE_DESKTOP_ACTION_GROUP_PREFIX "Desktop Action"
-
- #define G_KEY_FILE_DESKTOP_KEY_TYPE "Type"
- #define G_KEY_FILE_DESKTOP_KEY_VERSION "Version"
-@@ -320,6 +321,9 @@ gboolean g_key_file_remove_group (GKeyFile *key_file,
- #define G_KEY_FILE_DESKTOP_KEY_URL "URL"
- #define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"
- #define G_KEY_FILE_DESKTOP_KEY_ACTIONS "Actions"
-+#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-GNOME-Gettext-Domain"
-+#define G_KEY_FILE_DESKTOP_KEY_FULLNAME "X-GNOME-FullName"
-+#define G_KEY_FILE_DESKTOP_KEY_KEYWORDS "Keywords"
-
- #define G_KEY_FILE_DESKTOP_TYPE_APPLICATION "Application"
- #define G_KEY_FILE_DESKTOP_TYPE_LINK "Link"
diff --git a/debian/patches/81-skip-monitor-test-on-non-linux.patch b/debian/patches/81-skip-monitor-test-on-non-linux.patch
deleted file mode 100644
index dd1669e66..000000000
--- a/debian/patches/81-skip-monitor-test-on-non-linux.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Emilio Pozuelo Monfort <[email protected]>
-Date: Sun, 9 Mar 2014 15:06:31 +0100
-Subject: Skip the monitor test on non-linux as it currently hangs
-
-Forwarded: no
----
- gio/tests/monitor.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gio/tests/monitor.c b/gio/tests/monitor.c
-index 4d64fa8..01d91a0 100644
---- a/gio/tests/monitor.c
-+++ b/gio/tests/monitor.c
-@@ -214,7 +214,9 @@ main (int argc, char *argv[])
- {
- g_test_init (&argc, &argv, NULL);
-
-+#ifdef __linux__
- g_test_add ("/monitor/directory", Fixture, NULL, setup, test_directory_monitor, teardown);
-+#endif
-
- return g_test_run ();
- }
diff --git a/debian/patches/debian/02_gettext-desktopfiles-ubuntu.patch b/debian/patches/debian/02_gettext-desktopfiles-ubuntu.patch
deleted file mode 100644
index be595bd24..000000000
--- a/debian/patches/debian/02_gettext-desktopfiles-ubuntu.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From: Martin Pitt <[email protected]>
-Date: Tue, 24 Feb 2009 16:08:05 +0100
-Subject: Provide backwards compatibility for 01_gettext-desktopfiles.patch
- for X-{Debian,Ubuntu}-Gettext-Domain
-
-Ubuntu-specific. 01_gettext-desktopfiles.patch was changed to use
-X-GNOME-, so this is necessary until all our .desktop files are converted.
-
-Forwarded: no
----
- glib/gkeyfile.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/glib/gkeyfile.c b/glib/gkeyfile.c
-index e79f8ed..7b634e9 100644
---- a/glib/gkeyfile.c
-+++ b/glib/gkeyfile.c
-@@ -886,6 +886,16 @@ g_key_file_load_from_fd (GKeyFile *key_file,
- G_KEY_FILE_DESKTOP_GROUP,
- G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
- NULL);
-+ if (!key_file->gettext_domain)
-+ key_file->gettext_domain = g_key_file_get_string (key_file,
-+ G_KEY_FILE_DESKTOP_GROUP,
-+ "X-Ubuntu-Gettext-Domain",
-+ NULL);
-+ if (!key_file->gettext_domain)
-+ key_file->gettext_domain = g_key_file_get_string (key_file,
-+ G_KEY_FILE_DESKTOP_GROUP,
-+ "X-Debian-Gettext-Domain",
-+ NULL);
-
- return TRUE;
- }
-@@ -947,6 +957,16 @@ g_key_file_load_from_file (GKeyFile *key_file,
- G_KEY_FILE_DESKTOP_GROUP,
- G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
- NULL);
-+ if (!key_file->gettext_domain)
-+ key_file->gettext_domain = g_key_file_get_string (key_file,
-+ G_KEY_FILE_DESKTOP_GROUP,
-+ "X-Ubuntu-Gettext-Domain",
-+ NULL);
-+ if (!key_file->gettext_domain)
-+ key_file->gettext_domain = g_key_file_get_string (key_file,
-+ G_KEY_FILE_DESKTOP_GROUP,
-+ "X-Debian-Gettext-Domain",
-+ NULL);
-
- return TRUE;
- }
diff --git a/debian/patches/debian/03_disble_glib_compile_schemas_warning.patch b/debian/patches/debian/03_disble_glib_compile_schemas_warning.patch
deleted file mode 100644
index a442c2b14..000000000
--- a/debian/patches/debian/03_disble_glib_compile_schemas_warning.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Iain Lane <[email protected]>
-Date: Mon, 10 Sep 2012 16:25:18 +0100
-Subject: Disable confusing (to users) warning about deprecated schema paths
-
-Disable a warning when compiling schemas which are installed
-into 'deprecated' locations. Users see this very often due to
-glib-compile-schemas being called from libglib2.0-0's trigger and it is
-not very useful for them.
-
-Forwarded: not-needed
----
- gio/glib-compile-schemas.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
-index 5e1bebb..7bd8cfb 100644
---- a/gio/glib-compile-schemas.c
-+++ b/gio/glib-compile-schemas.c
-@@ -1233,6 +1233,9 @@ parse_state_start_schema (ParseState *state,
- return;
- }
-
-+ // Disable this warning: it confuses users and there is unlikely to be much
-+ // progress towards fixing
-+ /*
- if (path && (g_str_has_prefix (path, "/apps/") ||
- g_str_has_prefix (path, "/desktop/") ||
- g_str_has_prefix (path, "/system/")))
-@@ -1245,6 +1248,7 @@ parse_state_start_schema (ParseState *state,
- g_printerr ("%s\n", message);
- g_free (message);
- }
-+ */
-
- state->schema_state = schema_state_new (path, gettext_domain,
- extends, extends_name, list_of);
diff --git a/debian/patches/debian/04_homedir_env.patch b/debian/patches/debian/04_homedir_env.patch
deleted file mode 100644
index 23b3bbe30..000000000
--- a/debian/patches/debian/04_homedir_env.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Iain Lane <[email protected]>
-Date: Sat, 23 Feb 2013 19:27:38 +0100
-Subject: Handle the G_HOME environment variable
-
-g_get_home_dir() now respects the HOME environment variable but we'll keep
-G_HOME for now as packages in Debian rely on it.
-
-Modified from an earlier patch by Josselin Mouette.
-
-Forwarded: not-needed, Debian-specific
----
- docs/reference/glib/running.xml | 18 ++++++++++++++++++
- glib/gutils.c | 10 +++++++++-
- 2 files changed, 27 insertions(+), 1 deletion(-)
-
-diff --git a/docs/reference/glib/running.xml b/docs/reference/glib/running.xml
-index 8e4ffec..ec33ea6 100644
---- a/docs/reference/glib/running.xml
-+++ b/docs/reference/glib/running.xml
-@@ -256,6 +256,24 @@ How to run and debug your GLib application
- </para>
- </formalpara>
-
-+<formalpara id="G_HOME">
-+ <title><envar>G_HOME</envar></title>
-+
-+ <para>
-+ Historically, GLib applications ignored the <envar>HOME</envar>
-+ environment variable on Unix systems, instead using the user directory
-+ as specified by the <filename>passwd</filename> entry. As of GLib 2.35.3,
-+ this is no longer true: <envar>HOME</envar> is respected.
-+ </para>
-+ <para>
-+ The <envar>G_HOME</envar> environment variable will override any
-+ other setting for the home directory. It is not meant for daily usage, but
-+ it is useful in testing or building environments. As <envar>HOME</envar> is
-+ now supported by GLib, <envar>G_HOME</envar> is deprecated and will be
-+ removed in a future release.
-+ </para>
-+</formalpara>
-+
- </refsect2>
-
- <refsect2 id="setlocale">
-diff --git a/glib/gutils.c b/glib/gutils.c
-index 2e2d457..951b634 100644
---- a/glib/gutils.c
-+++ b/glib/gutils.c
-@@ -797,7 +797,9 @@ g_build_home_dir (void)
- gchar *home_dir;
-
- /* We first check HOME and use it if it is set */
-- home_dir = g_strdup (g_getenv ("HOME"));
-+ home_dir = g_strdup (g_getenv ("G_HOME"));
-+ if (!home_dir)
-+ home_dir = g_strdup (g_getenv ("HOME"));
-
- #ifdef G_OS_WIN32
- /* Only believe HOME if it is an absolute path and exists.
-@@ -885,6 +887,12 @@ g_build_home_dir (void)
- * should either directly check the `HOME` environment variable yourself
- * or unset it before calling any functions in GLib.
- *
-+ * When the pre-2.36 behaviour was in effect, Debian provided the
-+ * <envar>G_HOME</envar> environment variable for testing and development
-+ * purposes. This is now unnecessary as <envar>HOME</envar> can be used
-+ * directly, but is retained for compatibility. It is deprecated and will be
-+ * removed in a future release.
-+ *
- * Returns: (type filename): the current user's home directory
- */
- const gchar *
diff --git a/debian/patches/debian/06_thread_test_ignore_prctl_fail.patch b/debian/patches/debian/06_thread_test_ignore_prctl_fail.patch
deleted file mode 100644
index 4041dd3cc..000000000
--- a/debian/patches/debian/06_thread_test_ignore_prctl_fail.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Martin Pitt <[email protected]>
-Date: Tue, 26 Jun 2012 19:28:14 +0200
-Subject: Do not fail the /thread/thread4 test if prctrl() fails
-
-This happens on the Debian buildds.
-
-Forwarded: no, Debian buildd specific
----
- glib/tests/thread.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/glib/tests/thread.c b/glib/tests/thread.c
-index b9f8796..43e682e 100644
---- a/glib/tests/thread.c
-+++ b/glib/tests/thread.c
-@@ -147,8 +147,11 @@ test_thread4 (void)
- getrlimit (RLIMIT_NPROC, &nl);
- nl.rlim_cur = 1;
-
-- if ((ret = prlimit (getpid (), RLIMIT_NPROC, &nl, &ol)) != 0)
-- g_error ("prlimit failed: %s", g_strerror (errno));
-+ if ((ret = prlimit (getpid(), RLIMIT_NPROC, &nl, &ol)) != 0)
-+ {
-+ g_debug ("prlimit failed: %s\n", g_strerror (errno));
-+ return;
-+ }
-
- error = NULL;
- thread = g_thread_try_new ("a", thread1_func, NULL, &error);
diff --git a/debian/patches/debian/61_glib-compile-binaries-path.patch b/debian/patches/debian/61_glib-compile-binaries-path.patch
deleted file mode 100644
index c2a0bbcfe..000000000
--- a/debian/patches/debian/61_glib-compile-binaries-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: =?utf-8?q?Sebastian_Dr=C3=B6ge?= <[email protected]>
-Date: Tue, 13 Jul 2010 14:06:28 +0200
-Subject: Adjust path to glib-compile-schemas in the pkg-config file
-
-This is because gio-querymodules and glib-compile-schemas have been put in
-a private, versioned directory in libglib2.0-0 to avoid a dependency loop.
-
-Forwarded: not-needed, specific to Debian packaging
----
- gio/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gio/meson.build b/gio/meson.build
-index d7f4f3f..990b1b5 100644
---- a/gio/meson.build
-+++ b/gio/meson.build
-@@ -828,7 +828,7 @@ pkg.generate(libgio,
- 'schemasdir=' + join_paths('${datadir}', schemas_subdir),
- 'bindir=' + join_paths('${prefix}', get_option('bindir')),
- 'giomoduledir=' + giomodulesdir,
-- 'glib_compile_schemas=' + join_paths('${bindir}', 'glib-compile-schemas'),
-+ 'glib_compile_schemas=' + join_paths('${libdir}', 'glib-2.0', 'glib-compile-schemas'),
- 'glib_compile_resources=' + join_paths('${bindir}', 'glib-compile-resources'),
- 'gdbus_codegen=' + join_paths('${bindir}', 'gdbus-codegen')],
- version : glib_version,
diff --git a/debian/patches/debian/90_gio-modules-multiarch-compat.patch b/debian/patches/debian/90_gio-modules-multiarch-compat.patch
deleted file mode 100644
index 4e6e9bef5..000000000
--- a/debian/patches/debian/90_gio-modules-multiarch-compat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Steve Langasek <[email protected]>
-Date: Sat, 16 Jul 2011 13:12:48 -0700
-Subject: gio: add fallback directory for pre-multiarch compatibility
-
-Origin: vendor, Ubuntu
-Bug-Debian: https://bugs.debian.org/634099
-Forwarded: no, specific to Debian and its derivatives
----
- gio/giomodule.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/gio/giomodule.c b/gio/giomodule.c
-index b92162d..cdb20ca 100644
---- a/gio/giomodule.c
-+++ b/gio/giomodule.c
-@@ -1206,6 +1206,9 @@ _g_io_modules_ensure_loaded (void)
-
- g_io_module_scope_free (scope);
-
-+ /* Hard-coded fallback directory for pre-multiarch compatibility */
-+ g_io_modules_scan_all_in_directory ("/usr/lib/gio/modules");
-+
- /* Initialize types from built-in "modules" */
- g_type_ensure (g_null_settings_backend_get_type ());
- g_type_ensure (g_memory_settings_backend_get_type ());
diff --git a/debian/patches/debian/Disable-some-tests-on-slow-architectures-which-keep-faili.patch b/debian/patches/debian/Disable-some-tests-on-slow-architectures-which-keep-faili.patch
deleted file mode 100644
index b1e290f1b..000000000
--- a/debian/patches/debian/Disable-some-tests-on-slow-architectures-which-keep-faili.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From: Martin Pitt <[email protected]>
-Date: Thu, 27 Sep 2012 11:22:56 +0200
-Subject: Disable some tests on slow architectures which keep failing the
- tests
-
-[smcv: Modified to use g_test_skip() instead of omitting those test cases
-completely, and allow them to be re-enabled with a Debian-specific
-environment variable]
-
-Co-authored-by: Simon McVittie <[email protected]>
-Forwarded: no
----
- gio/tests/socket.c | 8 ++++++++
- glib/tests/mainloop.c | 24 ++++++++++++++++++++++++
- glib/tests/timeout.c | 9 +++++++++
- 3 files changed, 41 insertions(+)
-
-diff --git a/gio/tests/socket.c b/gio/tests/socket.c
-index 8410a3e..5eba57a 100644
---- a/gio/tests/socket.c
-+++ b/gio/tests/socket.c
-@@ -1111,6 +1111,14 @@ test_timed_wait (void)
- gint64 start_time;
- gint poll_duration;
-
-+#if defined(__arm__)
-+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
-+ {
-+ g_test_skip ("Not reliable on older ARM hardware");
-+ return;
-+ }
-+#endif
-+
- data = create_server (G_SOCKET_FAMILY_IPV4, echo_server_thread, FALSE, &error);
- if (error != NULL)
- {
-diff --git a/glib/tests/mainloop.c b/glib/tests/mainloop.c
-index cf114fd..9beefd3 100644
---- a/glib/tests/mainloop.c
-+++ b/glib/tests/mainloop.c
-@@ -168,6 +168,14 @@ test_timeouts (void)
- GMainLoop *loop;
- GSource *source;
-
-+#if defined(__arm__)
-+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
-+ {
-+ g_test_skip ("Not reliable on older ARM hardware");
-+ return;
-+ }
-+#endif
-+
- a = b = c = 0;
-
- ctx = g_main_context_new ();
-@@ -451,6 +459,14 @@ test_child_sources (void)
- GMainLoop *loop;
- GSource *parent, *child_b, *child_c, *end;
-
-+#if defined(__arm__)
-+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
-+ {
-+ g_test_skip ("Not reliable on older ARM hardware");
-+ return;
-+ }
-+#endif
-+
- ctx = g_main_context_new ();
- loop = g_main_loop_new (ctx, FALSE);
-
-@@ -529,6 +545,14 @@ test_recursive_child_sources (void)
- GMainLoop *loop;
- GSource *parent, *child_b, *child_c, *end;
-
-+#if defined(__arm__)
-+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
-+ {
-+ g_test_skip ("Not reliable on older ARM hardware");
-+ return;
-+ }
-+#endif
-+
- ctx = g_main_context_new ();
- loop = g_main_loop_new (ctx, FALSE);
-
-diff --git a/glib/tests/timeout.c b/glib/tests/timeout.c
-index 8f44e75..430be91 100644
---- a/glib/tests/timeout.c
-+++ b/glib/tests/timeout.c
-@@ -175,6 +175,15 @@ test_func (gpointer data)
- static void
- test_rounding (void)
- {
-+
-+#if defined(__arm__)
-+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
-+ {
-+ g_test_skip ("Not reliable on older ARM hardware");
-+ return;
-+ }
-+#endif
-+
- loop = g_main_loop_new (NULL, FALSE);
-
- last_time = g_get_monotonic_time ();
diff --git a/debian/patches/debian/Look-for-gio-launch-desktop-in-libdir-glib-2.0.patch b/debian/patches/debian/Look-for-gio-launch-desktop-in-libdir-glib-2.0.patch
deleted file mode 100644
index e9fd291b5..000000000
--- a/debian/patches/debian/Look-for-gio-launch-desktop-in-libdir-glib-2.0.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Simon McVittie <[email protected]>
-Date: Wed, 1 Aug 2018 09:40:38 +0100
-Subject: Look for gio-launch-desktop in $(libdir)/glib-2.0
-
-In Debian, we install it in the shared library package to avoid
-needing a circular dependency between libglib2.0-0 and
-libglib2.0-bin.
-
-Forwarded: not-needed, Debian-specific
----
- gio/gdesktopappinfo.c | 4 ++--
- gio/meson.build | 1 +
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/gio/gdesktopappinfo.c b/gio/gdesktopappinfo.c
-index 7d7425e..36f3cfb 100644
---- a/gio/gdesktopappinfo.c
-+++ b/gio/gdesktopappinfo.c
-@@ -2741,9 +2741,9 @@ g_desktop_app_info_launch_uris_with_spawn (GDesktopAppInfo *info,
- /* Allow test suite to specify path to gio-launch-desktop */
- tmp = g_getenv ("GIO_LAUNCH_DESKTOP");
-
-- /* Fall back on usual searching in $PATH */
- if (tmp == NULL)
-- tmp = "gio-launch-desktop";
-+ tmp = GIO_LIBDIR "/glib-2.0/gio-launch-desktop";
-+
- g_once_init_leave (&gio_launch_desktop_path, tmp);
- }
-
-diff --git a/gio/meson.build b/gio/meson.build
-index 990b1b5..84c5af1 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(glib_libdir),
- '-DGIO_MODULE_DIR="@0@"'.format(glib_giomodulesdir),
- ]
-
diff --git a/debian/patches/debian/Skip-test-which-performs-some-unreliable-floating-point-c.patch b/debian/patches/debian/Skip-test-which-performs-some-unreliable-floating-point-c.patch
deleted file mode 100644
index db62eda78..000000000
--- a/debian/patches/debian/Skip-test-which-performs-some-unreliable-floating-point-c.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Iain Lane <[email protected]>
-Date: Tue, 18 Mar 2014 15:43:35 +0000
-Subject: Skip test which performs some unreliable floating point comparisons
-
-[smcv: Modified to use g_test_skip() instead of omitting those test cases
-completely, and allow them to be re-enabled with a Debian-specific
-environment variable]
-
-Co-authored-by: Simon McVittie <[email protected]>
-Bug: https://gitlab.gnome.org/GNOME/glib/issues/820
-Forwarded: no
----
- glib/tests/timer.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/glib/tests/timer.c b/glib/tests/timer.c
-index 4cd5fba..3c0642b 100644
---- a/glib/tests/timer.c
-+++ b/glib/tests/timer.c
-@@ -30,6 +30,12 @@ test_timer_basic (void)
- volatile gdouble elapsed;
- gulong micros;
-
-+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
-+ {
-+ g_test_skip ("Not reliable due to floating-point rounding (glib#820)");
-+ return;
-+ }
-+
- timer = g_timer_new ();
-
- elapsed = g_timer_elapsed (timer, &micros);
diff --git a/debian/patches/debian/Skip-unreliable-test_threaded_singleton-by-default.patch b/debian/patches/debian/Skip-unreliable-test_threaded_singleton-by-default.patch
deleted file mode 100644
index 7c4272143..000000000
--- a/debian/patches/debian/Skip-unreliable-test_threaded_singleton-by-default.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Simon McVittie <[email protected]>
-Date: Fri, 4 Jan 2019 08:37:20 +0000
-Subject: Skip unreliable test_threaded_singleton() by default
-
-This test aims to reproduce a race condition between last-unref of the
-global singleton GDBusConnection and g_bus_get_sync(). However, test
-setup intermittently times out with:
-
- # GLib-GIO-DEBUG: run 0: refcount is 2, sleeping
- Bail out! GLib-GIO-FATAL-ERROR: connection had too many refs
-
-The current theory upstream is that this might be a reference leak in
-test_delivery_in_thread().
-
-Demote test_threaded_singleton() to be run as one of the "flaky"
-autopkgtests, but not at build time or in the part of the autopkgtest
-run that gates progress into testing.
-
-Bug: https://gitlab.gnome.org/GNOME/glib/issues/1515
-Forwarded: no
----
- gio/tests/gdbus-threading.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/gio/tests/gdbus-threading.c b/gio/tests/gdbus-threading.c
-index 3e4dc92..165dbb7 100644
---- a/gio/tests/gdbus-threading.c
-+++ b/gio/tests/gdbus-threading.c
-@@ -499,6 +499,12 @@ test_threaded_singleton (void)
- guint unref_wins = 0;
- guint get_wins = 0;
-
-+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") == NULL)
-+ {
-+ g_test_skip ("Not reliable (glib#1515)");
-+ return;
-+ }
-+
- if (g_test_thorough ())
- n = 100000;
- else
diff --git a/debian/patches/debian/closures-test-Skip-on-arm-unless-flaky-tests-are-allowed.patch b/debian/patches/debian/closures-test-Skip-on-arm-unless-flaky-tests-are-allowed.patch
deleted file mode 100644
index cd1239169..000000000
--- a/debian/patches/debian/closures-test-Skip-on-arm-unless-flaky-tests-are-allowed.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Simon McVittie <[email protected]>
-Date: Thu, 3 Jan 2019 09:01:03 +0000
-Subject: closures test: Skip on arm* unless flaky tests are allowed
-
-Choosing the right number of iterations to avoid either taking literally
-hours on some hardware, or getting spurious failures when one thread
-starves another, seems to be too hard to get right in practice.
-Make this test opt-in so that its failures aren't release-critical.
-We can run it as a separate autopkgtest that is marked flaky.
-
-Signed-off-by: Simon McVittie <[email protected]>
-Bug-Debian: https://bugs.debian.org/880883
-Bug-Debian: https://bugs.debian.org/917983
-Forwarded: not-needed
----
- tests/refcount/closures.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/tests/refcount/closures.c b/tests/refcount/closures.c
-index a4c2831..4e9bf36 100644
---- a/tests/refcount/closures.c
-+++ b/tests/refcount/closures.c
-@@ -237,6 +237,14 @@ main (int argc,
- GTest *object;
- guint i;
-
-+#if defined(__aarch64__) || defined(__arm__)
-+ if (g_getenv ("DEB_ALLOW_FLAKY_TESTS") != NULL)
-+ {
-+ g_print ("SKIP: Test is known to be flaky on arm* (#880883, #917983)\n");
-+ return 0;
-+ }
-+#endif
-+
- g_print ("START: %s\n", argv[0]);
- g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL | g_log_set_always_fatal (G_LOG_FATAL_MASK));
-
diff --git a/debian/patches/gwakeuptest-Be-less-parallel-unless-invoked-with-m-slow.patch b/debian/patches/gwakeuptest-Be-less-parallel-unless-invoked-with-m-slow.patch
deleted file mode 100644
index 114567ec1..000000000
--- a/debian/patches/gwakeuptest-Be-less-parallel-unless-invoked-with-m-slow.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Simon McVittie <[email protected]>
-Date: Mon, 18 Dec 2017 18:06:05 +0000
-Subject: gwakeuptest: Be less parallel unless invoked with -m slow
-
-This is a workaround for test failures on the reproducible-builds
-infrastructure, where a multi-threaded stress-test sometimes takes longer
-to finish on x86_64 than it would have done on slow architectures like
-arm and mips on the official Debian autobuilders. It is not clear why.
-
-This change will make this test more likely to pass, but less likely to
-detect bugs.
-
-Signed-off-by: Simon McVittie <[email protected]>
-Bug-Debian: https://bugs.debian.org/884659
-Forwarded: no
----
- glib/tests/gwakeuptest.c | 17 +++++++++++++----
- 1 file changed, 13 insertions(+), 4 deletions(-)
-
-diff --git a/glib/tests/gwakeuptest.c b/glib/tests/gwakeuptest.c
-index 461a7d3..2c3eccd 100644
---- a/glib/tests/gwakeuptest.c
-+++ b/glib/tests/gwakeuptest.c
-@@ -89,6 +89,9 @@ struct context
- #define NUM_TOKENS 5
- #define TOKEN_TTL 100000
-
-+static gint num_threads = NUM_THREADS;
-+static gint token_ttl = TOKEN_TTL;
-+
- static struct context contexts[NUM_THREADS];
- static GThread *threads[NUM_THREADS];
- static GWakeup *last_token_wakeup;
-@@ -158,7 +161,7 @@ dispatch_token (struct token *token)
- struct context *ctx;
- gint next_ctx;
-
-- next_ctx = g_test_rand_int_range (0, NUM_THREADS);
-+ next_ctx = g_test_rand_int_range (0, num_threads);
- ctx = &contexts[next_ctx];
- token->owner = ctx;
- token->ttl--;
-@@ -213,6 +216,12 @@ test_threaded (void)
- {
- gint i;
-
-+ if (!g_test_slow ())
-+ {
-+ num_threads = NUM_THREADS / 10;
-+ token_ttl = TOKEN_TTL / 10;
-+ }
-+
- /* make sure we don't block forever */
- alarm (60);
-
-@@ -230,7 +239,7 @@ test_threaded (void)
- last_token_wakeup = g_wakeup_new ();
-
- /* create contexts, assign to threads */
-- for (i = 0; i < NUM_THREADS; i++)
-+ for (i = 0; i < num_threads; i++)
- {
- context_init (&contexts[i]);
- threads[i] = g_thread_new ("test", thread_func, &contexts[i]);
-@@ -238,13 +247,13 @@ test_threaded (void)
-
- /* dispatch tokens */
- for (i = 0; i < NUM_TOKENS; i++)
-- dispatch_token (token_new (TOKEN_TTL));
-+ dispatch_token (token_new (token_ttl));
-
- /* wait until all tokens are gone */
- wait_for_signaled (last_token_wakeup);
-
- /* ask threads to quit, join them, cleanup */
-- for (i = 0; i < NUM_THREADS; i++)
-+ for (i = 0; i < num_threads; i++)
- {
- context_quit (&contexts[i]);
- g_thread_join (threads[i]);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e82f587ad..000000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,16 +0,0 @@
-# Applied in Endless git instead
-#01_gettext-desktopfiles.patch
-#81-skip-monitor-test-on-non-linux.patch
-#0001-timer-test-use-volatile-for-locals.patch
-#gwakeuptest-Be-less-parallel-unless-invoked-with-m-slow.patch
-#debian/02_gettext-desktopfiles-ubuntu.patch
-#debian/03_disble_glib_compile_schemas_warning.patch
-#debian/04_homedir_env.patch
-#debian/06_thread_test_ignore_prctl_fail.patch
-#debian/61_glib-compile-binaries-path.patch
-#debian/90_gio-modules-multiarch-compat.patch
-#debian/Look-for-gio-launch-desktop-in-libdir-glib-2.0.patch
-#debian/closures-test-Skip-on-arm-unless-flaky-tests-are-allowed.patch
-#debian/Disable-some-tests-on-slow-architectures-which-keep-faili.patch
-#debian/Skip-test-which-performs-some-unreliable-floating-point-c.patch
-#debian/Skip-unreliable-test_threaded_singleton-by-default.patch
diff --git a/debian/rules b/debian/rules
index 1137d77b9..d290ad8fd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+GNOME_MODULE := glib
binaries := $(shell dh_listpackages)
export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
@@ -18,37 +21,9 @@ DEB_LDFLAGS_MAINT_APPEND += -Wl,-O1
include /usr/share/dpkg/default.mk
%:
- dh $@ --with gnome,python3 --buildsystem=meson
-
-override_dh_autoreconf:
- @:
-
-ifneq ($(filter hppa,$(DEB_HOST_ARCH_CPU)),)
-stack_grows_up = true
-else
-stack_grows_up = false
-endif
-
-ifneq ($(filter kfreebsd,$(DEB_HOST_ARCH_OS)),)
-have_non_stub_xattr = false
-else
-have_non_stub_xattr = true
-endif
-
-export DH_MESON_CROSS_FILE = debian/cross.txt
+ dh $@ --with gnome,python3
-# We use our own copy of debcrossgen to work around unimplemented feature
-# request https://bugs.debian.org/912559
override_dh_auto_configure:
-ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
- debian/debcrossgen \
- --set have_c99_snprintf=true \
- --set have_c99_vsnprintf=true \
- --set have_strlcpy=false \
- --set have_unix98_printf=true \
- --set growing_stack=$(stack_grows_up) \
- -o debian/cross.txt
-endif
dh_auto_configure \
--builddirectory=debian/build/deb \
-- \
@@ -68,8 +43,7 @@ override_dh_clean:
rm -rf $(CURDIR)/debian/build \
$(CURDIR)/debian/install \
$(CURDIR)/debian/tmp-xdg-runtime-dir
- dh_clean -Xorg.gtk.test.gschema.xml.orig -Xorg.gtk.test.gschema.override.orig
-
+ dh_clean -Xorg.gtk.test.gschema.xml.orig
override_dh_makeshlibs:
dh_makeshlibs -plibglib2.0-tests -n
@@ -103,52 +77,12 @@ unexport XDG_DATA_DIRS
export DBUS_SESSION_BUS_ADDRESS=this-should-not-be-used-and-will-fail:
ifeq ($(DEB_HOST_ARCH_OS), linux)
-handle_test_failure := exit $$?
-else
-handle_test_failure := true
-endif
-
-# Upstream test timeouts assume an otherwise unloaded system, but that
-# isn't necessarily the case for a porterbox or multiple parallel builds
-test_timeout_multiplier = 3
-
-ifneq ($(filter arm hppa mips% sparc%,$(DEB_HOST_ARCH_CPU)),)
-$(info Slow architecture detected, increasing test timeout)
-test_timeout_multiplier = 5
-endif
-
-ifneq ($(filter m68k riscv64 sh4,$(DEB_HOST_ARCH_CPU)),)
-$(info Architecture with qemu buildds detected, increasing test timeout a lot)
-test_timeout_multiplier = 20
-endif
-
override_dh_auto_test-arch:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
# Remove LD_PRELOAD so we don't run with fakeroot, which makes dbus-related tests fail
- # First run the non-flaky tests, and fail the build if they fail (on linux)
- env -u LD_PRELOAD \
- DEB_BUILD_TIME_TESTS=1 \
- LC_ALL=C.UTF-8 \
- MESON_TESTTHREADS=1 \
- meson test -C debian/build/deb \
- --no-rebuild \
- --num-processes 1 \
- --timeout-multiplier $(test_timeout_multiplier) \
- --no-suite flaky \
- --verbose \
- || $(handle_test_failure)
- # and then run the flaky ones, but ignore them failing
- env -u LD_PRELOAD \
- DEB_BUILD_TIME_TESTS=1 \
- LC_ALL=C.UTF-8 \
- MESON_TESTTHREADS=1 \
- meson test -C debian/build/deb \
- --no-rebuild \
- --num-processes 1 \
- --timeout-multiplier $(test_timeout_multiplier) \
- --suite flaky \
- --verbose \
- || true
+ env -u LD_PRELOAD dh_auto_test --builddirectory=debian/build/deb -- -k check -j1
+else
+override_dh_auto_test-arch:
+ env -u LD_PRELOAD dh_auto_test --builddirectory=debian/build/deb -- -k check -j1 || true
endif
# Skip build-time tests if all we are building is documentation; running
@@ -162,51 +96,39 @@ export XDG_RUNTIME_DIR=$(CURDIR)/debian/tmp-xdg-runtime-dir
# a build fails
export VERBOSE=1
-ifeq ($(DEB_HOST_ARCH_OS),linux)
-is_linux := true
-enable_selinux := enabled
-else
-is_linux := false
-enable_selinux := disabled
-endif
-
-ifneq ($(filter hurd kfreebsd,$(DEB_HOST_ARCH_OS)),)
-use_fam := true
-else
-use_fam := false
-endif
-
# configure flags
DEB_CONFIGURE_EXTRA_FLAGS := \
- --libexecdir=lib/glib2.0 \
- -Dinternal_pcre=false \
- $(NULL)
+ --with-html-dir=\$${prefix}/share/doc/libglib2.0-doc \
+ --libexecdir=\$${prefix}/lib/glib2.0 \
+ --with-python=/usr/bin/python3 \
+ --with-pcre=system
DEB_CONFIGURE_FLAGS_deb := \
- --default-library both \
- -Dfam=$(use_fam) \
- -Dinstalled_tests=true \
- -Dlibmount=$(is_linux) \
- -Dman=true \
- -Dselinux=$(enable_selinux) \
- -Dsystemtap=true \
- -Dxattr=$(have_non_stub_xattr) \
- $(NULL)
+ --enable-static \
+ --enable-installed-tests \
+ --enable-always-build-tests \
+ --enable-debug=minimum
ifneq ($(filter libglib2.0-doc,$(binaries)),)
-DEB_CONFIGURE_FLAGS_deb += -Dgtk_doc=true
+DEB_CONFIGURE_FLAGS_deb += --enable-gtk-doc
else
-DEB_CONFIGURE_FLAGS_deb += -Dgtk_doc=false
+DEB_CONFIGURE_FLAGS_deb += --disable-gtk-doc
endif
+# libmount is available on linux only
+ifeq ($(DEB_HOST_ARCH_OS), linux)
+ DEB_CONFIGURE_FLAGS_deb += \
+ --enable-libmount
+else
+ DEB_CONFIGURE_FLAGS_deb += \
+ --disable-libmount
+endif
+
+
DEB_CONFIGURE_FLAGS_udeb := \
- --default-library shared \
- -Dgtk_doc=false \
- -Dinstalled_tests=false \
- -Dlibmount=false \
- -Dselinux=disabled \
- -Dxattr=$(have_non_stub_xattr) \
- $(NULL)
+ --disable-selinux \
+ --disable-libmount \
+ --disable-gtk-doc
override_dh_auto_build:
mkdir -p debian/tmp-xdg-runtime-dir
@@ -222,27 +144,28 @@ override_dh_auto_install:
debian/libglib2.0-0.$$script.in \
> debian/libglib2.0-0.$$script ; \
done
+ dh_auto_install -plibglib2.0-tests --sourcedir=debian/build/deb
ifneq ($(filter %-udeb,$(binaries)),)
dh_auto_install -plibglib2.0-udeb --builddirectory=debian/build/udeb --destdir=debian/install/udeb
endif
dh_auto_install --remaining-packages --builddirectory=debian/build/deb --destdir=debian/install/deb
override_dh_python3:
- # dh_python3 can't process both a private directory and /usr/bin
- # in the same invocation
dh_python3 -plibglib2.0-dev-bin /usr/share/glib-2.0/codegen
- dh_python3 -plibglib2.0-dev-bin
override_dh_install:
# Unwanted bits from the .deb build
+ rm -f debian/install/deb/lib/*/*.la
+ rm -f debian/install/deb/usr/lib/*/*.la
+ rm -f debian/install/deb/usr/lib/glib2.0/installed-tests/glib/*.la
+ rm -f debian/install/deb/usr/lib/glib2.0/installed-tests/glib/modules/*.la
rm -fr debian/install/deb/usr/share/glib-2.0/codegen/__pycache__
- # https://gitlab.gnome.org/GNOME/glib/issues/1539
- chmod -v 0644 debian/install/deb/usr/lib/glib2.0/installed-tests/glib/desktop-files/usr/applications/org.gnome.clocks.desktop
- chmod -v 0644 debian/install/deb/usr/lib/glib2.0/installed-tests/glib/echo-script.bat
- chmod -v 0644 debian/install/deb/usr/share/bash-completion/completions/gio
- chmod -v 0644 debian/install/deb/usr/share/glib-2.0/codegen/codegen_main.py
+ # Re-created by .links to point into /lib
+ rm -f debian/install/deb/usr/lib/*/libglib-2.0.so
ifneq ($(filter %-udeb,$(binaries)),)
# Unwanted bits from the .udeb build
+ rm -f debian/install/udeb/lib/*/*.la
+ rm -f debian/install/udeb/usr/lib/*/*.la
rm -f debian/install/udeb/usr/lib/*/*.so
rm -fr debian/install/udeb/usr/share/gdb
rm -fr debian/install/udeb/usr/share/gettext/its
@@ -252,10 +175,12 @@ 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:
- dh_missing --sourcedir=debian/install/deb --fail-missing
-ifneq ($(filter %-udeb,$(binaries)),)
dh_missing --sourcedir=debian/install/udeb --fail-missing
-endif
+ dh_missing --sourcedir=debian/install/deb --fail-missing
diff --git a/debian/tests/build b/debian/tests/build
index 3cd0ac00f..333b3a1e8 100755
--- a/debian/tests/build
+++ b/debian/tests/build
@@ -2,126 +2,26 @@
# autopkgtest check: Build and run a program against glib, to verify that the
# headers and pkg-config file are installed correctly
# (C) 2012 Canonical Ltd.
-# (C) 2018 Simon McVittie
-# Authors: Martin Pitt <[email protected]>, Simon McVittie
+# Author: Martin Pitt <[email protected]>
-set -eux
-
-mode=dynamic
-
-getopt_temp="$(getopt -o '' --long 'static' -n debian/tests/build -- "$@")"
-eval set -- "$getopt_temp"
-
-while true; do
- case "$1" in
- (--static)
- mode=static
- shift
- continue
- ;;
-
- (--)
- shift
- break
- ;;
-
- (*)
- echo "getopt: Internal error" >&2
- exit 2
- esac
-done
+set -e
WORKDIR=$(mktemp -d)
trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
cd $WORKDIR
-cat <<EOF > glib.c
+cat <<EOF > glibtest.c
#include <glib.h>
-int main(void)
+int main()
{
g_assert_cmpint (g_strcmp0 (NULL, "hello"), ==, -1);
- g_assert_cmpstr (g_getenv ("foo"), ==, "bar");
- return 0;
-}
-EOF
-cat <<EOF > gobject.c
-#include <glib-object.h>
-
-int main(void)
-{
- g_assert_cmpuint (G_TYPE_OBJECT, !=, G_TYPE_INVALID);
- return 0;
-}
-EOF
-cat <<EOF > gio.c
-#include <gio/gio.h>
-
-int main(void)
-{
- g_assert_cmpuint (G_TYPE_FILE, !=, G_TYPE_INVALID);
- return 0;
-}
-EOF
-cat <<EOF > gio-unix.c
-#include <gio/gunixfdlist.h>
-
-int main(void)
-{
- g_assert_cmpuint (G_TYPE_UNIX_FD_LIST, !=, G_TYPE_INVALID);
- return 0;
-}
-EOF
-cat <<EOF > gmodule.c
-#include <gmodule.h>
-
-int main(void)
-{
- GModule *module;
-
- g_assert_true (g_module_supported ());
- module = g_module_open (NULL, 0);
- g_assert_nonnull (module);
- g_assert_true (g_module_close (module));
+ g_assert_cmpstr (g_find_program_in_path ("bash"), ==, "/bin/bash");
return 0;
}
EOF
-cat <<EOF > gthread.c
-#include <glib.h>
-
-static gpointer
-other_cb (gpointer nil)
-{
- return "hello";
-}
-
-int main(void)
-{
- GThread *other;
- gpointer ret;
-
- other = g_thread_new ("other", other_cb, NULL);
- g_assert_nonnull (other);
- ret = g_thread_join (other);
- g_assert_cmpstr (ret, ==, "hello");
- return 0;
-}
-EOF
-
-for lib in glib gobject gio gio-unix gmodule gthread; do
- cflags=
- pcflags=
- packages="${lib}-2.0"
-
- case "$mode" in
- (static)
- cflags=-static
- pcflags=--static
- ;;
- esac
- gcc $cflags -o ${lib}-$mode ${lib}.c `pkg-config $pcflags --cflags --libs ${packages}`
- echo "build ($lib, $mode): OK"
- [ -x ${lib}-$mode ]
- foo=bar ./${lib}-$mode
- echo "run ($lib, $mode): OK"
-done
+gcc -o glibtest glibtest.c `pkg-config --cflags --libs glib-2.0`
+echo "build: OK"
+[ -x glibtest ]
+./glibtest
+echo "run: OK"
diff --git a/debian/tests/build-static b/debian/tests/build-static
deleted file mode 100755
index 7ba5c42fe..000000000
--- a/debian/tests/build-static
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec debian/tests/build --static
diff --git a/debian/tests/control b/debian/tests/control
index 77fcbb125..d2ccefee0 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,11 +1,6 @@
-Tests: build build-static
+Tests: build
Depends: libglib2.0-dev, build-essential
-Restrictions: allow-stderr superficial
Tests: installed-tests
Depends: libglib2.0-tests, dbus-x11, dbus (>= 1.8), xauth, xvfb, gnome-desktop-testing
Restrictions: allow-stderr
-
-Tests: flaky
-Depends: libglib2.0-tests, dbus-x11, dbus (>= 1.8), xauth, xvfb, gnome-desktop-testing
-Restrictions: allow-stderr flaky
diff --git a/debian/tests/flaky b/debian/tests/flaky
deleted file mode 100755
index 56aab0706..000000000
--- a/debian/tests/flaky
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# autopkgtest check: Run the installed-tests to verify glib works correctly
-# This part runs tests that have been marked as opt-in due to being flaky
-# on at least some architectures.
-# (C) 2013 Canonical Ltd.
-# (C) 2019 Collabora Ltd.
-
-set -eu
-NULL=
-
-export DEB_ALLOW_FLAKY_TESTS=1
-
-# Disable gvfs if it happens to be installed. We want to test the built-in
-# stuff
-export GIO_USE_VFS=local
-export GIO_USE_VOLUME_MONITOR=unix
-
-export XDG_RUNTIME_DIR="$AUTOPKGTEST_TMP"
-
-printf "Running as: "; id -a
-printf "passwd entry: "; getent passwd "$(id -u)" || echo "(exit status $?)"
-printf "group entry: "; getent group "$(id -g)" || echo "(exit status $?)"
-echo "Environment:"
-env | LC_ALL=C sort -u
-
-exec dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner \
- glib/closures.test \
- glib/gdbus-threading.test \
- glib/mainloop.test \
- glib/socket.test \
- glib/timeout.test \
- glib/timer.test \
- ${NULL}
diff --git a/debian/tests/installed-tests b/debian/tests/installed-tests
index 315dfe2e4..9566a71c6 100755
--- a/debian/tests/installed-tests
+++ b/debian/tests/installed-tests
@@ -3,19 +3,13 @@
# (C) 2013 Canonical Ltd.
# Author: Iain Lane <[email protected]>
-set -eu
+set -e
# Disable gvfs if it happens to be installed. We want to test the built-in
# stuff
export GIO_USE_VFS=local
export GIO_USE_VOLUME_MONITOR=unix
-export XDG_RUNTIME_DIR="$AUTOPKGTEST_TMP"
-
-printf "Running as: "; id -a
-printf "passwd entry: "; getent passwd "$(id -u)" || echo "(exit status $?)"
-printf "group entry: "; getent group "$(id -g)" || echo "(exit status $?)"
-echo "Environment:"
-env | LC_ALL=C sort -u
+export XDG_RUNTIME_DIR=$ADTTMP
dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner glib
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment