[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian, updated. debian/0.18.1-1-2-gabf025d

Simon McVittie smcv at debian.org
Tue Apr 24 20:04:19 UTC 2012


The following commit has been merged in the debian branch:
commit 177d8847fcdae6393ac0d667a041321122f77c67
Author: Simon McVittie <smcv at debian.org>
Date:   Tue Apr 24 17:56:06 2012 +0100

    Set a fake home directory for the tests, for the benefit of architectures where either GDBus or libdbus doesn't understand credentials-passing, causing D-Bus clients to write to ~/.dbus-keyrings (not allowed on buildds). (Closes: #670291)

diff --git a/debian/changelog b/debian/changelog
index e434b95..61a4c2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+telepathy-glib (0.18.1-2) UNRELEASED; urgency=low
+
+  * Set a fake home directory for the tests, for the benefit of architectures
+    where either GDBus or libdbus doesn't understand credentials-passing,
+    causing D-Bus clients to write to ~/.dbus-keyrings (not allowed on
+    buildds). (Closes: #670291)
+
+ -- Simon McVittie <smcv at debian.org>  Tue, 24 Apr 2012 17:51:29 +0100
+
 telepathy-glib (0.18.1-1) unstable; urgency=low
 
   [ Simon McVittie ]
diff --git a/debian/rules b/debian/rules
index 7e27ea0..cc6dc46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,16 @@ override_dh_auto_configure:
 	--enable-vala-bindings \
 	--enable-gtk-doc \
 	--with-html-dir=\$${prefix}/share/doc/libtelepathy-glib-doc
+	install -d -m700 $(HOME)
+
+# On kernel/libc combinations where credentials-passing doesn't work, or where
+# it works but either libdbus or GDBus doesn't understand how, D-Bus clients
+# have to write to ~/.dbus-keyrings to prove their identities. Debian packages
+# aren't allowed to write to ${HOME}.
+export HOME = $(CURDIR)/debian/tmp-home
+# GLib doesn't respect $HOME for everything, so we use the Debian-specific
+# G_HOME too.
+export G_HOME = $(HOME)
 
 export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 

-- 
telepathy-glib packaging



More information about the Pkg-telepathy-commits mailing list