New upstream version

3 files changed, 3 insertions, 49 deletions

diff --git a/debian/changelog b/debian/changelog
index b9154c26..4625bd1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dbus (1.4.1-3) UNRELEASED; urgency=low
+dbus (1.4.4-1) UNRELEASED; urgency=low
 
   * Switch from cdbs to dh.
   * Bump debhelper compatibility level to 8.
@@ -6,6 +6,8 @@ dbus (1.4.1-3) UNRELEASED; urgency=low
     The upstream build system takes care of that already.
 
   [ Simon McVittie ]
+  * New upstream version
+    - remove 00_dbus-quiesce-startup-errors.patch, no longer needed
   * Ignore changes to generated Doxygen HTML instead of deleting it in clean,
     for easier use of git-buildpackage
 
diff --git a/debian/patches/00_dbus-quiesce-startup-errors.patch b/debian/patches/00_dbus-quiesce-startup-errors.patch
deleted file mode 100644
index 8f1edb76..00000000
--- a/debian/patches/00_dbus-quiesce-startup-errors.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Mon, 31 Jan 2011 18:06:09 +0000
-Subject: [PATCH] If a file included via <includedir/> is invalid, syslog and skip it
-
-This is more graceful than failing entirely (our previous behaviour),
-but more visible than ignoring it completely (the previous behaviour
-patched in by Debian and derivatives).
-
-Based on a patch from Daniel Silverstone back in 2004, which was meant
-to be temporary; I think it makes sense to change this permanently,
-since files in *.d are typically supplied by other packages, whose bugs
-shouldn't be able to bring down dbus-daemon.
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=19186
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=230231
-Reviewed-by: Colin Walters <walters@verbum.org>
-Applied-upstream: 1.4.4, commit:7480dfdb2a8f58279aab77edab85e1165a2d9120
----
- bus/config-parser.c |   15 +++++++++++++--
- 1 files changed, 13 insertions(+), 2 deletions(-)
-
-diff --git a/bus/config-parser.c b/bus/config-parser.c
-index f128b91..dd941e3 100644
---- a/bus/config-parser.c
-+++ b/bus/config-parser.c
-@@ -2237,8 +2237,19 @@ include_dir (BusConfigParser   *parser,
-         {
-           if (!include_file (parser, &full_path, TRUE, error))
-             {
--              _dbus_string_free (&full_path);
--              goto failed;
-+              if (dbus_error_is_set (error))
-+                {
-+                  /* We log to syslog unconditionally here, because this is
-+                   * the configuration parser, so we don't yet know whether
-+                   * this bus is going to want to write to syslog! (There's
-+                   * also some layer inversion going on, if we want to use
-+                   * the bus context.) */
-+                  _dbus_system_log (DBUS_SYSTEM_LOG_INFO,
-+                                    "Encountered error '%s' while parsing '%s'\n",
-+                                    error->message,
-+                                    _dbus_string_get_const_data (&full_path));
-+                  dbus_error_free (error);
-+                }
-             }
-         }
- 
diff --git a/debian/patches/series b/debian/patches/series
index 2867e270..7627b476 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-00_dbus-quiesce-startup-errors.patch
 01_no-fatal-warnings.patch
 10_dbus-1.0.1-generate-xml-docs.patch