r37632 - in /desktop/unstable/glib2.0: ./ debian/ debian/patches/ debian/tests/

mpitt at users.alioth.debian.org mpitt at users.alioth.debian.org
Wed May 8 04:24:02 UTC 2013


Author: mpitt
Date: Wed May  8 04:24:00 2013
New Revision: 37632

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37632
Log:
merge experimental branch

Added:
    desktop/unstable/glib2.0/debian/libglib2.0-doc.lintian-overrides
      - copied unchanged from r37631, desktop/experimental/glib2.0/debian/libglib2.0-doc.lintian-overrides
    desktop/unstable/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch
      - copied unchanged from r37631, desktop/experimental/glib2.0/debian/patches/03_disble_glib_compile_schemas_warning.patch
    desktop/unstable/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch
      - copied unchanged from r37631, desktop/experimental/glib2.0/debian/patches/06_thread_test_ignore_prctl_fail.patch
    desktop/unstable/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
      - copied unchanged from r37631, desktop/experimental/glib2.0/debian/patches/07_disable_tests_on_slow_archs.patch
    desktop/unstable/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch
      - copied unchanged from r37631, desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch
    desktop/unstable/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch
      - copied unchanged from r37631, desktop/experimental/glib2.0/debian/patches/11_kfreebsd_pthread_condattr_setclock_prototype.patch
    desktop/unstable/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch
      - copied unchanged from r37631, desktop/experimental/glib2.0/debian/patches/13_sparc_prlimit_prototype.patch
    desktop/unstable/glib2.0/debian/patches/15_gio_desktop_app_info_test_bin_true_path.patch
      - copied unchanged from r37631, desktop/experimental/glib2.0/debian/patches/15_gio_desktop_app_info_test_bin_true_path.patch
    desktop/unstable/glib2.0/debian/patches/17_check_abis_mips_symbols.patch
      - copied unchanged from r37631, desktop/experimental/glib2.0/debian/patches/17_check_abis_mips_symbols.patch
    desktop/unstable/glib2.0/debian/tests/
      - copied from r37631, desktop/experimental/glib2.0/debian/tests/
Removed:
    desktop/unstable/glib2.0/debian/patches/03_revert_git_single_include_error.patch
    desktop/unstable/glib2.0/debian/patches/10_gdbus_race.patch
    desktop/unstable/glib2.0/debian/patches/11_CVE-2012-3524_setuid.patch
    desktop/unstable/glib2.0/debian/patches/20_glib-compile-resources_leak.patch
    desktop/unstable/glib2.0/debian/patches/91_revert_schema_path_warning.patch
    desktop/unstable/glib2.0/debian/patches/92_kfreebsd_credentials.patch
Modified:
    desktop/unstable/glib2.0/   (props changed)
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/control
    desktop/unstable/glib2.0/debian/control.in
    desktop/unstable/glib2.0/debian/libglib2.0-0.lintian-overrides
    desktop/unstable/glib2.0/debian/libglib2.0-0.symbols
    desktop/unstable/glib2.0/debian/libglib2.0-bin.maintscript
    desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in
    desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch
    desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch
    desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch
    desktop/unstable/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch
    desktop/unstable/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch
    desktop/unstable/glib2.0/debian/patches/series
    desktop/unstable/glib2.0/debian/rules
    desktop/unstable/glib2.0/debian/watch

