diff -u gupnp-0.13.2/debian/changelog gupnp-0.13.2/debian/changelog --- gupnp-0.13.2/debian/changelog +++ gupnp-0.13.2/debian/changelog @@ -1,3 +1,11 @@ +gupnp (0.13.2-1ubuntu1) lucid; urgency=low + + * Add dbus-fail-warning.patch: Downgrade D-Bus connection failure warning. + It's not fatal for the context of libgupnp, and it causes the test suite + of gupnp-igd to fail. (LP: #534311) + + -- Martin Pitt Mon, 15 Mar 2010 11:46:54 +0100 + gupnp (0.13.2-1) unstable; urgency=low * New upstream release (Closes: #562045) diff -u gupnp-0.13.2/debian/rules gupnp-0.13.2/debian/rules --- gupnp-0.13.2/debian/rules +++ gupnp-0.13.2/debian/rules @@ -3,6 +3,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk export LDFLAGS += -Wl,--as-needed diff -u gupnp-0.13.2/debian/control gupnp-0.13.2/debian/control --- gupnp-0.13.2/debian/control +++ gupnp-0.13.2/debian/control @@ -1,7 +1,8 @@ Source: gupnp Section: libs Priority: optional -Maintainer: Ross Burton +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ross Burton Build-Depends: debhelper (>= 5), cdbs, uuid-dev, libglib2.0-dev (>= 2.18), libsoup2.4-dev, libxml2-dev, libgssdp-1.0-dev (>= 0.7.1), libdbus-glib-1-dev, shared-mime-info, xsltproc, docbook-xsl Standards-Version: 3.8.3 only in patch2: unchanged: --- gupnp-0.13.2.orig/debian/patches/dbus-fail-warning.patch +++ gupnp-0.13.2/debian/patches/dbus-fail-warning.patch @@ -0,0 +1,15 @@ +Description: Downgrade D-Bus connection failure warning. It's not fatal for the context of libgupnp, and it causes the test suite of gupnp-igd to fail. +Author: Martin Pitt +Bug: http://bugzilla.openedhand.com/show_bug.cgi?id=1979 +Bug-Ubuntu: https://launchpad.net/bugs/534311 +--- gupnp/libgupnp/gupnp-network-manager.c 2010-03-15 11:39:52.000000000 +0100 ++++ gupnp.new/libgupnp/gupnp-network-manager.c 2010-03-15 11:41:30.751414695 +0100 +@@ -584,7 +584,7 @@ + dbus_error_init (&derror); + connection = dbus_bus_get_private (DBUS_BUS_SYSTEM, &derror); + if (connection == NULL) { +- g_warning ("Failed to connect to System Bus: %s", ++ g_debug ("Failed to connect to System Bus: %s", + derror.message); + return FALSE; + }