r49509 - in /desktop/unstable/glib2.0/debian: changelog rules

[smcv at users.alioth.debian.org]

Author: smcv
Date: Sun Aug 14 16:13:02 2016
New Revision: 49509

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49509
Log:
d/rules: unset XDG basedirs

This causes them to be based on the temporary HOME, avoiding FTBFS if the
user doing the build has these variables already set in their build
environment (Closes: #834334)

Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/rules

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=49509&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Sun Aug 14 16:13:02 2016
@@ -10,6 +10,10 @@
   * 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>  Sun, 14 Aug 2016 14:46:44 +0100
 

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=49509&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules	[utf-8] Sun Aug 14 16:13:02 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)