Propchange: desktop/unstable/glib2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  8 04:24:00 2013
@@ -1,1 +1,2 @@
+/desktop/experimental/glib2.0:34881-37631
 /desktop/unstable/glib2.0:24636,27515-27547

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Wed May  8 04:24:00 2013
@@ -1,3 +1,413 @@
+glib2.0 (2.36.1-2) UNRELEASED; urgency=low
+
+  * Merge experimental branch, upload to unstable.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 08 May 2013 06:18:22 +0200
+
+glib2.0 (2.36.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Refresh debian/patches/06_thread_test_ignore_prctl_fail.patch 
+
+ -- Iain Lane <laney at debian.org>  Tue, 23 Apr 2013 10:20:47 +0100
+
+glib2.0 (2.36.0-2) experimental; urgency=low
+
+  * debian/rules:
+    + Don't abort the build if the test suite fails on mipsel.
+  * debian/patches/17_check_abis_mips_symbols.patch:
+    + Also allow _ftext in libgthread.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 28 Mar 2013 12:44:06 +0100
+
+glib2.0 (2.36.0-1) experimental; urgency=low
+
+  * New upstream release.
+    + debian/libglib2.0-0.symbols:
+      - Updated.
+  * debian/rules:
+    + Make the test suite fatal in armel and armhf.
+  * debian/patches/17_check_abis_mips_symbols.patch:
+    + Add _ftext to the list of allowed symbols, since that
+      is leaked on mips.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 26 Mar 2013 11:14:37 +0100
+
+glib2.0 (2.35.9-2) experimental; urgency=low
+
+  * d/p/11_kfreebsd_pthread_condattr_setclock_prototype.patch:
+    + Another patch to fix the build on kfreebsd. Add a prototype
+      for pthread_condattr_setclock() when building on kfreebsd
+      since the prototype there is missing. The glibc bug to add
+      the missing prototype is #703545, we can remove this hack
+      when that is fixed.
+  * debian/patches/13_sparc_prlimit_prototype.patch:
+    + New patch, only use prlimit if the prototype is available.
+      Should fix the build on sparc where prlimit is available but
+      the prototype is missing. Thanks to Julien Cristau for the
+      patch. This works-around #703559 and can be removed when that
+      bug is fixed.
+  * debian/patches/15_gio_desktop_app_info_test_bin_true_path.patch:
+    + Change path for 'true' to /bin/true as that's where it is in
+      Debian. This fixes a testcase that was failing on every arch
+      and was causing the build to fail on ia64 and powerpc as test
+      failures are fatal on those arches.
+  * debian/rules:
+    + Use filter instead of findstring to match the current arch
+      against the list of architectures where the test suite should
+      not be fatal, as the latter matches substrings and so it was
+      making the testsuite non-fatal on amd64 and i386 because they
+      match kfreebsd-amd64 and kfreebsd-i386.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Thu, 21 Mar 2013 16:24:45 +0100
+
+glib2.0 (2.35.9-1) experimental; urgency=low
+
+  * debian/control.in:
+    + Break python-gi (<< 3.7.2). Closes: #702603.
+  * New upstream release.
+    + debian/patches/04_homedir_env.patch:
+      - Updated to apply again.
+  * debian/rules:
+    + Set HOME instead G_HOME, as GLib now honors the former. We will
+      eventually remove our local patch to support G_HOME, so packages
+      that need to override the home directory for the test suite should
+      switch to overriding HOME.
+  * debian/libglib2.0-0.symbols:
+    + Bump minimum version for g_get_home_dir() so that users that need
+      HOME to be honored get a proper runtime dependency.
+  * debian/patches/10_kfreebsd_issetugid_prototype.patch:
+    + Untested patch to fix the build on kfreebsd.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Tue, 19 Mar 2013 13:58:27 +0100
+
+glib2.0 (2.35.8-1) experimental; urgency=low
+
+  [ Matthias Klose ]
+  * Configure cross builds with --disable-modular-tests --disable-gtk-doc.
+
+  [ Iain Lane ]
+  * Merges from unstable branch (Michael Biebl)
+    - Take into account multiarch when removing the cache files in postrm:
+      Remove /usr/lib/gio/modules/giomodule.cache only for the native
+      architecture for which this cache file was created.
+      After removing /usr/share/glib-2.0/schemas/gschemas.compiled on purge,
+      run dpkg-trigger explicitly, so in case libglib2.0-0 is installed for
+      other architectures, the cache file is re-created. (Closes: #696389)
+    - Drop the various Breaks from libglib2.0-0. Those are causing APT to
+      fail on a dist-upgrade from squeeze to wheezy. (Closes: #676485)
+  * 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 
+
+  [ Martin Pitt ]
+  * New upstream release 2.35.4
+  * debian/libglib2.0-0.symbols: Update for new upstream release.
+  * Drop 08_disable_gapplication_basic_test.patch, test is now more robust.
+  * Drop 92_revert_appinfo_command_line.patch and add xterm build dependency;
+    xterm is rather lightweight in terms of dependencies and is sufficient to
+    run all the "Terminal=true" tests.
+  * Add 08_fix_closure_invalidation.patch: gsignal: fix closure invalidation
+    code. (GNOME #690118)
+
+  [ Emilio Pozuelo Monfort ]
+  * New upstream release 2.35.8.
+    + debian/patches/08_fix_closure_invalidation.patch:
+      - Removed, applied upstream.
+    + debian/patches/*:
+      - Refreshed.
+    + debian/libglib2.0-0.symbols:
+      - Updated for the new symbols.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 23 Feb 2013 19:27:38 +0100
+
+glib2.0 (2.34.3-1) experimental; urgency=low
+
+  * New upstream release.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 28 Nov 2012 14:38:35 +0100
+
+glib2.0 (2.34.2-1) experimental; urgency=low
+
+  * Team upload
+
+  [ Martin Pitt ]
+  * debian/rules: Re-enable failing the build on failed tests on armel/armhf
+    on Ubuntu, now that the buildds behave themselves again.
+
+  [ Simon McVittie ]
+  * New upstream release
+    - 50_git_gmenuexporter_allow_null_bus_on_name_vanished.patch: remove,
+      applied upstream
+    - 91_kfreebsd_credentials.patch: remove, applied upstream
+  * Override a couple of package-contains-empty-directory lintian tags
+    for deliberate empty directories
+  * Override package-contains-devhelp-file-without-symlink lintian tag
+    for gdbus-object-manager-example, which is deliberately not in devhelp
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 12 Nov 2012 16:08:29 +0000
+
+glib2.0 (2.34.1-2) experimental; urgency=low
+
+  * Team upload
+  * Apply patch from unstable to use the FreeBSD credentials-passing code
+    path on kFreeBSD too, fixing (at least) gnome-terminal and lightdm on
+    kFreeBSD (Closes: #581750, #631968)
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 31 Oct 2012 12:56:54 +0000
+
+glib2.0 (2.34.1-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * Require libelfg0-dev, not libelf-dev which has nothing to do with 
+    it.
+
+  [ Iain Lane ]
+  * New upstream release
+    + GTimeZone support for zoneinfo version 1
+    + 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. 
+  * 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)
+
+ -- Iain Lane <laney at debian.org>  Wed, 17 Oct 2012 11:51:14 +0100
+
+glib2.0 (2.34.0-1) experimental; urgency=low
+
+  [ Martin Pitt ]
+  * debian/rules: Only run tests for the main flavour; it takes too
+    long for all three and does not give us a lot of extra confidence.
+  * debian/rules: Manually create debian/stamp-makefile-check, as with above
+    change it's not created automatically any more.
+  * Add 07_disable_tests_on_slow_archs.patch: Disable tests on slow
+    architectures which keep failing the tests. These are currently
+    /socket/timed_wait, /mainloop/timeouts, /mainloop/child_sources,
+    /timeout/rounding, and the upper bound on /gdbus/method-calls-in-thread on
+    ARM platforms.
+  * debian/control.in: Bump pcre dependency to >= 1:8.31.
+  * debian/rules: Seems there is no way of making the test suite work reliably
+    with the upgraded Ubuntu ARM builders, so make tests non-fatal on
+    arm{el,hf} until they get less swap happy.
+
+  [ Michael Biebl ]
+  * New upstream release.
+  * Drop debian/patches/91_revert_pcre_8.31_test.patch now that we have a
+    recent enough version.
+
+ -- Martin Pitt <mpitt at debian.org>  Thu, 27 Sep 2012 11:22:56 +0200
+
+glib2.0 (2.33.14-1) experimental; urgency=low
+
+  [ Iain Lane ]
+  * New upstream release
+    + CVE-2012-3524: don't run dbus-launch from setuid binaries
+    + g_content_type_get_generic_icon_name(): new API for getting the icon
+      name for a mime type
+    + Introspection fixes:
+      - GDBusConnection nullability fixes
+      - give a box type to GTimeZone
+    + Drop GVFS_INOTIFY_DIAG
+    + Add a new "Writing GLib Applications" section to the reference
+      documentation with general info on security, threads, etc.
+    + gwin32mount.c: Fix syntax error
+    + 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. 
+
+  [ Michael Biebl ]
+  * Bump all 2.33.x symbol versions to 2.33.14 to ensure a tight enough
+    dependency for packages using features from glib 2.33.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 19 Sep 2012 18:38:24 +0200
+
+glib2.0 (2.33.12-4) experimental; urgency=low
+
+  * debian/patches/03_disble_glib_compile_schemas_warning.patch: Add a new
+    patch to 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.
+
+ -- Iain Lane <laney at debian.org>  Mon, 10 Sep 2012 16:25:18 +0100
+
+glib2.0 (2.33.12-3) experimental; urgency=low
+
+  * debian/control.in: Add Breaks: too glib-networking versions prior to
+    2.33.12. (LP: #1046319)
+  * debian/rules: Ignore test case failures on hurd-i386 (not a release
+    architecture) and mips (this keeps tripping over a gdbus test race
+    condition).
+  * Replace 07_disable_gvariant_checksum_tests.patch with
+    07_tests_gvariant_big_endian.patch which fixes the test properly instead
+    of disabling it. Taken from
+    https://bugzilla.gnome.org/show_bug.cgi?id=683384
+
+ -- Martin Pitt <mpitt at debian.org>  Thu, 06 Sep 2012 06:14:41 +0200
+
+glib2.0 (2.33.12-2) experimental; urgency=low
+
+  * Drop 10_increase_gapplication_test_delay.patch. We disable the whole test
+    now anyway (08_disable_gapplication_basic_test.patch).
+  * Add 07_disable_gvariant_checksum_tests.patch: 2.33.12 introduced two new
+    checks for GVariant checksum stability. This does not currently work on
+    big-endian machines (https://bugzilla.gnome.org/show_bug.cgi?id=683384),
+    so disable these tests for now.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 05 Sep 2012 11:19:29 +0200
+
+glib2.0 (2.33.12-1) experimental; urgency=low
+
+  [ Sebastien Bacher ]
+  * New upstream version
+  * debian/libglib2.0-0.symbols:
+    - updated
+  * revert_g_file_make_directory_with_parents_error_propagation.patch:
+    - dropped, the issue is fixed in the new version
+  * debian/patches/92_revert_appinfo_command_line.patch:
+    - don't require a vte for test, we don't want an xorg stack there
+
+  [ Iain Lane ]
+  * Add revert_g_file_make_directory_with_parents_error_propagation.patch:
+    This reverts upstream commit b0bce4ad41937dabf7e5c94dcce3caf4e88f3f97
+    which caused applications to segfault. The proper fix will be in the next
+    glib release, so this patch should be dropped then. (LP: #1035688)
+
+  [ Martin Pitt ]
+  * Add 07_test_method_calls_on_proxy_bump_max_time.patch: On slower
+    platforms, the overhead of the 240 D-BUS Sleep calls is larger than
+    the current maximum of 6 seconds. Bump maximum time to 8 seconds to be
+    more resilient to this.
+  * Add 08_disable_gapplication_basic_test.patch: Disable /gapplication/basic
+    test. It's full of race conditions and keeps breaking builds.
+
+  [ Robert Ancell ]
+  * New upstream bugfix release (LP: #1045608)
+  * Drop 07_test_method_calls_on_proxy_bump_max_time.patch:
+    - Applied upstream
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 04 Sep 2012 15:50:40 +0200
+
+glib2.0 (2.33.8-1) experimental; urgency=low
+
+  * New upstream release 2.33.8.
+    - GIO now has a g_file_delete_async function
+    - The defaults for GThreadPools max_unused_threads and max_idle_time
+      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. 
+
+ -- Iain Lane <laney at debian.org>  Tue, 07 Aug 2012 14:38:25 +0100
+
+glib2.0 (2.33.6-1) experimental; urgency=low
+
+  * New upstream release.
+  * Drop 91_revert_schema_path_warning.patch now, we are not in final freeze
+    in Ubuntu, and this is not aimed at Debian Wheezy.
+  * Add 91_revert_pcre_8.31_test.patch: Revert new regex test from 2.33.4
+    which depends on pcre 8.31. We still have 8.30, and we are building
+    against the system library instead of the bundled one.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 18 Jul 2012 14:41:39 +0200
+
+glib2.0 (2.33.4-1) experimental; urgency=low
+
+  [ Martin Pitt ]
+  * debian/rules: Make tests always fatal on Ubuntu.
+
+  [ Iain Lane ]
+  * New upstream release 2.33.4.
+  * Refresh patches to apply cleanly and remove those applied upstream.
+  * Bump version on libpcre-dev BD in line with upstream.
+  * debian/libglib2.0-0.symbols: Add new symbols in this release.
+
+ -- Iain Lane <laney at debian.org>  Mon, 16 Jul 2012 11:55:30 +0100
+
+glib2.0 (2.33.3-2) experimental; urgency=low
+
+  * Rename 07_socket_test_timespan_jitter.patch to 00git_* and update
+    changelog with what got committed upstream.
+  * Add 07_contenttype_test_fix_overflow.patch: Call g_content_type_guess()
+    with valid data len. Fixes a segfault when running the test.
+    Forwarded to GNOME #674452.
+  * Add 08_contenttype_known_test_failure.patch: Disable known test failure
+    due to a bug in g_content_type_from_mime_type(). For details, see
+    https://bugzilla.gnome.org/show_bug.cgi?id=678941
+  * Add 09_valuetransform_ulong_bool.patch: valuetransform: Fix definition of
+    ulong_bool. Thanks Philipp Kern! (Closes: #662057)
+  * Add 10_increase_gapplication_test_delay.patch: /gapplication/basic
+    sometimes fails due to a different order of expected and actual actions;
+    increase delay between them to reduce the race condition. Workaround for
+    https://bugzilla.gnome.org/show_bug.cgi?id=664627
+  * Add 11_timeout_test_reduce_race.patch: Due to load, particular traits of
+    the architecture, or other circumstances, the /mainloop/timeouts sometimes
+    manages to call the "every 100 ms" timer loop only 9 times in 1050 ms.
+    This is an inherent race-condition in the test; allow it some slack and
+    accept 9 times as well. Forwarded to GNOME #678959.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 27 Jun 2012 11:50:54 +0200
+
+glib2.0 (2.33.3-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/libglib2.0-0.symbols: Add new symbols from this release.
+  * debian/libglib2.0-bin.install: bash completion is now installed into
+    /usr/share/bash-completion/completions/ by upstream.
+  * Add debian/libglib2.0-bin.maintscript: Clean up old bash completion
+    conffiles on upgrade. Add ${misc:Pre-Depends} to libglib2.0-bin.
+  * Add debian/tests/control: DEP-8 autopkgtest control file. Add XS-Testsuite
+    header to debian/control.in.
+  * Add debian/tests/build: autopkgtest check: Build and run a program against
+    glib, to verify that the headers and pkg-config file are installed
+    correctly.
+  * Add 06_thread_test_ignore_prctl_fail.patch: Do not fail the
+    /thread/thread4 test if prctrl() fails. This happens on the Debian
+    buildds.
+  * debian/rules: Set G_HOME to not clutter $HOME with ~/.dbus-keyrings and
+    avoid failure on the buildds where creating /home/buildd/.dbus-keyrings
+    fails.
+  * debian/rules: Fail the build on failed tests, except on architectures with
+    known current failures (arm*, kfreebsd*, s390x, sparc).
+  * Add 07_socket_test_timespan_jitter.patch:  On some buildds the poll
+    duration in the /socket/timed_wait test is slightly lower than the
+    requested 100000. Adjust test to not fail in these cases. Forwarded to
+    GNOME #678881.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 26 Jun 2012 19:28:14 +0200
+
+glib2.0 (2.33.2-1) experimental; urgency=low
+
+  * 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
+    - GApplication now has hooks to register D-Bus objects before the bus name
+      is taken
+  * Refresh 04_homedir_env.patch to cleanly apply
+  * Add the new symbols from this release (g_app_info_get_supported_types,
+    g_*_bytes, g_type_ensure)
+
+ -- Iain Lane <laney at debian.org>  Mon, 18 Jun 2012 11:56:08 +0100
+
+glib2.0 (2.33.1-1) experimental; urgency=low
+
+  * debian/control.in: Update Vcs-* for experimental branch.
+  * Drop 03_revert_git_single_include_error.patch. For GNOME 3.5.x we want to
+    properly fix the reverse dependencies. NB this is NOT for Debian wheezy.
+  * New upstream release.
+  * 04_homedir_env.patch: Adjust for new release.
+  * Drop 95_configure-Fix-typo-in-ELF-check.patch and
+    96_configure-Reset-LIBS-after-ELF-check.patch: upstream now.
+  * debian/libglib2.0-0.symbols: Add new symbols from this release.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 15 May 2012 16:59:15 +0200
+
 glib2.0 (2.33.12+really2.32.4-5) unstable; urgency=low
 
   * Fix the closing fi in the if statement in postrm.

Modified: desktop/unstable/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/control [utf-8] Wed May  8 04:24:00 2013
@@ -2,7 +2,7 @@
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>
 Build-Depends: debhelper (>= 8.1.3),
                cdbs (>= 0.4.93),
                dh-autoreconf,
@@ -11,8 +11,8 @@
                autotools-dev,
                gnome-pkg-tools (>= 0.11),
                dpkg-dev (>= 1.16.0),
-               libelf-dev,
-               libpcre3-dev (>= 8.11),
+               libelfg0-dev (>= 0.8.12),
+               libpcre3-dev (>= 1:8.31),
                desktop-file-utils,
                gtk-doc-tools (>= 1.15),
                libselinux1-dev [linux-any],
@@ -22,15 +22,17 @@
                dbus,
                dbus-x11,
                shared-mime-info,
+               xterm,
                python (>= 2.5),
                python-dbus,
-               python-gobject-2,
+               python-gi,
                libxml2-utils,
                libffi-dev (>= 3.0.0)
 Standards-Version: 3.9.3
 Homepage: http://www.gtk.org/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glib2.0/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/glib2.0/
+XS-Testsuite: autopkgtest
 
 Package: libglib2.0-0
 Architecture: any
@@ -38,7 +40,9 @@
          ${shlibs:Depends}
 Recommends: libglib2.0-data,
             shared-mime-info
-Breaks: gvfs (<< 1.8)
+Breaks: gvfs (<< 1.8),
+        glib-networking (<< 2.33.12),
+        python-gi (<< 3.7.2)
 Replaces: libglib2.0-dev (<< 2.23.2-2)
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -51,7 +55,7 @@
 
 Package: libglib2.0-udeb
 Section: debian-installer
-XC-Package-Type: udeb
+Package-Type: udeb
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -68,11 +72,11 @@
 Package: libglib2.0-bin
 Section: misc
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libglib2.0-0 (= ${binary:Version}),
          libglib2.0-data
-Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libglib2.0-0 (<< 2.25.11-2),
 Replaces: libglib2.0-0 (<< 2.25.11-2),
           libglib2.0-dev (<< 2.25.11-2)
@@ -92,7 +96,7 @@
          ${shlibs:Depends},
          libglib2.0-0 (= ${binary:Version}),
          libglib2.0-bin (= ${binary:Version}),
-         libpcre3-dev (>= 8.11),
+         libpcre3-dev (>= 1:8.31),
          pkg-config (>= 0.16.0),
          zlib1g-dev
 Recommends: python

Modified: desktop/unstable/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/control.in?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/control.in [utf-8] Wed May  8 04:24:00 2013
@@ -11,8 +11,8 @@
                autotools-dev,
                gnome-pkg-tools (>= 0.11),
                dpkg-dev (>= 1.16.0),
-               libelf-dev,
-               libpcre3-dev (>= 8.11),
+               libelfg0-dev (>= 0.8.12),
+               libpcre3-dev (>= 1:8.31),
                desktop-file-utils,
                gtk-doc-tools (>= 1.15),
                libselinux1-dev [linux-any],
@@ -22,15 +22,17 @@
                dbus,
                dbus-x11,
                shared-mime-info,
+               xterm,
                python (>= 2.5),
                python-dbus,
-               python-gobject-2,
+               python-gi,
                libxml2-utils,
                libffi-dev (>= 3.0.0)
 Standards-Version: 3.9.3
 Homepage: http://www.gtk.org/
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/unstable/glib2.0/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/desktop/experimental/glib2.0/
+XS-Testsuite: autopkgtest
 
 Package: @SHARED_PKG@
 Architecture: any
@@ -38,7 +40,9 @@
          ${shlibs:Depends}
 Recommends: @DATA_PKG@,
             shared-mime-info
-Breaks: gvfs (<< 1.8)
+Breaks: gvfs (<< 1.8),
+        glib-networking (<< 2.33.12),
+        python-gi (<< 3.7.2)
 Replaces: @DEV_PKG@ (<< 2.23.2-2)
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -51,7 +55,7 @@
 
 Package: libglib at APIVER@-udeb
 Section: debian-installer
-XC-Package-Type: udeb
+Package-Type: udeb
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends}
@@ -68,11 +72,11 @@
 Package: @BIN_PKG@
 Section: misc
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          @SHARED_PKG@ (= ${binary:Version}),
          @DATA_PKG@
-Pre-Depends: ${misc:Pre-Depends}
 Conflicts: @SHARED_PKG@ (<< 2.25.11-2),
 Replaces: @SHARED_PKG@ (<< 2.25.11-2),
           @DEV_PKG@ (<< 2.25.11-2)
@@ -92,7 +96,7 @@
          ${shlibs:Depends},
          @SHARED_PKG@ (= ${binary:Version}),
          @BIN_PKG@ (= ${binary:Version}),
-         libpcre3-dev (>= 8.11),
+         libpcre3-dev (>= 1:8.31),
          pkg-config (>= 0.16.0),
          zlib1g-dev
 Recommends: python

Modified: desktop/unstable/glib2.0/debian/libglib2.0-0.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0.lintian-overrides?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.lintian-overrides [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.lintian-overrides [utf-8] Wed May  8 04:24:00 2013
@@ -1,2 +1,5 @@
 # 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.
+libglib2.0-0: package-contains-empty-directory usr/lib/x86_64-linux-gnu/gio/modules/
+libglib2.0-0: package-contains-empty-directory usr/share/glib-2.0/schemas/

Modified: desktop/unstable/glib2.0/debian/libglib2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-0.symbols?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-0.symbols [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-0.symbols [utf-8] Wed May  8 04:24:00 2013
@@ -50,6 +50,7 @@
  g_app_info_get_id at Base 2.16.0
  g_app_info_get_name at Base 2.16.0
  g_app_info_get_recommended_for_type at Base 2.28.0
+ g_app_info_get_supported_types at Base 2.33.14
  g_app_info_get_type at Base 2.16.0
  g_app_info_launch at Base 2.16.0
  g_app_info_launch_default_for_uri at Base 2.16.0
@@ -71,12 +72,14 @@
  g_app_launch_context_setenv at Base 2.31.8
  g_app_launch_context_unsetenv at Base 2.31.8
  g_application_activate at Base 2.28.0
+ g_application_command_line_create_file_for_arg at Base 2.35.8
  g_application_command_line_get_arguments at Base 2.28.0
  g_application_command_line_get_cwd at Base 2.28.0
  g_application_command_line_get_environ at Base 2.28.0
  g_application_command_line_get_exit_status at Base 2.28.0
  g_application_command_line_get_is_remote at Base 2.28.0
  g_application_command_line_get_platform_data at Base 2.28.0
+ g_application_command_line_get_stdin at Base 2.35.8
  g_application_command_line_get_type at Base 2.28.0
  g_application_command_line_getenv at Base 2.28.0
  g_application_command_line_print at Base 2.28.0
@@ -84,6 +87,8 @@
  g_application_command_line_set_exit_status at Base 2.28.0
  g_application_flags_get_type at Base 2.28.0
  g_application_get_application_id at Base 2.28.0
+ g_application_get_dbus_connection at Base 2.33.14
+ g_application_get_dbus_object_path at Base 2.33.14
  g_application_get_default at Base 2.31.8
  g_application_get_flags at Base 2.28.0
  g_application_get_inactivity_timeout at Base 2.28.0
@@ -114,6 +119,8 @@
  g_async_result_get_source_object at Base 2.16.0
  g_async_result_get_type at Base 2.16.0
  g_async_result_get_user_data at Base 2.16.0
+ g_async_result_is_tagged at Base 2.33.14
+ g_async_result_legacy_propagate_error at Base 2.33.14
  g_buffered_input_stream_fill at Base 2.16.0
  g_buffered_input_stream_fill_async at Base 2.16.0
  g_buffered_input_stream_fill_finish at Base 2.16.0
@@ -173,8 +180,10 @@
  g_content_type_equals at Base 2.16.0
  g_content_type_from_mime_type at Base 2.18.0
  g_content_type_get_description at Base 2.16.0
+ g_content_type_get_generic_icon_name at Base 2.33.14
  g_content_type_get_icon at Base 2.16.0
  g_content_type_get_mime_type at Base 2.16.0
+ g_content_type_get_symbolic_icon at Base 2.33.14
  g_content_type_guess at Base 2.16.0
  g_content_type_guess_for_tree at Base 2.18.0
  g_content_type_is_a at Base 2.16.0
@@ -193,6 +202,7 @@
  g_converter_result_get_type at Base 2.24.0
  g_credentials_get_native at Base 2.26.0
  g_credentials_get_type at Base 2.26.0
+ g_credentials_get_unix_pid at Base 2.35.8
  g_credentials_get_unix_user at Base 2.26.0
  g_credentials_is_same_user at Base 2.26.0
  g_credentials_new at Base 2.26.0
@@ -240,6 +250,7 @@
  g_data_stream_newline_type_get_type at Base 2.16.0
  g_dbus_action_group_get at Base 2.31.8
  g_dbus_action_group_get_type at Base 2.31.8
+ g_dbus_address_escape_value at Base 2.35.8
  g_dbus_address_get_for_bus_sync at Base 2.26.0
  g_dbus_address_get_stream at Base 2.26.0
  g_dbus_address_get_stream_finish at Base 2.26.0
@@ -251,6 +262,7 @@
  g_dbus_arg_info_get_type at Base 2.26.0
  g_dbus_arg_info_ref at Base 2.26.0
  g_dbus_arg_info_unref at Base 2.26.0
+ g_dbus_auth_observer_allow_mechanism at Base 2.33.14
  g_dbus_auth_observer_authorize_authenticated_peer at Base 2.26.0
  g_dbus_auth_observer_get_type at Base 2.26.0
  g_dbus_auth_observer_new at Base 2.26.0
@@ -276,6 +288,7 @@
  g_dbus_connection_get_capabilities at Base 2.26.0
  g_dbus_connection_get_exit_on_close at Base 2.26.0
  g_dbus_connection_get_guid at Base 2.26.0
+ g_dbus_connection_get_last_serial at Base 2.33.14
  g_dbus_connection_get_peer_credentials at Base 2.26.0
  g_dbus_connection_get_stream at Base 2.26.0
  g_dbus_connection_get_type at Base 2.26.0
@@ -461,6 +474,7 @@
  g_dbus_object_manager_server_export_uniquely at Base 2.30.0
  g_dbus_object_manager_server_get_connection at Base 2.30.0
  g_dbus_object_manager_server_get_type at Base 2.30.0
+ g_dbus_object_manager_server_is_exported at Base 2.33.14
  g_dbus_object_manager_server_new at Base 2.30.0
  g_dbus_object_manager_server_set_connection at Base 2.30.0
  g_dbus_object_manager_server_unexport at Base 2.30.0
@@ -520,6 +534,7 @@
  g_dbus_signal_info_ref at Base 2.26.0
  g_dbus_signal_info_unref at Base 2.26.0
  g_dbus_subtree_flags_get_type at Base 2.26.0
+ g_desktop_app_info_get_boolean at Base 2.35.8
  g_desktop_app_info_get_categories at Base 2.30.0
  g_desktop_app_info_get_filename at Base 2.24.0
  g_desktop_app_info_get_generic_name at Base 2.30.0
@@ -527,7 +542,10 @@
  g_desktop_app_info_get_keywords at Base 2.31.8
  g_desktop_app_info_get_nodisplay at Base 2.30.0
  g_desktop_app_info_get_show_in at Base 2.30.0
+ g_desktop_app_info_get_startup_wm_class at Base 2.33.14
+ g_desktop_app_info_get_string at Base 2.35.8
  g_desktop_app_info_get_type at Base 2.16.0
+ g_desktop_app_info_has_key at Base 2.35.8
  g_desktop_app_info_launch_uris_as_manager at Base 2.28.0
  g_desktop_app_info_lookup_get_default_for_uri_scheme at Base 2.28.0
  g_desktop_app_info_lookup_get_type at Base 2.28.0
@@ -550,6 +568,7 @@
  g_drive_get_name at Base 2.16.0
  g_drive_get_sort_key at Base 2.31.8
  g_drive_get_start_stop_type at Base 2.22.0
+ g_drive_get_symbolic_icon at Base 2.33.14
  g_drive_get_type at Base 2.16.0
  g_drive_get_volumes at Base 2.16.0
  g_drive_has_media at Base 2.16.0
@@ -612,6 +631,8 @@
  g_file_create_readwrite_async at Base 2.22.0
  g_file_create_readwrite_finish at Base 2.22.0
  g_file_delete at Base 2.16.0
+ g_file_delete_async at Base 2.33.14
+ g_file_delete_finish at Base 2.33.14
  g_file_descriptor_based_get_fd at Base 2.24.0
  g_file_descriptor_based_get_type at Base 2.24.0
  g_file_dup at Base 2.16.0
@@ -625,6 +646,7 @@
  g_file_enumerator_close at Base 2.16.0
  g_file_enumerator_close_async at Base 2.16.0
  g_file_enumerator_close_finish at Base 2.16.0
+ g_file_enumerator_get_child at Base 2.35.8
  g_file_enumerator_get_container at Base 2.18.0
  g_file_enumerator_get_type at Base 2.16.0
  g_file_enumerator_has_pending at Base 2.16.0
@@ -671,6 +693,7 @@
  g_file_info_get_attribute_uint32 at Base 2.16.0
  g_file_info_get_attribute_uint64 at Base 2.16.0
  g_file_info_get_content_type at Base 2.16.0
+ g_file_info_get_deletion_date at Base 2.35.8
  g_file_info_get_display_name at Base 2.16.0
  g_file_info_get_edit_name at Base 2.16.0
  g_file_info_get_etag at Base 2.16.0
@@ -683,6 +706,7 @@
  g_file_info_get_name at Base 2.16.0
  g_file_info_get_size at Base 2.16.0
  g_file_info_get_sort_order at Base 2.16.0
+ g_file_info_get_symbolic_icon at Base 2.33.14
  g_file_info_get_symlink_target at Base 2.16.0
  g_file_info_get_type at Base 2.16.0
  g_file_info_has_attribute at Base 2.16.0
@@ -713,6 +737,7 @@
  g_file_info_set_name at Base 2.16.0
  g_file_info_set_size at Base 2.16.0
  g_file_info_set_sort_order at Base 2.16.0
+ g_file_info_set_symbolic_icon at Base 2.33.14
  g_file_info_set_symlink_target at Base 2.16.0
  g_file_info_unset_attribute_mask at Base 2.16.0
  g_file_input_stream_get_type at Base 2.16.0
@@ -749,6 +774,7 @@
  g_file_mount_mountable_finish at Base 2.16.0
  g_file_move at Base 2.16.0
  g_file_new_for_commandline_arg at Base 2.16.0
+ g_file_new_for_commandline_arg_and_cwd at Base 2.35.8
  g_file_new_for_path at Base 2.16.0
  g_file_new_for_uri at Base 2.16.0
  g_file_new_tmp at Base 2.31.8
@@ -881,6 +907,9 @@
  g_input_stream_read at Base 2.16.0
  g_input_stream_read_all at Base 2.16.0
  g_input_stream_read_async at Base 2.16.0
+ g_input_stream_read_bytes at Base 2.33.14
+ g_input_stream_read_bytes_async at Base 2.33.14
+ g_input_stream_read_bytes_finish at Base 2.33.14
  g_input_stream_read_finish at Base 2.16.0
  g_input_stream_set_pending at Base 2.16.0
  g_input_stream_skip at Base 2.16.0
@@ -934,22 +963,25 @@
  g_loadable_icon_load_finish at Base 2.16.0
  g_local_directory_monitor_get_type at Base 2.16.0
  g_local_file_monitor_get_type at Base 2.16.0
+ g_memory_input_stream_add_bytes at Base 2.33.14
  g_memory_input_stream_add_data at Base 2.16.0
  g_memory_input_stream_get_type at Base 2.16.0
  g_memory_input_stream_new at Base 2.16.0
+ g_memory_input_stream_new_from_bytes at Base 2.33.14
  g_memory_input_stream_new_from_data at Base 2.16.0
  g_memory_output_stream_get_data at Base 2.16.0
  g_memory_output_stream_get_data_size at Base 2.18.0
  g_memory_output_stream_get_size at Base 2.16.0
  g_memory_output_stream_get_type at Base 2.16.0
  g_memory_output_stream_new at Base 2.16.0
+ g_memory_output_stream_new_resizable at Base 2.35.8
+ g_memory_output_stream_steal_as_bytes at Base 2.33.14
  g_memory_output_stream_steal_data at Base 2.26.0
  g_memory_settings_backend_new at Base 2.28.0
  g_menu_append at Base 2.31.8
  g_menu_append_item at Base 2.31.8
  g_menu_append_section at Base 2.31.8
  g_menu_append_submenu at Base 2.31.8
- g_menu_attribute_hash_iter_get_type at Base 2.31.8
  g_menu_attribute_iter_get_name at Base 2.31.8
  g_menu_attribute_iter_get_next at Base 2.31.8
  g_menu_attribute_iter_get_type at Base 2.31.8
@@ -961,8 +993,12 @@
  g_menu_insert_item at Base 2.31.8
  g_menu_insert_section at Base 2.31.8
  g_menu_insert_submenu at Base 2.31.8
+ g_menu_item_get_attribute at Base 2.33.14
+ g_menu_item_get_attribute_value at Base 2.33.14
+ g_menu_item_get_link at Base 2.33.14
  g_menu_item_get_type at Base 2.31.8
  g_menu_item_new at Base 2.31.8
+ g_menu_item_new_from_model at Base 2.33.14
  g_menu_item_new_section at Base 2.31.8
  g_menu_item_new_submenu at Base 2.31.8
  g_menu_item_set_action_and_target at Base 2.31.8
@@ -974,7 +1010,6 @@
  g_menu_item_set_link at Base 2.31.8
  g_menu_item_set_section at Base 2.31.8
  g_menu_item_set_submenu at Base 2.31.8
- g_menu_link_hash_iter_get_type at Base 2.31.8
  g_menu_link_iter_get_name at Base 2.31.8
  g_menu_link_iter_get_next at Base 2.31.8
  g_menu_link_iter_get_type at Base 2.31.8
@@ -987,7 +1022,6 @@
  g_menu_model_get_type at Base 2.31.8
  g_menu_model_is_mutable at Base 2.31.8
  g_menu_model_items_changed at Base 2.31.8
- g_menu_model_items_changed_signal at Base 2.31.8
  g_menu_model_iterate_item_attributes at Base 2.31.8
  g_menu_model_iterate_item_links at Base 2.31.8
  g_menu_new at Base 2.31.8
@@ -1008,6 +1042,7 @@
  g_mount_get_name at Base 2.16.0
  g_mount_get_root at Base 2.16.0
  g_mount_get_sort_key at Base 2.31.8
+ g_mount_get_symbolic_icon at Base 2.33.14
  g_mount_get_type at Base 2.16.0
  g_mount_get_uuid at Base 2.16.0
  g_mount_get_volume at Base 2.16.0
@@ -1066,6 +1101,7 @@
  g_network_service_get_type at Base 2.22.0
  g_network_service_new at Base 2.22.0
  g_network_service_set_scheme at Base 2.26.0
+ g_networking_init at Base 2.35.8
  g_null_settings_backend_new at Base 2.28.0
  g_output_stream_clear_pending at Base 2.16.0
  g_output_stream_close at Base 2.16.0
@@ -1086,6 +1122,9 @@
  g_output_stream_write at Base 2.16.0
  g_output_stream_write_all at Base 2.16.0
  g_output_stream_write_async at Base 2.16.0
+ g_output_stream_write_bytes at Base 2.33.14
+ g_output_stream_write_bytes_async at Base 2.33.14
+ g_output_stream_write_bytes_finish at Base 2.33.14
  g_output_stream_write_finish at Base 2.16.0
  g_password_save_get_type at Base 2.16.0
  g_permission_acquire at Base 2.26.0
@@ -1110,12 +1149,18 @@
  g_pollable_output_stream_is_writable at Base 2.28.0
  g_pollable_output_stream_write_nonblocking at Base 2.28.0
  g_pollable_source_new at Base 2.28.0
+ g_pollable_source_new_full at Base 2.33.14
+ g_pollable_stream_read at Base 2.33.14
+ g_pollable_stream_write at Base 2.33.14
+ g_pollable_stream_write_all at Base 2.33.14
  g_proxy_address_enumerator_get_type at Base 2.26.0
  g_proxy_address_get_destination_hostname at Base 2.26.0
  g_proxy_address_get_destination_port at Base 2.26.0
+ g_proxy_address_get_destination_protocol at Base 2.33.14
  g_proxy_address_get_password at Base 2.26.0
  g_proxy_address_get_protocol at Base 2.26.0
  g_proxy_address_get_type at Base 2.26.0
+ g_proxy_address_get_uri at Base 2.33.14
  g_proxy_address_get_username at Base 2.26.0
  g_proxy_address_new at Base 2.26.0
  g_proxy_connect at Base 2.26.0
@@ -1145,9 +1190,13 @@
  g_resolver_lookup_by_name at Base 2.22.0
  g_resolver_lookup_by_name_async at Base 2.22.0
  g_resolver_lookup_by_name_finish at Base 2.22.0
+ g_resolver_lookup_records at Base 2.33.14
+ g_resolver_lookup_records_async at Base 2.33.14
+ g_resolver_lookup_records_finish at Base 2.33.14
  g_resolver_lookup_service at Base 2.22.0
  g_resolver_lookup_service_async at Base 2.22.0
  g_resolver_lookup_service_finish at Base 2.22.0
+ g_resolver_record_type_get_type at Base 2.33.14
  g_resolver_set_default at Base 2.22.0
  g_resource_enumerate_children at Base 2.31.18
  g_resource_error_get_type at Base 2.31.18
@@ -1280,6 +1329,11 @@
  g_simple_async_result_take_error at Base 2.28.0
  g_simple_permission_get_type at Base 2.26.0
  g_simple_permission_new at Base 2.26.0
+ g_simple_proxy_resolver_get_type at Base 2.35.8
+ g_simple_proxy_resolver_new at Base 2.35.8
+ g_simple_proxy_resolver_set_default_proxy at Base 2.35.8
+ g_simple_proxy_resolver_set_ignore_hosts at Base 2.35.8
+ g_simple_proxy_resolver_set_uri_proxy at Base 2.35.8
  g_socket_accept at Base 2.22.0
  g_socket_address_enumerator_get_type at Base 2.22.0
  g_socket_address_enumerator_next at Base 2.22.0
@@ -1310,6 +1364,7 @@
  g_socket_client_get_family at Base 2.22.0
  g_socket_client_get_local_address at Base 2.22.0
  g_socket_client_get_protocol at Base 2.22.0
+ g_socket_client_get_proxy_resolver at Base 2.35.8
  g_socket_client_get_socket_type at Base 2.22.0
  g_socket_client_get_timeout at Base 2.26.0
  g_socket_client_get_tls at Base 2.28.0
@@ -1320,6 +1375,7 @@
  g_socket_client_set_family at Base 2.22.0
  g_socket_client_set_local_address at Base 2.22.0
  g_socket_client_set_protocol at Base 2.22.0
+ g_socket_client_set_proxy_resolver at Base 2.35.8
  g_socket_client_set_socket_type at Base 2.22.0
  g_socket_client_set_timeout at Base 2.26.0
  g_socket_client_set_tls at Base 2.28.0
@@ -1362,6 +1418,7 @@
  g_socket_get_local_address at Base 2.22.0
  g_socket_get_multicast_loopback at Base 2.31.18
  g_socket_get_multicast_ttl at Base 2.31.18
+ g_socket_get_option at Base 2.35.8
  g_socket_get_protocol at Base 2.22.0
  g_socket_get_remote_address at Base 2.22.0
  g_socket_get_socket_type at Base 2.22.0
@@ -1410,6 +1467,7 @@
  g_socket_set_listen_backlog at Base 2.22.0
  g_socket_set_multicast_loopback at Base 2.31.18
  g_socket_set_multicast_ttl at Base 2.31.18
+ g_socket_set_option at Base 2.35.8
  g_socket_set_timeout at Base 2.26.0
  g_socket_set_ttl at Base 2.31.18
  g_socket_shutdown at Base 2.22.0
@@ -1427,12 +1485,53 @@
  g_static_resource_fini at Base 2.31.18
  g_static_resource_get_resource at Base 2.31.18
  g_static_resource_init at Base 2.31.18
+ g_task_attach_source at Base 2.35.8
+ g_task_get_cancellable at Base 2.35.8
+ g_task_get_check_cancellable at Base 2.35.8
+ g_task_get_context at Base 2.35.8
+ g_task_get_priority at Base 2.35.8
+ g_task_get_return_on_cancel at Base 2.35.8
+ g_task_get_source_object at Base 2.35.8
+ g_task_get_source_tag at Base 2.35.8
+ g_task_get_task_data at Base 2.35.8
+ g_task_get_type at Base 2.35.8
+ g_task_had_error at Base 2.35.8
+ g_task_is_valid at Base 2.35.8
+ g_task_new at Base 2.35.8
+ g_task_propagate_boolean at Base 2.35.8
+ g_task_propagate_int at Base 2.35.8
+ g_task_propagate_pointer at Base 2.35.8
+ g_task_report_error at Base 2.35.8
+ g_task_report_new_error at Base 2.35.8
+ g_task_return_boolean at Base 2.35.8
+ g_task_return_error at Base 2.35.8
+ g_task_return_error_if_cancelled at Base 2.35.8
+ g_task_return_int at Base 2.35.8
+ g_task_return_new_error at Base 2.35.8
+ g_task_return_pointer at Base 2.35.8
+ g_task_run_in_thread at Base 2.35.8
+ g_task_run_in_thread_sync at Base 2.35.8
+ g_task_set_check_cancellable at Base 2.35.8
+ g_task_set_priority at Base 2.35.8
+ g_task_set_return_on_cancel at Base 2.35.8
+ g_task_set_source_tag at Base 2.35.8
+ g_task_set_task_data at Base 2.35.8
  g_tcp_connection_get_graceful_disconnect at Base 2.22.0
  g_tcp_connection_get_type at Base 2.22.0
  g_tcp_connection_set_graceful_disconnect at Base 2.22.0
  g_tcp_wrapper_connection_get_base_io_stream at Base 2.28.0
  g_tcp_wrapper_connection_get_type at Base 2.28.0
  g_tcp_wrapper_connection_new at Base 2.28.0
+ g_test_dbus_add_service_dir at Base 2.33.14
+ g_test_dbus_down at Base 2.33.14
+ g_test_dbus_flags_get_type at Base 2.33.14
+ g_test_dbus_get_bus_address at Base 2.33.14
+ g_test_dbus_get_flags at Base 2.33.14
+ g_test_dbus_get_type at Base 2.33.14
+ g_test_dbus_new at Base 2.33.14
+ g_test_dbus_stop at Base 2.33.14
+ g_test_dbus_unset at Base 2.33.14
+ g_test_dbus_up at Base 2.33.14
  g_themed_icon_append_name at Base 2.16.0
  g_themed_icon_get_names at Base 2.16.0
  g_themed_icon_get_type at Base 2.16.0
@@ -1455,6 +1554,7 @@
  g_tls_certificate_flags_get_type at Base 2.28.0
  g_tls_certificate_get_issuer at Base 2.28.0
  g_tls_certificate_get_type at Base 2.28.0
+ g_tls_certificate_is_same at Base 2.33.14
  g_tls_certificate_list_new_from_file at Base 2.28.0
  g_tls_certificate_new_from_file at Base 2.28.0
  g_tls_certificate_new_from_files at Base 2.28.0
@@ -1573,6 +1673,7 @@
  g_unix_mount_guess_icon at Base 2.16.0
  g_unix_mount_guess_name at Base 2.16.0
  g_unix_mount_guess_should_display at Base 2.16.0
+ g_unix_mount_guess_symbolic_icon at Base 2.33.14
  g_unix_mount_is_readonly at Base 2.16.0
  g_unix_mount_is_system_internal at Base 2.16.0
  g_unix_mount_monitor_get_type at Base 2.16.0
@@ -1587,6 +1688,7 @@
  g_unix_mount_point_guess_can_eject at Base 2.16.0
  g_unix_mount_point_guess_icon at Base 2.16.0
  g_unix_mount_point_guess_name at Base 2.16.0
+ g_unix_mount_point_guess_symbolic_icon at Base 2.33.14
  g_unix_mount_point_is_loopback at Base 2.16.0
  g_unix_mount_point_is_readonly at Base 2.16.0
  g_unix_mount_point_is_user_mountable at Base 2.16.0
@@ -1631,6 +1733,7 @@
  g_volume_get_mount at Base 2.16.0
  g_volume_get_name at Base 2.16.0
  g_volume_get_sort_key at Base 2.31.8
+ g_volume_get_symbolic_icon at Base 2.33.14
  g_volume_get_type at Base 2.16.0
  g_volume_get_uuid at Base 2.16.0
  g_volume_monitor_adopt_orphan_mount at Base 2.16.0
@@ -1843,6 +1946,8 @@
  g_child_watch_source_new at Base 2.12.0
  g_chmod at Base 2.12.0
  g_clear_error at Base 2.12.0
+ g_clear_pointer at Base 2.33.14
+ g_close at Base 2.35.8
  g_completion_add_items at Base 2.12.0
  g_completion_clear_items at Base 2.12.0
  g_completion_complete at Base 2.12.0
@@ -1851,6 +1956,7 @@
  g_completion_new at Base 2.12.0
  g_completion_remove_items at Base 2.12.0
  g_completion_set_compare at Base 2.12.0
+ g_compute_checksum_for_bytes at Base 2.33.14
  g_compute_checksum_for_data at Base 2.16.0
  g_compute_checksum_for_string at Base 2.16.0
  g_compute_hmac_for_data at Base 2.30.0
@@ -1873,8 +1979,10 @@
  g_datalist_foreach at Base 2.12.0
  g_datalist_get_data at Base 2.30.0
  g_datalist_get_flags at Base 2.12.0
+ g_datalist_id_dup_data at Base 2.33.14
  g_datalist_id_get_data at Base 2.12.0
  g_datalist_id_remove_no_notify at Base 2.12.0
+ g_datalist_id_replace_data at Base 2.33.14
  g_datalist_id_set_data_full at Base 2.12.0
  g_datalist_init at Base 2.12.0
  g_datalist_set_flags at Base 2.12.0
@@ -2030,11 +2138,12 @@
  g_get_current_time at Base 2.12.0
  g_get_environ at Base 2.28.0
  g_get_filename_charsets at Base 2.12.0
- g_get_home_dir at Base 2.12.0
+ g_get_home_dir at Base 2.35.9
  g_get_host_name at Base 2.12.0
  g_get_language_names at Base 2.12.0
  g_get_locale_variants at Base 2.28.0
  g_get_monotonic_time at Base 2.28.0
+ g_get_num_processors at Base 2.35.8
  g_get_prgname at Base 2.12.0
  g_get_real_name at Base 2.12.0
  g_get_real_time at Base 2.28.0
@@ -2215,6 +2324,7 @@
  g_list_append at Base 2.12.0
  g_list_concat at Base 2.12.0
  g_list_copy at Base 2.12.0
+ g_list_copy_deep at Base 2.33.14
  g_list_delete_link at Base 2.12.0
  g_list_find at Base 2.12.0
  g_list_find_custom at Base 2.12.0
@@ -2297,6 +2407,7 @@
  g_malloc at Base 2.12.0
  g_malloc_n at Base 2.24.0
  g_mapped_file_free at Base 2.12.0
+ g_mapped_file_get_bytes at Base 2.33.14
  g_mapped_file_get_contents at Base 2.12.0
  g_mapped_file_get_length at Base 2.12.0
  g_mapped_file_new at Base 2.12.0
@@ -2316,6 +2427,8 @@
  g_markup_parse_context_parse at Base 2.12.0
  g_markup_parse_context_pop at Base 2.18.0
  g_markup_parse_context_push at Base 2.18.0
+ g_markup_parse_context_ref at Base 2.35.8
+ g_markup_parse_context_unref at Base 2.35.8
  g_markup_printf_escaped at Base 2.12.0
  g_markup_vprintf_escaped at Base 2.12.0
  g_match_info_expand_references at Base 2.14.0
@@ -2540,6 +2653,7 @@
  g_regex_escape_string at Base 2.14.0
  g_regex_get_capture_count at Base 2.14.0
  g_regex_get_compile_flags at Base 2.26.0
+ g_regex_get_has_cr_or_lf at Base 2.33.14
  g_regex_get_match_flags at Base 2.26.0
  g_regex_get_max_backref at Base 2.14.0
  g_regex_get_pattern at Base 2.14.0
@@ -2661,6 +2775,7 @@
  g_slist_append at Base 2.12.0
  g_slist_concat at Base 2.12.0
  g_slist_copy at Base 2.12.0
+ g_slist_copy_deep at Base 2.33.14
  g_slist_delete_link at Base 2.12.0
  g_slist_find at Base 2.12.0
  g_slist_find_custom at Base 2.12.0
@@ -2690,6 +2805,7 @@
  g_snprintf at Base 2.12.0
  g_source_add_child_source at Base 2.28.0
  g_source_add_poll at Base 2.12.0
+ g_source_add_unix_fd at Base 2.35.8
  g_source_attach at Base 2.12.0
  g_source_destroy at Base 2.12.0
  g_source_get_can_recurse at Base 2.12.0
@@ -2698,15 +2814,19 @@
  g_source_get_id at Base 2.12.0
  g_source_get_name at Base 2.26.0
  g_source_get_priority at Base 2.12.0
+ g_source_get_ready_time at Base 2.35.8
  g_source_get_time at Base 2.28.0
  g_source_is_destroyed at Base 2.12.0
+ g_source_modify_unix_fd at Base 2.35.8
  g_source_new at Base 2.12.0
+ g_source_query_unix_fd at Base 2.35.8
  g_source_ref at Base 2.12.0
  g_source_remove at Base 2.12.0
  g_source_remove_by_funcs_user_data at Base 2.12.0
  g_source_remove_by_user_data at Base 2.12.0
  g_source_remove_child_source at Base 2.28.0
  g_source_remove_poll at Base 2.12.0
+ g_source_remove_unix_fd at Base 2.35.8
  g_source_set_callback at Base 2.12.0
  g_source_set_callback_indirect at Base 2.12.0
  g_source_set_can_recurse at Base 2.12.0
@@ -2714,14 +2834,17 @@
  g_source_set_name at Base 2.26.0
  g_source_set_name_by_id at Base 2.26.0
  g_source_set_priority at Base 2.12.0
+ g_source_set_ready_time at Base 2.35.8
  g_source_unref at Base 2.12.0
  g_spaced_primes_closest at Base 2.12.0
  g_spawn_async at Base 2.12.0
  g_spawn_async_with_pipes at Base 2.12.0
+ g_spawn_check_exit_status at Base 2.33.14
  g_spawn_close_pid at Base 2.12.0
  g_spawn_command_line_async at Base 2.12.0
  g_spawn_command_line_sync at Base 2.12.0
  g_spawn_error_quark at Base 2.12.0
+ g_spawn_exit_error_quark at Base 2.33.14
  g_spawn_sync at Base 2.12.0
  g_sprintf at Base 2.12.0
  g_stat at Base 2.12.0
@@ -2788,6 +2911,7 @@
  g_string_equal at Base 2.12.0
  g_string_erase at Base 2.12.0
  g_string_free at Base 2.12.0
+ g_string_free_to_bytes at Base 2.33.14
  g_string_hash at Base 2.12.0
  g_string_insert at Base 2.12.0
  g_string_insert_c at Base 2.12.0
@@ -2826,13 +2950,16 @@
  g_strup at Base 2.12.0
  g_strv_length at Base 2.12.0
  g_test_add_data_func at Base 2.16.0
+ g_test_add_data_func_full at Base 2.33.14
  g_test_add_func at Base 2.16.0
  g_test_add_vtable at Base 2.16.0
+ g_test_assert_expected_messages_internal at Base 2.33.14
  g_test_bug at Base 2.16.0
  g_test_bug_base at Base 2.16.0
  g_test_config_vars at Base 2.16.0
  g_test_create_case at Base 2.16.0
  g_test_create_suite at Base 2.16.0
+ g_test_expect_message at Base 2.33.14
  g_test_fail at Base 2.30.0
  g_test_get_root at Base 2.16.0
  g_test_init at Base 2.16.0
@@ -2991,6 +3118,9 @@
  g_unicode_script_from_iso15924 at Base 2.30.0
  g_unicode_script_to_iso15924 at Base 2.30.0
  g_unix_error_quark at Base 2.30.0
+ g_unix_fd_add at Base 2.35.8
+ g_unix_fd_add_full at Base 2.35.8
+ g_unix_fd_source_new at Base 2.35.8
  g_unix_open_pipe at Base 2.30.0
  g_unix_set_fd_nonblocking at Base 2.30.0
  g_unix_signal_add at Base 2.30.0
@@ -3044,6 +3174,7 @@
  g_variant_builder_ref at Base 2.24.0
  g_variant_builder_unref at Base 2.24.0
  g_variant_byteswap at Base 2.24.0
+ g_variant_check_format_string at Base 2.33.14
  g_variant_classify at Base 2.24.0
  g_variant_compare at Base 2.26.0
  g_variant_dup_bytestring at Base 2.26.0
@@ -3062,6 +3193,7 @@
  g_variant_get_child at Base 2.24.0
  g_variant_get_child_value at Base 2.24.0
  g_variant_get_data at Base 2.24.0
+ g_variant_get_data_as_bytes at Base 2.35.8
  g_variant_get_double at Base 2.24.0
  g_variant_get_fixed_array at Base 2.24.0
  g_variant_get_handle at Base 2.24.0
@@ -3108,6 +3240,7 @@
  g_variant_new_dict_entry at Base 2.24.0
  g_variant_new_double at Base 2.24.0
  g_variant_new_fixed_array at Base 2.31.8
+ g_variant_new_from_bytes at Base 2.35.8
  g_variant_new_from_data at Base 2.24.0
  g_variant_new_handle at Base 2.24.0
  g_variant_new_int16 at Base 2.24.0
@@ -3277,6 +3410,7 @@
  g_cclosure_new_object at Base 2.12.0
  g_cclosure_new_object_swap at Base 2.12.0
  g_cclosure_new_swap at Base 2.12.0
+ g_checksum_get_type at Base 2.35.8
  g_clear_object at Base 2.28.0
  g_closure_add_finalize_notifier at Base 2.12.0
  g_closure_add_invalidate_notifier at Base 2.12.0
@@ -3315,6 +3449,7 @@
  g_key_file_get_type at Base 2.31.8
  g_main_context_get_type at Base 2.30.0
  g_main_loop_get_type at Base 2.30.0
+ g_markup_parse_context_get_type at Base 2.35.8
  g_match_info_get_type at Base 2.30.0
  g_object_add_toggle_ref at Base 2.12.0
  g_object_add_weak_pointer at Base 2.12.0
@@ -3329,6 +3464,8 @@
  g_object_compat_control at Base 2.12.0
  g_object_connect at Base 2.12.0
  g_object_disconnect at Base 2.12.0
+ g_object_dup_data at Base 2.33.14
+ g_object_dup_qdata at Base 2.33.14
  g_object_force_floating at Base 2.12.0
  g_object_freeze_notify at Base 2.12.0
  g_object_get at Base 2.12.0
@@ -3350,6 +3487,8 @@
  g_object_ref_sink at Base 2.12.0
  g_object_remove_toggle_ref at Base 2.12.0
  g_object_remove_weak_pointer at Base 2.12.0
+ g_object_replace_data at Base 2.33.14
+ g_object_replace_qdata at Base 2.33.14
  g_object_run_dispose at Base 2.12.0
  g_object_set at Base 2.12.0
  g_object_set_data at Base 2.12.0
@@ -3415,6 +3554,7 @@
  g_param_value_validate at Base 2.12.0
  g_param_values_cmp at Base 2.12.0
  g_pointer_type_register_static at Base 2.12.0
+ g_pollfd_get_type at Base 2.35.8
  g_ptr_array_get_type at Base 2.22.0
  g_regex_get_type at Base 2.14.0
  g_signal_accumulator_first_wins at Base 2.28.0
@@ -3462,6 +3602,8 @@
  g_source_set_dummy_callback at Base 2.28.0
  g_strdup_value_contents at Base 2.12.0
  g_strv_get_type at Base 2.12.0
+ g_thread_get_type at Base 2.35.8
+ g_time_zone_get_type at Base 2.33.14
  g_type_add_class_cache_func at Base 2.12.0
  g_type_add_class_private at Base 2.24.0
  g_type_add_interface_check at Base 2.12.0
@@ -3489,12 +3631,14 @@
  g_type_default_interface_ref at Base 2.12.0
  g_type_default_interface_unref at Base 2.12.0
  g_type_depth at Base 2.12.0
+ g_type_ensure at Base 2.33.14
  g_type_free_instance at Base 2.12.0
  g_type_from_name at Base 2.12.0
  g_type_fundamental at Base 2.12.0
  g_type_fundamental_next at Base 2.12.0
  g_type_get_plugin at Base 2.12.0
  g_type_get_qdata at Base 2.12.0
+ g_type_get_type_registration_serial at Base 2.35.8
  g_type_init at Base 2.12.0
  g_type_init_with_debug_flags at Base 2.12.0
  g_type_instance_get_private at Base 2.12.0

Modified: desktop/unstable/glib2.0/debian/libglib2.0-bin.maintscript
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-bin.maintscript?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-bin.maintscript [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-bin.maintscript [utf-8] Wed May  8 04:24:00 2013
@@ -1,3 +1,3 @@
-rm_conffile /etc/bash_completion.d/gdbus-bash-completion.sh 2.33.12+really2.32.4~
-rm_conffile /etc/bash_completion.d/gsettings-bash-completion.sh 2.33.12+really2.32.4~
-rm_conffile /etc/bash_completion.d/gresource-bash-completion.sh 2.33.12+really2.32.4~
+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~

Modified: desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/libglib2.0-dev.install.in [utf-8] Wed May  8 04:24:00 2013
@@ -5,10 +5,10 @@
 usr/lib/${DEB_HOST_MULTIARCH}/libgthread*.so
 usr/lib/${DEB_HOST_MULTIARCH}/libgio*.so
 usr/lib/${DEB_HOST_MULTIARCH}/glib-2.0
-usr/lib/${DEB_HOST_MULTIARCH}/gdbus-2.0/codegen/*.py
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
 usr/share/aclocal
 usr/share/gdb
+usr/share/glib-2.0/codegen/*.py
 usr/share/glib-2.0/gdb
 usr/share/glib-2.0/gettext
 usr/share/glib-2.0/schemas

Modified: desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] Wed May  8 04:24:00 2013
@@ -4,11 +4,9 @@
 ## Bug: bug URL
 # Ubuntu: https://launchpad.net/bugs/3935
 # Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=569829
-Index: glib2.0/glib/gkeyfile.c
-===================================================================
---- glib2.0.orig/glib/gkeyfile.c	2012-02-20 22:10:54.000000000 -0200
-+++ glib2.0/glib/gkeyfile.c	2012-03-02 19:33:42.972567490 -0300
-@@ -443,6 +443,7 @@
+--- a/glib/gkeyfile.c
++++ b/glib/gkeyfile.c
+@@ -445,6 +445,7 @@
    GKeyFileFlags flags;
  
    gchar **locales;
@@ -16,7 +14,7 @@
  
    volatile gint ref_count;
  };
-@@ -573,6 +574,7 @@
+@@ -569,6 +570,7 @@
    key_file->list_separator = ';';
    key_file->flags = 0;
    key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@@ -24,7 +22,7 @@
  }
  
  static void
-@@ -592,6 +594,12 @@
+@@ -588,6 +590,12 @@
        key_file->parse_buffer = NULL;
      }
  
@@ -37,7 +35,7 @@
    tmp = key_file->groups;
    while (tmp != NULL)
      {
-@@ -807,6 +815,11 @@
+@@ -803,6 +811,11 @@
        return FALSE;
      }
  
@@ -49,7 +47,7 @@
    return TRUE;
  }
  
-@@ -912,6 +925,11 @@
+@@ -908,6 +921,11 @@
        return FALSE;
      }
  
@@ -61,7 +59,7 @@
    return TRUE;
  }
  
-@@ -2091,6 +2109,8 @@
+@@ -2083,6 +2101,8 @@
    GError *key_file_error;
    gchar **languages;
    gboolean free_languages = FALSE;
@@ -70,7 +68,7 @@
    gint i;
  
    g_return_val_if_fail (key_file != NULL, NULL);
-@@ -2112,6 +2132,24 @@
+@@ -2104,6 +2124,24 @@
        free_languages = FALSE;
      }
    
@@ -95,7 +93,7 @@
    for (i = 0; languages[i]; i++)
      {
        candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -2128,6 +2166,39 @@
+@@ -2120,6 +2158,39 @@
        translated_value = NULL;
     }
  
@@ -135,11 +133,9 @@
    /* Fallback to untranslated key
     */
    if (!translated_value)
-Index: glib2.0/glib/gkeyfile.h
-===================================================================
---- glib2.0.orig/glib/gkeyfile.h	2012-02-20 18:23:17.000000000 -0200
-+++ glib2.0/glib/gkeyfile.h	2012-03-02 19:33:42.972567490 -0300
-@@ -258,6 +258,9 @@
+--- a/glib/gkeyfile.h
++++ b/glib/gkeyfile.h
+@@ -305,6 +305,9 @@
  #define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY   "StartupNotify"
  #define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
  #define G_KEY_FILE_DESKTOP_KEY_URL              "URL"

Modified: desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] Wed May  8 04:24:00 2013
@@ -1,10 +1,8 @@
 # Description: Provide backwards compatibility for 01_gettext-desktopfiles.patch for X-{Debian,Ubuntu}-Gettext-Domain
 # UbuntuSpecific: 01_gettext-desktopfiles.patch was changed to use X-GNOME-, so this is necessary until all our .desktop files are converted
-Index: glib2.0/glib/gkeyfile.c
-===================================================================
---- glib2.0.orig/glib/gkeyfile.c	2012-03-02 19:33:42.972567490 -0300
-+++ glib2.0/glib/gkeyfile.c	2012-03-02 19:33:48.168593255 -0300
-@@ -819,6 +819,16 @@
+--- a/glib/gkeyfile.c
++++ b/glib/gkeyfile.c
+@@ -815,6 +815,16 @@
                                                      G_KEY_FILE_DESKTOP_GROUP,
                                                      G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
                                                      NULL);
@@ -21,7 +19,7 @@
  
    return TRUE;
  }
-@@ -929,6 +939,16 @@
+@@ -925,6 +935,16 @@
                                                      G_KEY_FILE_DESKTOP_GROUP,
                                                      G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
                                                      NULL);

