summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2012-07-03 19:28:48 +0100
committerSimon McVittie <smcv@debian.org>2012-07-03 19:28:48 +0100
commit9d951e4f8ebdd4d5e57eec6b0f4de0a2a1346dc0 (patch)
tree6d0480bf1c76fbfe8df173d40711170db13525b7
parent54531a9e93db1935d132440944c68f1d4dfdcd70 (diff)
downloaddbus-9d951e4f8ebdd4d5e57eec6b0f4de0a2a1346dc0.tar.gz
Disable "developer mode", which was intended to be off-by-default, but was incorrectly on-by-default in 1.6.2, causing an incorrect assertion to be hit when starting fcitx before dbus-launch. (Closes: #680027)
-rw-r--r--debian/changelog9
-rwxr-xr-xdebian/rules1
2 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 340dc5d8..6e22976d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dbus (1.6.2-2) UNRELEASED; urgency=low
+
+ * Disable "developer mode", which was intended to be off-by-default,
+ but was incorrectly on-by-default in 1.6.2, causing an incorrect
+ assertion to be hit when starting fcitx before dbus-launch.
+ (Closes: #680027)
+
+ -- Simon McVittie <smcv@debian.org> Tue, 03 Jul 2012 16:16:57 +0100
+
dbus (1.6.2-1) unstable; urgency=low
* New upstream stable release
diff --git a/debian/rules b/debian/rules
index 9c51c32d..34c4540b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ override_dh_auto_configure:
dh_auto_configure \
-- \
$(common_configure_flags) \
+ --disable-developer \
--enable-xml-docs \
--enable-doxygen-docs \
--libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \