r49526 - in /desktop/experimental/glib2.0: ./ debian/changelog debian/patches/gregex-loosen-behaviour-testing.patch debian/patches/series debian/rules debian/tests/control debian/tests/installed-tests

smcv at users.alioth.debian.org smcv at users.alioth.debian.org
Mon Aug 15 19:53:06 UTC 2016 

Author: smcv
Date: Mon Aug 15 19:53:06 2016
New Revision: 49526

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49526
Log:
Merge packaging from unstable

Added:
    desktop/experimental/glib2.0/debian/patches/gregex-loosen-behaviour-testing.patch
      - copied unchanged from r49521, desktop/unstable/glib2.0/debian/patches/gregex-loosen-behaviour-testing.patch
Modified:
    desktop/experimental/glib2.0/   (props changed)
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series
    desktop/experimental/glib2.0/debian/rules
    desktop/experimental/glib2.0/debian/tests/control
    desktop/experimental/glib2.0/debian/tests/installed-tests

Propchange: desktop/experimental/glib2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo	(original)
+++ svn:mergeinfo	Mon Aug 15 19:53:06 2016
@@ -1,2 +1,2 @@
 /desktop/experimental/glib2.0:34881-37631,43901-45934,46852-47640
-/desktop/unstable/glib2.0:24636,27515-27547,38796-39206,41794-42178
+/desktop/unstable/glib2.0:24636,27515-27547,38796-39206,41794-42178,49089-49521

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=49526&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Mon Aug 15 19:53:06 2016
@@ -1,3 +1,36 @@
+glib2.0 (2.49.4-2) UNRELEASED; urgency=medium
+
+  * Merge packaging from unstable.
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 15 Aug 2016 20:52:15 +0100
+
+glib2.0 (2.48.1-3) unstable; urgency=medium
+
+  * debian/tests/control: do not fail on stderr output from
+    installed-tests. If gvfs happens to be installed, it gets
+    D-Bus-activated (even if it's disabled via GIO_USE_VFS and
+    GIO_USE_VOLUME_MONITOR), resulting in logging from dbus-daemon.
+    (Closes: #821031)
+  * debian/tests/installed-tests: explicitly select built-in VFS and
+    volume monitor
+  * d/p/gregex-loosen-behaviour-testing.patch: add patch from upstream
+    bug 767240 (not applied yet) to relax assertions about PCRE's behaviour,
+    which changed in 8.38 (Closes: #834272)
+  * d/rules: unset XDG_CONFIG_HOME, XDG_CACHE_HOME, XDG_DATA_HOME,
+    XDG_CONFIG_DIRS, XDG_DATA_DIRS so that they are based on the temporary
+    HOME. This avoids FTBFS if the user doing the build has these variables
+    already set in their build environment (Closes: #834334)
+
+ -- Simon McVittie <smcv at debian.org>  Mon, 15 Aug 2016 18:01:03 +0100
+
+glib2.0 (2.48.1-2) unstable; urgency=medium
+
+  * Remove refdbg variant. Thanks to Jonny Lamb for the patch.
+    Closes: #827269.
+  * Switch to python3.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 13 Jul 2016 17:46:31 +0200
+
 glib2.0 (2.49.4-1) experimental; urgency=medium
 
   * New upstream release.

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=49526&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Mon Aug 15 19:53:06 2016
@@ -12,3 +12,4 @@
 0001-timer-test-use-volatile-for-locals.patch
 skip-broken-timer-test.patch
 0001-Fix-trashing-on-overlayfs.patch
+gregex-loosen-behaviour-testing.patch

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=49526&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules	[utf-8] Mon Aug 15 19:53:06 2016
@@ -58,6 +58,17 @@
 # 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
+
+# Put these back to their defaults if we are not running with a clean
+# environment, so that they are based on the temporary $HOME above.
+# Otherwise, some tests would try to write to the user's real XDG_DATA_HOME,
+# causing unwanted side-effects or FTBFS depending whether the user's
+# real HOME is available in the build chroot (if used)
+unexport XDG_CACHE_HOME
+unexport XDG_CONFIG_DIRS
+unexport XDG_CONFIG_HOME
+unexport XDG_DATA_HOME
+unexport XDG_DATA_DIRS
 
 # Make sure that everything that uses D-Bus is creating its own temporary
 # session rather than polluting the developer's (or failing, on buildds)

Modified: desktop/experimental/glib2.0/debian/tests/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/tests/control?rev=49526&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/tests/control	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/tests/control	[utf-8] Mon Aug 15 19:53:06 2016
@@ -3,3 +3,4 @@
 
 Tests: installed-tests
 Depends: libglib2.0-tests, dbus-x11, dbus (>= 1.8), xauth, xvfb, gnome-desktop-testing
+Restrictions: allow-stderr

Modified: desktop/experimental/glib2.0/debian/tests/installed-tests
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/tests/installed-tests?rev=49526&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/tests/installed-tests	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/tests/installed-tests	[utf-8] Mon Aug 15 19:53:06 2016
@@ -5,6 +5,11 @@
 
 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=$ADTTMP
 
 dbus-run-session -- xvfb-run -a gnome-desktop-testing-runner glib

More information about the pkg-gnome-commits mailing list