Modified: desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch [utf-8] Wed May  8 04:24:00 2013
@@ -4,11 +4,9 @@
 Author: Josselin Mouette <joss at debian.org>
 Origin: vendor
 
-Index: glib2.0/docs/reference/glib/running.sgml
-===================================================================
---- glib2.0.orig/docs/reference/glib/running.sgml	2011-11-28 22:40:42.000000000 -0200
-+++ glib2.0/docs/reference/glib/running.sgml	2012-03-02 00:38:00.230665860 -0300
-@@ -244,6 +244,22 @@
+--- a/docs/reference/glib/running.xml
++++ b/docs/reference/glib/running.xml
+@@ -244,6 +244,24 @@
    </para>
  </formalpara>
  
@@ -16,50 +14,47 @@
 +  <title><envar>G_HOME</envar></title>
 +
 +  <para>
-+    For various reasons, GLib applications ignore the <envar>HOME</envar>
-+    environment variable on Unix systems and will use the user directory
-+    as specified by the <filename>passwd</filename> entry, which is more
-+    reliable.
++    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.
++    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">
-Index: glib2.0/glib/gutils.c
-===================================================================
---- glib2.0.orig/glib/gutils.c	2012-01-03 14:44:55.000000000 -0200
-+++ glib2.0/glib/gutils.c	2012-03-02 00:38:00.230665860 -0300
-@@ -686,11 +686,14 @@
-     }
- #endif	/* !G_OS_WIN32 */
-   
-+  g_home_dir = g_strdup (g_getenv ("G_HOME"));
-+  
- #ifdef G_OS_WIN32
-   /* We check $HOME first for Win32, though it is a last resort for Unix
-    * where we prefer the results of getpwuid().
-    */
--  g_home_dir = g_strdup (g_getenv ("HOME"));
-+  if (!g_home_dir)
-+    g_home_dir = g_strdup (g_getenv ("HOME"));
- 
-   /* Only believe HOME if it is an absolute path and exists */
-   if (g_home_dir)
-@@ -986,6 +989,11 @@
-  *      homedir = g_get_home_dir (<!-- -->);
-  * ]|
+--- a/glib/gutils.c
++++ b/glib/gutils.c
+@@ -872,6 +872,13 @@
+  *   should either directly check the <envar>HOME</envar> environment
+  *   variable yourself or unset it before calling any functions in GLib.
+  * </para></note>
++ * <note><para>
++ *   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.
++ * </para></note>
   *
