summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2011-04-27 15:52:18 +0100
committerSimon McVittie <smcv@debian.org>2011-04-27 15:52:18 +0100
commitd405f123b8641ff2746ea8d48e9aa9e3cb7469a5 (patch)
tree9abb103c250e208bb23f849b8a4aa97e74207d8c
parent1ebf1023db471bca03ad8fa0cc27fbd763a470bd (diff)
downloaddbus-d405f123b8641ff2746ea8d48e9aa9e3cb7469a5.tar.gz
Add DEP-3 metadata to 01_no-fatal-warnings.patch
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/01_no-fatal-warnings.patch11
2 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2c2d81ca..8a789350 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ dbus (1.4.8-3) UNRELEASED; urgency=low
(Closes: #624333)
* Policy 3.9.2 (no changes required)
* De-duplicate short descriptions
+ * Add DEP-3 metadata to 01_no-fatal-warnings.patch
-- Simon McVittie <smcv@debian.org> Wed, 27 Apr 2011 15:29:59 +0100
diff --git a/debian/patches/01_no-fatal-warnings.patch b/debian/patches/01_no-fatal-warnings.patch
index 53b3444c..ab25f67c 100644
--- a/debian/patches/01_no-fatal-warnings.patch
+++ b/debian/patches/01_no-fatal-warnings.patch
@@ -1,3 +1,14 @@
+From: Sebastian Dröge <slomo@ubuntu.com>
+Subject: Don't abort on fatal warnings by default
+Date: 2006-11-14 15:35:00 +0100
+
+This behaviour can be controlled by the DBUS_FATAL_WARNINGS enviroment
+variable. This will be set to upstream default again at some point so
+if you have an application that prints a DBus warning get it fixed.
+
+Origin: vendor, Debian
+Forwarded: no
+
Index: b/dbus/dbus-internals.c
===================================================================
--- a/dbus/dbus-internals.c 2010-07-14 00:43:38.000000000 +0200