-+ * However, to allow changing this value for testing and development
-+ * purposes, the value of the <envar>G_HOME</envar> environment 
-+ * variable, if set, will override the <filename>passwd</filename>
-+ * entry.
-+ *
   * Returns: the current user's home directory
   */
- const gchar *
+@@ -885,7 +892,9 @@
+       gchar *tmp;
+ 
+       /* We first check HOME and use it if it is set */
+-      tmp = g_strdup (g_getenv ("HOME"));
++      tmp = g_strdup (g_getenv ("G_HOME"));
++      if (!tmp)
++        tmp = g_strdup (g_getenv ("HOME"));
+ 
+ #ifdef G_OS_WIN32
+       /* Only believe HOME if it is an absolute path and exists.

Modified: desktop/unstable/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch [utf-8] Wed May  8 04:24:00 2013
@@ -11,10 +11,8 @@
  gio/tests/Makefile.am |    3 +++
  2 files changed, 4 insertions(+), 1 deletions(-)
 
-Index: glib-2.30.0/Makefile.decl
-===================================================================
---- glib-2.30.0.orig/Makefile.decl	2011-09-15 02:01:00.000000000 +0200
-+++ glib-2.30.0/Makefile.decl	2011-10-06 03:28:05.378828199 +0200
+--- a/Makefile.decl
++++ b/Makefile.decl
 @@ -1,7 +1,7 @@
  # GLIB - Library of useful C routines
  
@@ -24,17 +22,15 @@
  GTESTER_REPORT = $(top_builddir)/glib/gtester-report	# for the GLIB package
  
  # initialize variables for unconditional += appending
-Index: glib-2.30.0/gio/tests/Makefile.am
-===================================================================
---- glib-2.30.0.orig/gio/tests/Makefile.am	2011-09-26 22:54:58.000000000 +0200
-+++ glib-2.30.0/gio/tests/Makefile.am	2011-10-06 03:28:05.382828149 +0200
+--- a/gio/tests/Makefile.am
++++ b/gio/tests/Makefile.am
 @@ -6,6 +6,9 @@
  
- SUBDIRS = gdbus-object-manager-example
+ SUBDIRS = gdbus-object-manager-example services
  
 +# Some tests need a dbus session
 +GTESTER_ENV = dbus-launch
 +
- INCLUDES = 			\
- 	-g 			\
- 	$(gio_INCLUDES)		\
+ AM_CPPFLAGS = 				\
+ 	-DG_LOG_DOMAIN=\"GLib-GIO\" 	\
+ 	$(gio_INCLUDES)			\

Modified: desktop/unstable/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/90_gio-modules-multiarch-compat.patch [utf-8] Wed May  8 04:24:00 2013
@@ -1,8 +1,6 @@
-Index: glib-2.32.2/gio/giomodule.c
-===================================================================
---- glib-2.32.2.orig/gio/giomodule.c	2012-04-30 18:24:02.000000000 +0200
-+++ glib-2.32.2/gio/giomodule.c	2012-05-01 17:02:18.503885029 +0200
-@@ -905,6 +905,8 @@
+--- a/gio/giomodule.c
++++ b/gio/giomodule.c
+@@ -1037,6 +1037,8 @@
  
        /* Then load the compiled in path */
        g_io_modules_scan_all_in_directory_with_scope (GIO_MODULE_DIR, scope);

Modified: desktop/unstable/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/series?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/series [utf-8] Wed May  8 04:24:00 2013
@@ -1,12 +1,14 @@
 01_gettext-desktopfiles.patch
 02_gettext-desktopfiles-ubuntu.patch
-03_revert_git_single_include_error.patch
+03_disble_glib_compile_schemas_warning.patch
 04_homedir_env.patch
 05_run-gio-tests-with-a-dbus-session.patch
-10_gdbus_race.patch
-11_CVE-2012-3524_setuid.patch
-20_glib-compile-resources_leak.patch
+06_thread_test_ignore_prctl_fail.patch
+07_disable_tests_on_slow_archs.patch
+10_kfreebsd_issetugid_prototype.patch
+11_kfreebsd_pthread_condattr_setclock_prototype.patch
+13_sparc_prlimit_prototype.patch
+15_gio_desktop_app_info_test_bin_true_path.patch
+17_check_abis_mips_symbols.patch
 61_glib-compile-binaries-path.patch
 90_gio-modules-multiarch-compat.patch
-91_revert_schema_path_warning.patch
-92_kfreebsd_credentials.patch

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules [utf-8] Wed May  8 04:24:00 2013
@@ -27,7 +27,6 @@
 
 APIVER := 2.0
 SONAME := 0
-SHVER := 2.32.3
 
 # package names
 SHARED_PKG := libglib$(APIVER)-$(SONAME)
@@ -45,19 +44,35 @@
 DEB_DH_INSTALL_ARGS_$(UDEB_PKG) += --sourcedir=debian/install/udeb
 DEB_DH_INSTALL_ARGS_$(REFDBG_PKG) += --sourcedir=debian/install/refdbg
 
-DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V'$(SHARED_PKG) (>= $(SHVER))' --add-udeb=$(UDEB_PKG) -- -c4
+DEB_DH_MAKESHLIBS_ARGS_$(SHARED_PKG) += -V --add-udeb=$(UDEB_PKG) -- -c4
 DEB_DH_MAKESHLIBS_ARGS_$(REFDBG_PKG) = --no-act
 DEB_DH_STRIP_ARGS_$(REFDBG_PKG) = --no-act
 # Don't put the symbols in the -dbg package
 DEB_DH_STRIP_ARGS_$(UDEB_PKG) =
 
-DEB_MAKE_CHECK_TARGET = -k check || true
+# Do not clutter $HOME with ~/.dbus-keyrings and avoid failure on the buildds
+# where creating /home/buildd/.dbus-keyrings fails
+export HOME=$(CURDIR)/debian/build
+
+# make tests non-fatal on Debian architectures which currently have failed
+# tests; always fail on Ubuntu; only run the tests for the main flavour
+ifneq ($(filter $(DEB_BUILD_ARCH), kfreebsd-i386 kfreebsd-amd64 sparc mips mipsel hurd-i386),)
+DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check || ! dpkg-vendor --is ubuntu)
+else
+DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check)
+endif
 
 # configure flags
 DEB_CONFIGURE_EXTRA_FLAGS := \
 			--with-html-dir=\$${prefix}/share/doc/$(DOC_PKG) \
 			--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 			--with-pcre=system
+
+ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
+  DEB_CONFIGURE_EXTRA_FLAGS += \
+			--disable-modular-tests \
+			--disable-gtk-doc
+endif
 
 DEB_CONFIGURE_FLAGS_deb := \
 			--enable-gtk-doc \
@@ -69,6 +84,9 @@
 DEB_CONFIGURE_FLAGS_refdbg := \
 			--disable-Bsymbolic \
 			--enable-debug=yes
+
+pre-build::
+	mkdir -p debian/stamp-makefile-check
 
 binary-install/libglib2.0-0::
 	set -e; for script in postinst postrm; do \

Modified: desktop/unstable/glib2.0/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/watch?rev=37632&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/watch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/watch [utf-8] Wed May  8 04:24:00 2013
@@ -1,3 +1,3 @@
 version=3
-http://download.gnome.org/sources/glib/([\d\.]+[02468])/ \
+http://download.gnome.org/sources/glib/([\d\.]+)/ \
 	glib-(.*)\.tar\.xz




More information about the pkg-gnome-commits mailing list