Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: dbus

dbus (1.12.10-1ubuntu2) cosmic; urgency=medium * debian/tests/root: don't set ulimit on containers, since the container may be unprivileged and "root" may not be able to raise ulimits again. -- Steve Langasek <steve.langasek@ubuntu.com> Thu, 06 Sep 2018 03:56:07 +0000 dbus (1.12.10-1ubuntu1) cosmic; urgency=low * Merge from Debian unstable. Remaining changes: - Add dont-stop-dbus.patch: Don't stop D-Bus in the service unit (see patch header and upstream bug for details). Fixes various causes of shutdown hangs, particularly with remote file systems. (LP: #1438612) (LP: #1540282) - debian/dbus.postinst, debian/rules: Don't start D-Bus on package installation, as that doesn't work any more with dont-stop-dbus.patch. Instead, start dbus.socket in postinst, which will then start D-Bus on demand after package installation. - Add aa-get-connection-apparmor-security-context.patch: This is not intended for upstream inclusion. It implements a bus method (GetConnectionAppArmorSecurityContext) to get a connection's AppArmor security context but upstream D-Bus has recently added a generic way of getting a connection's security credentials (GetConnectionCredentials). Ubuntu should carry this patch until packages in the archive are moved over to the new, generic method of getting a connection's credentials. * Dropped changes, no longer needed: - Clean up /etc/init/dbus.conf on upgrades. This needs to be kept until after 18.04 LTS. -- Steve Langasek <steve.langasek@ubuntu.com> Fri, 31 Aug 2018 10:29:17 -0700

Modifications :
  1. Download patch debian/dbus.postinst

    --- 1.12.10-1/debian/dbus.postinst 2018-08-02 19:13:24.000000000 +0000 +++ 1.12.10-1ubuntu2/debian/dbus.postinst 2018-08-03 10:18:17.000000000 +0000 @@ -90,3 +90,8 @@ fi if [ "$1" = configure ] && [ -n "$2" ]; then reload_dbus_config fi + +# We don't start dbus.service in postinst, so ensure dbus.socket is running +if [ "$1" = configure ] && [ -d /run/systemd/system ]; then + systemctl try-restart sockets.target || true +fi
  2. Download patch debian/rules

    --- 1.12.10-1/debian/rules 2018-08-02 19:13:24.000000000 +0000 +++ 1.12.10-1ubuntu2/debian/rules 2018-08-03 10:18:17.000000000 +0000 @@ -259,9 +259,8 @@ endif override_dh_missing: dh_missing $(dh_missing_options) -# Yes, we do need both --no- options here. https://bugs.debian.org/837528 override_dh_installinit: - dh_installinit -pdbus --no-stop-on-upgrade --no-restart-after-upgrade + dh_installinit -pdbus --no-start override_dh_installdocs: dh_installdocs --all AUTHORS NEWS README
  3. Download patch debian/control

    --- 1.12.10-1/debian/control 2018-08-02 19:13:24.000000000 +0000 +++ 1.12.10-1ubuntu2/debian/control 2018-08-03 10:18:17.000000000 +0000 @@ -1,7 +1,8 @@ Source: dbus Section: admin Priority: optional -Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org> Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Dröge <slomo@debian.org>,
  4. Download patch debian/patches/ubuntu/dont-stop-dbus.patch

    --- 1.12.10-1/debian/patches/ubuntu/dont-stop-dbus.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.12.10-1ubuntu2/debian/patches/ubuntu/dont-stop-dbus.patch 2017-11-15 22:22:22.000000000 +0000 @@ -0,0 +1,42 @@ +From: Martin Pitt <martin.pitt@ubuntu.com> +Date: Tue, 31 Mar 2015 18:46:06 +0200 +Subject: Don't stop D-Bus in the service unit + +D-Bus is getting stopped too early during shutdown, so that services on the bus +are still running (and being shut down) after that. This leads to shutdown +hangs due to remote file systems not getting unmounted as wpa_supplicant is +already gone, or avahi or NetworkManager getting lots of errors because they +get disconnected, etc. As D-Bus does not keep its state between restarts, +dbus.socket also does not help us. + +Also, stopping D-Bus in a running system isn't something which we ever +supported; to the contrary, we patched several packages to avoid +restarting/stopping D-Bus in postinsts, as stopping d-bus in a running system +is shooting yourself into the foot (independent of which init system you use). +Thus leaving D-Bus running until the bitter end should be fine, it doesn't have +any file system things to do on shutdown. This also approximates the brave new +kdbus world where d-bus is basically "always available". + +Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89847 +Bug-Ubuntu: https://launchpad.net/bugs/1438612 +--- + bus/dbus.service.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/bus/dbus.service.in b/bus/dbus.service.in +index ca0b7e9..e547f7b 100644 +--- a/bus/dbus.service.in ++++ b/bus/dbus.service.in +@@ -2,8 +2,12 @@ + Description=D-Bus System Message Bus + Documentation=man:dbus-daemon(1) + Requires=dbus.socket ++# we don't properly stop D-Bus (see ExecStop=), thus disallow restart ++RefuseManualStart=yes + + [Service] + ExecStart=@EXPANDED_BINDIR@/dbus-daemon --system --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only + ExecReload=@EXPANDED_BINDIR@/dbus-send --print-reply --system --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig ++ExecStop=/bin/true ++KillMode=none + OOMScoreAdjust=-900
  5. Download patch debian/patches/series

    --- 1.12.10-1/debian/patches/series 2018-08-02 19:13:24.000000000 +0000 +++ 1.12.10-1ubuntu2/debian/patches/series 2018-08-31 17:29:17.000000000 +0000 @@ -1,2 +1,4 @@ debian/session.conf-system.conf-include-legacy-files-as-.dpkg-ba.patch debian/tests-Multiply-timeouts-by-20-on-riscv64.patch +ubuntu/aa-get-connection-apparmor-security-context.patch +ubuntu/dont-stop-dbus.patch
  6. Download patch debian/.gitignore

    --- 1.12.10-1/debian/.gitignore 2018-08-02 19:13:24.000000000 +0000 +++ 1.12.10-1ubuntu2/debian/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -/*.debhelper -/*.debhelper.log -/*.substvars -/.debhelper/ -/autoreconf.after -/autoreconf.before -/build-*/ -/dbus-1-dbg/ -/dbus-1-doc/ -/dbus-tests/ -/dbus-udeb/ -/dbus-user-session/ -/dbus-x11/ -/dbus/ -/debhelper-build-stamp -/files -/libdbus-1-3-udeb/ -/libdbus-1-3.symbols -/libdbus-1-3/ -/libdbus-1-dev/ -/tmp-home/ -/tmp-udeb/ -/tmp/
  7. Download patch debian/patches/ubuntu/aa-get-connection-apparmor-security-context.patch

    --- 1.12.10-1/debian/patches/ubuntu/aa-get-connection-apparmor-security-context.patch 1970-01-01 00:00:00.000000000 +0000 +++ 1.12.10-1ubuntu2/debian/patches/ubuntu/aa-get-connection-apparmor-security-context.patch 2017-11-15 22:22:22.000000000 +0000 @@ -0,0 +1,187 @@ +From: Tyler Hicks <tyhicks@canonical.com> +Date: Fri, 15 Aug 2014 13:37:15 -0500 +Subject: Add DBus method to return the AA context of a connection + +Allows the AppArmor label that is attached to a D-Bus connection to be +queried using the unique connection name. + +For example, +$ dbus-send --print-reply --system --dest=org.freedesktop.DBus \ + /org/freedesktop/DBus \ + org.freedesktop.DBus.GetConnectionAppArmorSecurityContext string::1.4 + method return sender=org.freedesktop.DBus -> dest=:1.50 reply_serial=2 + string "/usr/sbin/cupsd" + +[Altered by Simon McVittie: survive non-UTF-8 contexts which +would otherwise be a local denial of service, except that Ubuntu +inherits a non-fatal warnings patch from Debian; new commit message +taken from the Ubuntu changelog; do not emit unreachable code if +AppArmor is disabled.] + +Forwarded: not-needed +--- + bus/apparmor.c | 15 +++++++++ + bus/apparmor.h | 1 + + bus/driver.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + dbus/dbus-protocol.h | 2 ++ + 4 files changed, 108 insertions(+) + +diff --git a/bus/apparmor.c b/bus/apparmor.c +index 985f5e9..2eba37b 100644 +--- a/bus/apparmor.c ++++ b/bus/apparmor.c +@@ -502,6 +502,21 @@ bus_apparmor_enabled (void) + #endif + } + ++const char* ++bus_apparmor_confinement_get_label (BusAppArmorConfinement *confinement) ++{ ++#ifdef HAVE_APPARMOR ++ if (!apparmor_enabled) ++ return NULL; ++ ++ _dbus_assert (confinement != NULL); ++ ++ return confinement->label; ++#else ++ return NULL; ++#endif ++} ++ + void + bus_apparmor_confinement_unref (BusAppArmorConfinement *confinement) + { +diff --git a/bus/apparmor.h b/bus/apparmor.h +index ed465f7..b8146df 100644 +--- a/bus/apparmor.h ++++ b/bus/apparmor.h +@@ -38,6 +38,7 @@ dbus_bool_t bus_apparmor_enabled (void); + + void bus_apparmor_confinement_unref (BusAppArmorConfinement *confinement); + void bus_apparmor_confinement_ref (BusAppArmorConfinement *confinement); ++const char* bus_apparmor_confinement_get_label (BusAppArmorConfinement *confinement); + BusAppArmorConfinement* bus_apparmor_init_connection_confinement (DBusConnection *connection, + DBusError *error); + +diff --git a/bus/driver.c b/bus/driver.c +index cd0a714..d1669cb 100644 +--- a/bus/driver.c ++++ b/bus/driver.c +@@ -2005,6 +2005,91 @@ bus_driver_handle_get_connection_credentials (DBusConnection *connection, + return FALSE; + } + ++static dbus_bool_t ++bus_driver_handle_get_connection_apparmor_security_context (DBusConnection *connection, ++ BusTransaction *transaction, ++ DBusMessage *message, ++ DBusError *error) ++{ ++ const char *service; ++ DBusString str; ++ BusRegistry *registry; ++ BusService *serv; ++ DBusConnection *primary_connection; ++ DBusMessage *reply; ++ BusAppArmorConfinement *confinement; ++ const char *label; ++ ++ _DBUS_ASSERT_ERROR_IS_CLEAR (error); ++ ++ registry = bus_connection_get_registry (connection); ++ ++ service = NULL; ++ reply = NULL; ++ confinement = NULL; ++ ++ if (! dbus_message_get_args (message, error, DBUS_TYPE_STRING, &service, ++ DBUS_TYPE_INVALID)) ++ goto failed; ++ ++ _dbus_verbose ("asked for security context of connection %s\n", service); ++ ++ _dbus_string_init_const (&str, service); ++ serv = bus_registry_lookup (registry, &str); ++ if (serv == NULL) ++ { ++ dbus_set_error (error, ++ DBUS_ERROR_NAME_HAS_NO_OWNER, ++ "Could not get security context of name '%s': no such name", service); ++ goto failed; ++ } ++ ++ primary_connection = bus_service_get_primary_owners_connection (serv); ++ ++ reply = dbus_message_new_method_return (message); ++ if (reply == NULL) ++ goto oom; ++ ++ confinement = bus_connection_dup_apparmor_confinement (primary_connection); ++ label = bus_apparmor_confinement_get_label (confinement); ++ ++ if (label == NULL) ++ { ++ dbus_set_error (error, ++ DBUS_ERROR_APPARMOR_SECURITY_CONTEXT_UNKNOWN, ++ "Could not determine security context for '%s'", service); ++ goto failed; ++ } ++ ++ if (!dbus_validate_utf8 (label, error)) ++ goto failed; ++ ++ if (! dbus_message_append_args (reply, ++ DBUS_TYPE_STRING, ++ &label, ++ DBUS_TYPE_INVALID)) ++ goto failed; ++ ++ if (! bus_transaction_send_from_driver (transaction, connection, reply)) ++ goto oom; ++ ++ bus_apparmor_confinement_unref (confinement); ++ dbus_message_unref (reply); ++ ++ return TRUE; ++ ++ oom: ++ BUS_SET_OOM (error); ++ ++ failed: ++ _DBUS_ASSERT_ERROR_IS_SET (error); ++ if (confinement) ++ bus_apparmor_confinement_unref (confinement); ++ if (reply) ++ dbus_message_unref (reply); ++ return FALSE; ++} ++ + static dbus_bool_t + bus_driver_handle_reload_config (DBusConnection *connection, + BusTransaction *transaction, +@@ -2479,6 +2564,11 @@ static const MessageHandler dbus_message_handlers[] = { + DBUS_TYPE_ARRAY_AS_STRING DBUS_TYPE_BYTE_AS_STRING, + bus_driver_handle_get_connection_selinux_security_context, + METHOD_FLAG_ANY_PATH }, ++ { "GetConnectionAppArmorSecurityContext", ++ DBUS_TYPE_STRING_AS_STRING, ++ DBUS_TYPE_STRING_AS_STRING, ++ bus_driver_handle_get_connection_apparmor_security_context, ++ METHOD_FLAG_ANY_PATH }, + { "ReloadConfig", + "", + "", +diff --git a/dbus/dbus-protocol.h b/dbus/dbus-protocol.h +index 933c365..2b7fd23 100644 +--- a/dbus/dbus-protocol.h ++++ b/dbus/dbus-protocol.h +@@ -444,6 +444,8 @@ extern "C" { + #define DBUS_ERROR_INVALID_FILE_CONTENT "org.freedesktop.DBus.Error.InvalidFileContent" + /** Asked for SELinux security context and it wasn't available. */ + #define DBUS_ERROR_SELINUX_SECURITY_CONTEXT_UNKNOWN "org.freedesktop.DBus.Error.SELinuxSecurityContextUnknown" ++/** Asked for AppArmor security context and it wasn't available. */ ++#define DBUS_ERROR_APPARMOR_SECURITY_CONTEXT_UNKNOWN "org.freedesktop.DBus.Error.AppArmorSecurityContextUnknown" + /** Asked for ADT audit data and it wasn't available. */ + #define DBUS_ERROR_ADT_AUDIT_DATA_UNKNOWN "org.freedesktop.DBus.Error.AdtAuditDataUnknown" + /** There's already an object with the requested object path. */
  8. Download patch debian/gbp.conf

    --- 1.12.10-1/debian/gbp.conf 2018-08-02 19:13:24.000000000 +0000 +++ 1.12.10-1ubuntu2/debian/gbp.conf 2018-08-03 10:18:17.000000000 +0000 @@ -1,5 +1,5 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = ubuntu/bionic upstream-branch = upstream/1.12.x patch-numbers = False
  9. Download patch debian/tests/root

    --- 1.12.10-1/debian/tests/root 2018-08-02 19:13:24.000000000 +0000 +++ 1.12.10-1ubuntu2/debian/tests/root 2018-09-06 03:56:03.000000000 +0000 @@ -35,9 +35,14 @@ do echo "x" > "$AUTOPKGTEST_TMP/result" ( set +e - # One test needs us to have a small fd limit - ulimit -S -n 1024 - ulimit -H -n 1024 + # Don't change limits in containers, as we're not guaranteed to be + # able to re-raise them due to unprivileged containers. This test + # will be auto-skipped instead. + if ! grep -q container= /proc/1/environ; then + # One test needs us to have a small fd limit + ulimit -S -n 1024 + ulimit -H -n 1024 + fi $timeout $t --tap echo "$?" > "$AUTOPKGTEST_TMP/result" ) | sed 's/^/ /'

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: dbus-test-runner

dbus-test-runner (15.04.0+16.10.20160906-0ubuntu1) yakkety; urgency=medium * Adjusting all the waits to be 60 seconds -- Ted Gould <ted@gould.cx> Tue, 06 Sep 2016 14:33:59 +0000 dbus-test-runner (15.04.0+15.10.20151002-0ubuntu1) wily; urgency=medium [ Lars Uebernickel ] * test-param-wait-system: fix race between tasks -- Iain Lane <iain@orangesquash.org.uk> Fri, 02 Oct 2015 17:10:06 +0000 dbus-test-runner (15.04.0+15.04.20150218-0ubuntu2) wily; urgency=medium * debian/tests/control: bustle-pcap has been split out into its own package. Add a test-dep on that. -- Iain Lane <iain@orangesquash.org.uk> Fri, 12 Jun 2015 10:08:11 +0100 dbus-test-runner (15.04.0+15.04.20150218-0ubuntu1) vivid; urgency=medium [ CI Train Bot ] * debian/libdbustest1.symbols: auto-update to released version [ Ted Gould ] * Add function to remove tasks from the service -- CI Train Bot <ci-train-bot@canonical.com> Wed, 18 Feb 2015 03:45:01 +0000 dbus-test-runner (15.04.0+15.04.20150202.3-0ubuntu1) vivid; urgency=medium [ Ubuntu daily release ] * debian/libdbustest1.symbols: auto-update to released version [ Ted Gould ] * Make watching the task use the same bus the task is on -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 02 Feb 2015 17:38:06 +0000 dbus-test-runner (15.04.0+15.04.20150120.1-0ubuntu1) vivid; urgency=low [ David Riebenbauer ] * Bump glib dependency to 2.34 (LP: #1111485) -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 20 Jan 2015 22:26:48 +0000 dbus-test-runner (15.04.0+15.04.20141209-0ubuntu1) vivid; urgency=medium [ Ted Gould ] * Adding support for emulating a system bus * Moving configuration files to the library packages * Add symbols checking to the library [ Ubuntu daily release ] * debian/libdbustest1.symbols: auto-update to released version -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 09 Dec 2014 22:32:31 +0000 dbus-test-runner (14.04.1+14.10.20140908-0ubuntu1) utopic; urgency=low [ Ted Gould ] * Drop gvfs-backends because no one can figure out why it is there. (LP: #1296329) -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 08 Sep 2014 18:24:50 +0000 dbus-test-runner (14.04.1+14.04.20140320-0ubuntu3) utopic; urgency=medium * Add missing test-dep since build-deps from the build-needed restriction might not be available per the autopkgtest spec. - intltool - pkg-config - libdbus-glib-1-dev - python3-dbusmock * debian/test/with-bustle: Run tests with VERBOSE=1 so we get useful information when they fail. -- Iain Lane <iain.lane@canonical.com> Fri, 02 May 2014 15:22:53 +0100 dbus-test-runner (14.04.1+14.04.20140320-0ubuntu2) utopic; urgency=medium * Add build-essential to dep8 dependencies. -- Dimitri John Ledkov <xnox@ubuntu.com> Fri, 02 May 2014 02:48:28 +0100 dbus-test-runner (14.04.1+14.04.20140320-0ubuntu1) trusty; urgency=medium [ Ted Gould ] * Emit properties changed when updating a property * Merge policy and manual test -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 20 Mar 2014 10:49:36 +0000 dbus-test-runner (14.04.0+14.04.20140226-0ubuntu1) trusty; urgency=low [ Ted Gould ] * Grab the bus so we can ensure it closes before starting the next test -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 26 Feb 2014 19:50:28 +0000 dbus-test-runner (14.04.0+14.04.20140217.1-0ubuntu1) trusty; urgency=low [ Charles Kerr ] * fix leaks by always g_free()ing the return value of g_get_current_dir(). [ Ted Gould ] * Make sure to not clear the watcher if it fired. (LP: #1260779) * Support having objects with different interfaces on the same path. * Flushing trunk with a release -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 17 Feb 2014 18:01:09 +0000 dbus-test-runner (14.04.0+14.04.20131126-0ubuntu2) trusty; urgency=medium * Fix test issues in trusty. Patch taken from LP: #1260779. -- Matthias Klose <doko@ubuntu.com> Thu, 19 Dec 2013 10:41:33 +0100 dbus-test-runner (14.04.0+14.04.20131126-0ubuntu1) trusty; urgency=low [ Ted Gould ] * Bumping version and adding DBusMock support [ Michał Sawicz ] * Add Multi-Arch and Vcs-* entries in debian/control. (LP: #1246074) [ Steve Langasek ] * Add Multi-Arch and Vcs-* entries in debian/control. (LP: #1246074) [ Ubuntu daily release ] * Automatic snapshot from revision 69 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 26 Nov 2013 02:04:06 +0000 dbus-test-runner (12.10.2+13.10.20130724-0ubuntu2) trusty; urgency=low * Mark dbus-test-runner Multi-Arch: foreign, and mark libdbustest1* Multi-Arch: same. -- Steve Langasek <steve.langasek@ubuntu.com> Tue, 29 Oct 2013 13:47:43 -0700 dbus-test-runner (12.10.2+13.10.20130724-0ubuntu1) saucy; urgency=low [ Michal Hruby ] * Watch created pipes for the G_IO_HUP event, as when a pipe closes, polling it will return this event. [ Ubuntu daily release ] * Automatic snapshot from revision 65 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 24 Jul 2013 00:01:57 +0000 dbus-test-runner (12.10.2+13.10.20130717-0ubuntu1) saucy; urgency=low [ Alberto Mardegan ] * Propagate the current environment to activated services Do not clear the environment when starting dbus-daemon. This means that the current environment will be available to all the services activated by the daemon, in the same way that it is available to the processes given to the dbus-test-runner command line. . (LP: #1201409) [ Ubuntu daily release ] * Automatic snapshot from revision 63 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 17 Jul 2013 00:01:41 +0000 dbus-test-runner (12.10.2daily13.06.05-0ubuntu1) saucy; urgency=low * Automatic snapshot from revision 61 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 05 Jun 2013 00:02:11 +0000 dbus-test-runner (12.10.2daily13.05.03ubuntu.unity.next-0ubuntu1) raring; urgency=low * Automatic snapshot from revision 60 (ubuntu-unity/next) -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 03 May 2013 00:00:54 +0000 dbus-test-runner (12.10.2daily13.02.26-0ubuntu1) raring; urgency=low * Automatic snapshot from revision 59 -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Tue, 26 Feb 2013 00:01:23 +0000 dbus-test-runner (12.10.2daily13.02.15.1-0ubuntu1) raring; urgency=low [ Mathieu Trudel-Lapierre ] * dbus-test-runner is not killing dbus reliably (LP: #1122948) [ Automatic PS uploader ] * Automatic snapshot from revision 57 -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Fri, 15 Feb 2013 07:49:35 +0000 dbus-test-runner (12.10.2daily13.01.31-0ubuntu1) raring; urgency=low * Automatic snapshot from revision 55 -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Thu, 31 Jan 2013 00:00:54 +0000 dbus-test-runner (12.10.2daily13.01.10-0ubuntu1) raring; urgency=low [ Mathieu Trudel-Lapierre ] * debian/control: - Update style to use commas at the end of dependency lists. - Drop Build-Depends on cdbs. - Add gnome-common to Build-Depends. - Reorganize Build-Depends for clarity. * debian/rules: - Migrate from cdbs to debhelper 9 sequencer. - Override dh_autoreconf to call autogen.sh and not run configure. - Remove unnecessary .la/.a files. * debian/libdbustest1-dev.install: remove debian/tmp from paths. * debian/libdbustest1.install, debian/libdbustest1-dev.install: update paths for the architecture triplets. * debian/control, debian/tests/control, debian/tests/with-bustle: add autopkgtest testing for dbus-test-runner using bustle. [ Didier Roche ] * Automatic snapshot from revision 50 (bootstrap) [ Automatic PS uploader ] * Automatic snapshot from revision 52 -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Thu, 10 Jan 2013 16:12:21 +0000 dbus-test-runner (12.10.1-0ubuntu1) quantal; urgency=low * New upstream release: - Ensure that buffers get flushed even on slow systems. (LP: #1010739) - Add option to wait until task complete. (LP: #1053168) -- Sebastien Bacher <seb128@ubuntu.com> Wed, 03 Oct 2012 22:26:17 +0200 dbus-test-runner (12.10.0-0ubuntu2) quantal; urgency=low * debian/control: - dbus-test-runner Build Depends on dbus -- Adam Stokes <adam.stokes@canonical.com> Thu, 12 Jul 2012 14:49:44 -0400 dbus-test-runner (12.10.0-0ubuntu1) quantal; urgency=low * New upstream release. * debian/control, debian/dbus-test-runner.install, debian/libdbustest1-dev.install, debian/libdbustest1.install: - created new binaries for the shared library * debian/control: - dbus-test-runner Depends on dbus - updated standards version - updated debhelper requirement * debian/compat: updated compat number -- Sebastien Bacher <seb128@ubuntu.com> Thu, 12 Jul 2012 19:39:58 +0200 dbus-test-runner (0.0.5-0ubuntu1) precise; urgency=low [ Ted Gould ] * New upstream release. * Improved test suite and small fixes to enable it * Setting session bus explicitly in default config * Upstream Merge * Fixing the bustle failure test [ Ken VanDine ] * debian/source/format - dropped, 3.0 (quilt) does not play well with packages where we often cherry pick fixes with bzr * debian/patches/disable-bustle-tests.patch: - dropped, merged inline to handle quilt failures * tests/Makefile.am - Disable tests that require bustle -- Ken VanDine <ken.vandine@canonical.com> Tue, 21 Feb 2012 16:19:32 -0500 dbus-test-runner (0.0.4-0ubuntu2) precise; urgency=low * debian/source/format: - Make "3.0 (quilt)" * debian/control: - Drop bustle from Build-Depends (for MIR) - Demote bustle from Depends to Suggests * debian/patches/disable-bustle-tests.patch: - Disable tests that require bustle -- Michael Terry <mterry@ubuntu.com> Fri, 13 Jan 2012 12:38:02 +0100 dbus-test-runner (0.0.4-0ubuntu1) precise; urgency=low * New upstream release. * Maximum time set for test to run * Support waiting for a name before starting a task (LP: #814668) -- Ted Gould <ted@ubuntu.com> Mon, 28 Nov 2011 16:26:45 -0600 dbus-test-runner (0.0.3-0ubuntu3) precise; urgency=low * debian/rules - run tests during package build * debian/control - added build depends for xvfb, gvfs-backends and bustle, needed for running tests - bumped standards version to 3.9.2 -- Ken VanDine <ken.vandine@canonical.com> Mon, 14 Nov 2011 17:02:24 -0500 dbus-test-runner (0.0.3-0ubuntu2) natty; urgency=low * debian/control - Improved package description (LP: #719384) -- Ken VanDine <ken.vandine@canonical.com> Tue, 15 Feb 2011 11:58:04 -0500 dbus-test-runner (0.0.3-0ubuntu1) natty; urgency=low [ Ted Gould ] * New upstream release. * Fixing test suite * Printing more debug information on tasks dying [ Ken VanDine ] * debian/rules - Disable running tests in the package for now, it causes hangs when run headless * debian/control - Changed maintainer to ~ubuntu-desktop -- Ken VanDine <ken.vandine@canonical.com> Fri, 28 Jan 2011 13:27:15 -0500 dbus-test-runner (0.0.2-0ubuntu1~ppa1) natty; urgency=low * New upstream release. * Uhg, not released in a while. It's everything not released. -- Ted Gould <ted@ubuntu.com> Tue, 07 Dec 2010 20:41:19 -0600 dbus-test-runner (0.0.2~bzr16-0ubuntu6) karmic; urgency=low * debian/control: Adding gvfs-backends as a dependency. -- Ted Gould <ted@ubuntu.com> Tue, 19 Jan 2010 09:37:00 -0600 dbus-test-runner (0.0.2~bzr16-0ubuntu5) karmic; urgency=low * Adding in the ability to record using bustle-dbus-watcher * debian/control: Adding a depend on bustle. -- Ted Gould <ted@ubuntu.com> Tue, 08 Dec 2009 14:28:25 -0600 dbus-test-runner (0.0.2~bzr16-0ubuntu4) karmic; urgency=low * Improving the lifecycle management of all of the tasks that are running to improve stability. -- Ted Gould <ted@ubuntu.com> Fri, 04 Dec 2009 15:59:18 -0600 dbus-test-runner (0.0.2~bzr16-0ubuntu3) karmic; urgency=low * Forcibly killing the dbus-daemon -- Ted Gould <ted@ubuntu.com> Thu, 03 Dec 2009 12:40:51 -0600 dbus-test-runner (0.0.2~bzr16-0ubuntu2) karmic; urgency=low * Karmic, whoo! hoo! -- Ted Gould <ted@ubuntu.com> Fri, 17 Jul 2009 21:39:53 -0500 dbus-test-runner (0.0.2~bzr16-0ubuntu1) jaunty; urgency=low * Update from trunk * Support for --parameter to pass parameters to tasks. -- Ted Gould <ted@ubuntu.com> Wed, 17 Jun 2009 16:28:02 -0500 dbus-test-runner (0.0.2~bzr14-0ubuntu2) jaunty; urgency=low * Version bump for PPA. -- Ted Gould <ted@ubuntu.com> Fri, 05 Jun 2009 16:59:29 -0500 dbus-test-runner (0.0.2~bzr14-0ubuntu1) jaunty; urgency=low * Handles environment variables more sensably. * Now has better default config file management. And puts that in the help string. -- Ted Gould <ted@ubuntu.com> Fri, 05 Jun 2009 16:56:08 -0500 dbus-test-runner (0.0.1-0ubuntu1) jaunty; urgency=low * First packaging version. -- Ted Gould <ted@ubuntu.com> Wed, 22 Apr 2009 23:34:21 -0500

Modifications :
  1. Download patch tests/test-libdbustest-mock.c

    --- 15.04.0~bzr87+repack1-2/tests/test-libdbustest-mock.c 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/tests/test-libdbustest-mock.c 2016-09-06 14:33:36.000000000 +0000 @@ -22,20 +22,22 @@ process_mainloop (const guint delay) g_main_loop_unref (temploop); } -#define SESSION_MAX_WAIT 10 +#define SESSION_MAX_WAIT 100 /* * Waiting until the session bus shuts down */ +GDBusConnection * wait_for_close_ptr = NULL; static void wait_for_connection_close (GDBusConnection *connection) { - g_object_add_weak_pointer(G_OBJECT(connection), (gpointer) &connection); + wait_for_close_ptr = connection; + g_object_add_weak_pointer(G_OBJECT(connection), (gpointer) &wait_for_close_ptr); g_object_unref (connection); int wait_count; - for (wait_count = 0; connection != NULL && wait_count < SESSION_MAX_WAIT; wait_count++) + for (wait_count = 0; wait_for_close_ptr != NULL && wait_count < SESSION_MAX_WAIT; wait_count++) { process_mainloop(200); } @@ -61,6 +63,9 @@ test_basic (void) DbusTestDbusMock * mock = dbus_test_dbus_mock_new("foo.test"); g_assert(mock != NULL); + dbus_test_service_add_task(service, DBUS_TEST_TASK(mock)); + dbus_test_service_start_tasks(service); + gchar * dbusname = NULL; g_object_get(mock, "dbus-name", &dbusname, NULL); g_assert(g_strcmp0(dbusname, "foo.test") == 0); @@ -71,9 +76,6 @@ test_basic (void) g_assert(g_strcmp0(exec, "python3") == 0); g_free(exec); - dbus_test_service_add_task(service, DBUS_TEST_TASK(mock)); - dbus_test_service_start_tasks(service); - g_assert(dbus_test_task_get_state(DBUS_TEST_TASK(mock)) == DBUS_TEST_TASK_STATE_RUNNING); /* check setup */ @@ -522,6 +524,75 @@ test_running (void) } void +test_running_system (void) +{ + DbusTestService * service = dbus_test_service_new(NULL); + g_assert(service != NULL); + dbus_test_service_set_bus(service, DBUS_TEST_SERVICE_BUS_SYSTEM); + + dbus_test_service_set_conf_file(service, SESSION_CONF); + + DbusTestDbusMock * mock = dbus_test_dbus_mock_new("foo.test"); + g_assert(mock != NULL); + dbus_test_task_set_bus(DBUS_TEST_TASK(mock), DBUS_TEST_SERVICE_BUS_SYSTEM); + + /* Startup the mock */ + dbus_test_service_add_task(service, DBUS_TEST_TASK(mock)); + dbus_test_service_start_tasks(service); + + GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, NULL); + g_dbus_connection_set_exit_on_close(bus, FALSE); + + /* Add the object */ + DbusTestDbusMockObject * obj = dbus_test_dbus_mock_get_object(mock, "/test", "foo.test.interface", NULL); + g_assert(obj != NULL); + + g_assert(dbus_test_dbus_mock_object_add_method(mock, obj, + "method1", + G_VARIANT_TYPE("s"), + G_VARIANT_TYPE("s"), + "ret = 'test'", + NULL)); + + GVariant * propret = NULL; + GVariant * testvar = NULL; + GError * error = NULL; + + /* Check method */ + propret = g_dbus_connection_call_sync(bus, + "foo.test", + "/test", + "foo.test.interface", + "method1", + g_variant_new("(s)", "testin"), + G_VARIANT_TYPE("(s)"), + G_DBUS_CALL_FLAGS_NONE, + -1, + NULL, + &error); + + if (error != NULL) { + g_error("Unable to call method1: %s", error->message); + g_error_free(error); + } + + g_assert(propret != NULL); + testvar = g_variant_new_string("test"); + testvar = g_variant_new_tuple(&testvar, 1); + g_variant_ref_sink(testvar); + g_assert(g_variant_equal(propret, testvar)); + g_variant_unref(testvar); + + g_variant_unref(propret); + + /* Clean up */ + g_object_unref(mock); + g_object_unref(service); + + wait_for_connection_close(bus); +} + +void test_interfaces (void) { DbusTestService * service = dbus_test_service_new(NULL); @@ -637,6 +708,7 @@ test_libdbustest_mock_suite (void) g_test_add_func ("/libdbustest/mock/methods", test_methods); g_test_add_func ("/libdbustest/mock/signals", test_signals); g_test_add_func ("/libdbustest/mock/running", test_running); + g_test_add_func ("/libdbustest/mock/running-system", test_running_system); g_test_add_func ("/libdbustest/mock/interfaces", test_interfaces); return;
  2. Download patch .bzrignore

    --- 15.04.0~bzr87+repack1-2/.bzrignore 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/.bzrignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -dbus-test-runner -compile -dbus-test-runner-*.tar.gz -m4 -tests/test-ignore -tests/test-ignore-second -tests/test-invert -tests/test-invert-second -tests/test-manytask -tests/test-param -tests/test-simple -tests/test-output -tests/testcat.output.cat1.filtered.txt -tests/testcat.output.cat1.txt -tests/testcat.output.cat2.filtered.txt -tests/testcat.output.cat2.txt -tests/testcat.output.txt -tests/test-bustle -tests/test-bustle.bustle -tests/test-bustle.filtered -tests/test-bustle-data -tests/test-bustle-data.bustle -tests/test-timeout -test-check-name -test-own-name -test-wait-for -test-wait-output.filtered -test-wait-output.output -test-wait-output -test-wait-output.output-only
  3. Download patch debian/tests/control

    --- 15.04.0~bzr87+repack1-2/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/tests/control 2016-09-21 21:07:57.000000000 +0000 @@ -0,0 +1,3 @@ +Tests: with-bustle +Depends: dbus-test-runner, bustle, bustle-pcap, build-essential, intltool, pkg-config, libdbus-glib-1-dev, python3-dbusmock +Restrictions: build-needed
  4. Download patch .pc/0001_spelling-error.patch/src/dbus-test-runner.c
  5. Download patch debian/patches/0001_spelling-error.patch

    --- 15.04.0~bzr87+repack1-2/debian/patches/0001_spelling-error.patch 2015-01-20 13:32:39.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/patches/0001_spelling-error.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -Description: Fix typo in dbus-test-runner options overview -Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - ---- a/src/dbus-test-runner.c -+++ b/src/dbus-test-runner.c -@@ -200,7 +200,7 @@ - static gchar * bustle_datafile = NULL; - - static GOptionEntry general_options[] = { -- {"dbus-daemon", 0, 0, G_OPTION_ARG_FILENAME, &dbus_daemon, "Path to the DBus deamon to use. Defaults to 'dbus-daemon'.", "executable"}, -+ {"dbus-daemon", 0, 0, G_OPTION_ARG_FILENAME, &dbus_daemon, "Path to the DBus daemon to use. Defaults to 'dbus-daemon'.", "executable"}, - {"dbus-config", 'd', 0, G_OPTION_ARG_FILENAME, &dbus_configfile, "Configuration file for newly created DBus server. Defaults to '" DEFAULT_SESSION_CONF "'.", "config_file"}, - {"bustle-monitor", 0, 0, G_OPTION_ARG_FILENAME, &bustle_cmd, "Path to the Bustle DBus Monitor to use. Defaults to 'bustle-dbus-monitor'.", "executable"}, - {"bustle-data", 'b', 0, G_OPTION_ARG_FILENAME, &bustle_datafile, "A file to write out data from the bustle logger to.", "data_file"},
  6. Download patch debian/rules

    --- 15.04.0~bzr87+repack1-2/debian/rules 2015-01-20 14:54:34.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/rules 2016-09-21 21:07:57.000000000 +0000 @@ -2,14 +2,6 @@ export DPKG_GENSYMBOLS_CHECK_LEVEL=4 -NULL = -PKD = $(abspath $(dir $(MAKEFILE_LIST))) -PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source)) -UVER = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};') -DTYPE = +repack1 -VER ?= $(subst $(DTYPE),,$(UVER)) -REV = $(shell echo $(VER) | perl -ne 'print "$$1" if m/(?:git|svn|hg|bzr)(\d+)/;') - LDFLAGS += -Wl,-z,defs -Wl,--as-needed %: @@ -21,9 +13,6 @@ override_dh_autoreconf: override_dh_auto_configure: dh_auto_configure -- --disable-scrollkeeper -override_dh_installchangelogs: - dh_installchangelogs ChangeLog.bzr - override_dh_auto_test: VERBOSE=1 dh_auto_test @@ -31,26 +20,3 @@ override_dh_install: find debian/ -name \*.la -delete find debian/ -name \*.a -delete dh_install --fail-missing - -## http://wiki.debian.org/onlyjob/get-orig-source -.PHONY: get-orig-source -get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE)) - @ - -## checkout from bzr (add "bzr (>= 2.6.0~bzr6520)" to Build-Depends, see #666496) -UURL = lp:dbus-test-runner -$(PKG)_$(VER)$(DTYPE).orig.tar.xz: - $(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..)) - bzr checkout --hardlink --lightweight --revision=$(REV) $(UURL) $(PKG)-$(VER) \ - || $(RM) -r $(PKG)-$(VER) - @echo "# Creating ChangeLog..." - cd $(PKG)-$(VER) && bzr log --log-format=line > ChangeLog.bzr - @echo "# Modifying..." - cd $(PKG)-$(VER) && rm -Rfv \ - .bzr-builddeb \ - .bzr \ - $(NULL) - @echo "# Packing..." - find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \ - | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \ - && $(RM) -r "$(PKG)-$(VER)"
  7. Download patch .pc/.version

    --- 15.04.0~bzr87+repack1-2/.pc/.version 2016-09-21 21:07:57.756027582 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/.pc/.version 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -2
  8. Download patch debian/libdbustest1.symbols

    --- 15.04.0~bzr87+repack1-2/debian/libdbustest1.symbols 2015-01-20 14:54:34.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/libdbustest1.symbols 2016-09-21 21:07:57.000000000 +0000 @@ -1,49 +1,51 @@ libdbustest.so.1 libdbustest1 #MINVER# - dbus_test_bustle_get_type@Base 15.04.0~bzr87 - dbus_test_bustle_new@Base 15.04.0~bzr87 - dbus_test_bustle_set_executable@Base 15.04.0~bzr87 - dbus_test_dbus_mock_get_object@Base 15.04.0~bzr87 - dbus_test_dbus_mock_get_type@Base 15.04.0~bzr87 - dbus_test_dbus_mock_new@Base 15.04.0~bzr87 - dbus_test_dbus_mock_object_add_method@Base 15.04.0~bzr87 - dbus_test_dbus_mock_object_add_property@Base 15.04.0~bzr87 - dbus_test_dbus_mock_object_check_method_call@Base 15.04.0~bzr87 - dbus_test_dbus_mock_object_clear_method_calls@Base 15.04.0~bzr87 - dbus_test_dbus_mock_object_emit_signal@Base 15.04.0~bzr87 - dbus_test_dbus_mock_object_get_method_calls@Base 15.04.0~bzr87 - dbus_test_dbus_mock_object_update_property@Base 15.04.0~bzr87 - dbus_test_process_append_param@Base 15.04.0~bzr87 - dbus_test_process_get_pid@Base 15.04.0~bzr87 - dbus_test_process_get_type@Base 15.04.0~bzr87 - dbus_test_process_new@Base 15.04.0~bzr87 - dbus_test_service_add_task@Base 15.04.0~bzr87 - dbus_test_service_add_task_with_priority@Base 15.04.0~bzr87 - dbus_test_service_get_type@Base 15.04.0~bzr87 - dbus_test_service_new@Base 15.04.0~bzr87 - dbus_test_service_run@Base 15.04.0~bzr87 - dbus_test_service_set_bus@Base 15.04.0~bzr87 - dbus_test_service_set_conf_file@Base 15.04.0~bzr87 - dbus_test_service_set_daemon@Base 15.04.0~bzr87 - dbus_test_service_set_keep_environment@Base 15.04.0~bzr87 - dbus_test_service_start_tasks@Base 15.04.0~bzr87 - dbus_test_service_stop@Base 15.04.0~bzr87 - dbus_test_task_get_bus@Base 15.04.0~bzr87 - dbus_test_task_get_name@Base 15.04.0~bzr87 - dbus_test_task_get_return@Base 15.04.0~bzr87 - dbus_test_task_get_state@Base 15.04.0~bzr87 - dbus_test_task_get_type@Base 15.04.0~bzr87 - dbus_test_task_get_wait_finished@Base 15.04.0~bzr87 - dbus_test_task_get_wait_for@Base 15.04.0~bzr87 - dbus_test_task_new@Base 15.04.0~bzr87 - dbus_test_task_passed@Base 15.04.0~bzr87 - dbus_test_task_print@Base 15.04.0~bzr87 - dbus_test_task_run@Base 15.04.0~bzr87 - dbus_test_task_set_bus@Base 15.04.0~bzr87 - dbus_test_task_set_name@Base 15.04.0~bzr87 - dbus_test_task_set_name_spacing@Base 15.04.0~bzr87 - dbus_test_task_set_return@Base 15.04.0~bzr87 - dbus_test_task_set_wait_finished@Base 15.04.0~bzr87 - dbus_test_task_set_wait_for@Base 15.04.0~bzr87 - dbus_test_watchdog_add_pid@Base 15.04.0~bzr87 - dbus_test_watchdog_get_type@Base 15.04.0~bzr87 - dbus_test_watchdog_ping@Base 15.04.0~bzr87 + dbus_test_bustle_get_type@Base 15.04.0+15.04.20141209 + dbus_test_bustle_new@Base 15.04.0+15.04.20141209 + dbus_test_bustle_set_executable@Base 15.04.0+15.04.20141209 + dbus_test_dbus_mock_get_object@Base 15.04.0+15.04.20141209 + dbus_test_dbus_mock_get_type@Base 15.04.0+15.04.20141209 + dbus_test_dbus_mock_new@Base 15.04.0+15.04.20141209 + dbus_test_dbus_mock_object_add_method@Base 15.04.0+15.04.20141209 + dbus_test_dbus_mock_object_add_property@Base 15.04.0+15.04.20141209 + dbus_test_dbus_mock_object_check_method_call@Base 15.04.0+15.04.20141209 + dbus_test_dbus_mock_object_clear_method_calls@Base 15.04.0+15.04.20141209 + dbus_test_dbus_mock_object_emit_signal@Base 15.04.0+15.04.20141209 + dbus_test_dbus_mock_object_get_method_calls@Base 15.04.0+15.04.20141209 + dbus_test_dbus_mock_object_update_property@Base 15.04.0+15.04.20141209 + dbus_test_process_append_param@Base 15.04.0+15.04.20141209 + dbus_test_process_get_pid@Base 15.04.0+15.04.20141209 + dbus_test_process_get_type@Base 15.04.0+15.04.20141209 + dbus_test_process_new@Base 15.04.0+15.04.20141209 + dbus_test_service_add_task@Base 15.04.0+15.04.20141209 + dbus_test_service_add_task_with_priority@Base 15.04.0+15.04.20141209 + dbus_test_service_get_type@Base 15.04.0+15.04.20141209 + dbus_test_service_new@Base 15.04.0+15.04.20141209 + dbus_test_service_remove_task@Base 15.04.0+15.04.20150218 + dbus_test_service_run@Base 15.04.0+15.04.20141209 + dbus_test_service_set_bus@Base 15.04.0+15.04.20141209 + dbus_test_service_set_conf_file@Base 15.04.0+15.04.20141209 + dbus_test_service_set_daemon@Base 15.04.0+15.04.20141209 + dbus_test_service_set_keep_environment@Base 15.04.0+15.04.20141209 + dbus_test_service_start_tasks@Base 15.04.0+15.04.20141209 + dbus_test_service_stop@Base 15.04.0+15.04.20141209 + dbus_test_task_get_bus@Base 15.04.0+15.04.20141209 + dbus_test_task_get_name@Base 15.04.0+15.04.20141209 + dbus_test_task_get_return@Base 15.04.0+15.04.20141209 + dbus_test_task_get_state@Base 15.04.0+15.04.20141209 + dbus_test_task_get_type@Base 15.04.0+15.04.20141209 + dbus_test_task_get_wait_finished@Base 15.04.0+15.04.20141209 + dbus_test_task_get_wait_for@Base 15.04.0+15.04.20141209 + dbus_test_task_new@Base 15.04.0+15.04.20141209 + dbus_test_task_passed@Base 15.04.0+15.04.20141209 + dbus_test_task_print@Base 15.04.0+15.04.20141209 + dbus_test_task_run@Base 15.04.0+15.04.20141209 + dbus_test_task_set_bus@Base 15.04.0+15.04.20141209 + dbus_test_task_set_name@Base 15.04.0+15.04.20141209 + dbus_test_task_set_name_spacing@Base 15.04.0+15.04.20141209 + dbus_test_task_set_return@Base 15.04.0+15.04.20141209 + dbus_test_task_set_wait_finished@Base 15.04.0+15.04.20141209 + dbus_test_task_set_wait_for@Base 15.04.0+15.04.20141209 + dbus_test_task_set_wait_for_bus@Base 15.04.0+15.04.20150202.3 + dbus_test_watchdog_add_pid@Base 15.04.0+15.04.20141209 + dbus_test_watchdog_get_type@Base 15.04.0+15.04.20141209 + dbus_test_watchdog_ping@Base 15.04.0+15.04.20141209
  9. Download patch debian/control

    --- 15.04.0~bzr87+repack1-2/debian/control 2015-06-16 08:08:11.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/control 2016-09-21 21:07:57.000000000 +0000 @@ -1,15 +1,16 @@ Source: dbus-test-runner Section: gnome Priority: optional -Maintainer: Mike Gabriel <sunweaver@debian.org> +Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> Build-Depends: debhelper (>= 9), dh-autoreconf, gnome-common, xvfb, libdbus-glib-1-dev, + libglib2.0-dev (>= 2.34.0), dbus, python3-dbusmock, -Standards-Version: 3.9.6 +Standards-Version: 3.9.3 Homepage: https://launchpad.net/dbus-test-runner XS-Testsuite: autopkgtest @@ -23,9 +24,6 @@ Suggests: bustle, Description: Runs tests under a new DBus session A simple little executable for running a couple of programs under a new DBus session. - . - Use this DBus tool for unit testing of code that accesses DBus at - runtime. Package: libdbustest1 Section: libs @@ -34,13 +32,12 @@ Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, Recommends: python3-dbusmock, -Breaks: dbus-test-runner (<< 15.04.0~), -Replaces: dbus-test-runner (<< 15.04.0~), -Description: Runs tests under a new DBus session (shared library) +Conflicts: dbus-test-runner (<< 15.04.0) +Description: Runs tests under a new DBus session A simple little executable for running a couple of programs under a new DBus session. . - This package contains the shared libraries. + This package contains shared libraries. Package: libdbustest1-dev Section: libdevel @@ -48,10 +45,10 @@ Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, - libglib2.0-dev, + libglib2.0-dev (>= 2.34.0), libdbustest1 (= ${binary:Version}), -Description: Runs tests under a new DBus session (development files) +Description: Runs tests under a new DBus session A simple little executable for running a couple of programs under a new DBus session. . - This package contains files that are needed for development. + This package contains files that are needed to build.
  10. Download patch libdbustest/leash.c

    --- 15.04.0~bzr87+repack1-2/libdbustest/leash.c 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/libdbustest/leash.c 2016-09-06 14:33:44.000000000 +0000 @@ -44,7 +44,7 @@ restart_handler (void) g_source_remove(timer); } - timer = g_timeout_add_seconds(30, destroy_everyone, NULL); + timer = g_timeout_add_seconds(60, destroy_everyone, NULL); return; }
  11. Download patch configure.ac

    --- 15.04.0~bzr87+repack1-2/configure.ac 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/configure.ac 2016-09-06 14:33:36.000000000 +0000 @@ -25,7 +25,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RU # Dependencies ########################### -GLIB_REQUIRED_VERSION=2.12 +GLIB_REQUIRED_VERSION=2.34 DBUS_REQUIRED_VERSION=0.76 GIO_REQUIRED_VERSION=2.30
  12. Download patch .pc/applied-patches

    --- 15.04.0~bzr87+repack1-2/.pc/applied-patches 2016-09-21 21:07:57.760027690 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0001_spelling-error.patch
  13. Download patch .pc/.quilt_series

    --- 15.04.0~bzr87+repack1-2/.pc/.quilt_series 2016-09-21 21:07:57.756027582 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/.pc/.quilt_series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -series
  14. Download patch libdbustest/service.c

    --- 15.04.0~bzr87+repack1-2/libdbustest/service.c 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/libdbustest/service.c 2016-09-06 14:33:36.000000000 +0000 @@ -675,6 +675,45 @@ dbus_test_service_add_task_with_priority return; } +/** + * @service: A #DbusTestService + * @task: Task to remove + * + * Removes a task from those managed by the service, it won't + * be checked for status or managed anymore by the service. + * + * Return Value: Whether the task was found and removed, FALSE if not found + */ +gboolean +dbus_test_service_remove_task (DbusTestService * service, DbusTestTask * task) +{ + g_return_val_if_fail(DBUS_TEST_IS_SERVICE(service), FALSE); + g_return_val_if_fail(DBUS_TEST_IS_TASK(task), FALSE); + + guint count = 0; + count += g_queue_remove_all(&service->priv->tasks_first, task); + count += g_queue_remove_all(&service->priv->tasks_normal, task); + count += g_queue_remove_all(&service->priv->tasks_last, task); + + /* Checking the count here so that we can generate a warning. Guessing that + this actually never happens, but it's easy to check */ + if (count > 1) { + g_warning("Task '%s' was added to the service %d times!", dbus_test_task_get_name(task), count); + } + + /* We're going to disconnect here even if count is zero because, well, it + shouldn't hurt in that case and might be good for us. */ + g_signal_handlers_disconnect_by_data(task, service); + + /* If we've added it multiple times, we made multiple references, fix it. */ + guint i; + for (i = 0; i < count; i++) { + g_object_unref(task); + } + + return count > 0; +} + void dbus_test_service_set_daemon (DbusTestService * service, const gchar * daemon) {
  15. Download patch debian/watch

    --- 15.04.0~bzr87+repack1-2/debian/watch 2015-01-20 12:51:19.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/watch 2016-09-21 21:07:57.000000000 +0000 @@ -1,3 +1,2 @@ version=3 -opts=dversionmangle=s/\+repack1// \ http://launchpad.net/dbus-test-runner/+download .*/dbus-test-runner-([0-9.]+)\.tar\.gz
  16. Download patch libdbustest/service.h

    --- 15.04.0~bzr87+repack1-2/libdbustest/service.h 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/libdbustest/service.h 2016-09-06 14:33:36.000000000 +0000 @@ -72,6 +72,7 @@ void dbus_test_service_stop (DbusTestSer void dbus_test_service_add_task (DbusTestService * service, DbusTestTask * task); void dbus_test_service_add_task_with_priority (DbusTestService * service, DbusTestTask * task, DbusTestServicePriority prio); +gboolean dbus_test_service_remove_task (DbusTestService * service, DbusTestTask * task); void dbus_test_service_set_daemon (DbusTestService * service, const gchar * daemon); void dbus_test_service_set_conf_file (DbusTestService * service, const gchar * conffile);
  17. Download patch debian/patches/series

    --- 15.04.0~bzr87+repack1-2/debian/patches/series 2015-01-20 13:31:08.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -0001_spelling-error.patch
  18. Download patch tests/Makefile.am

    --- 15.04.0~bzr87+repack1-2/tests/Makefile.am 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/tests/Makefile.am 2016-09-06 14:33:36.000000000 +0000 @@ -120,6 +120,12 @@ test-param-only-wait: Makefile.am @chmod +x $@ XFAIL_TESTS += test-param-only-wait +TESTS += test-param-wait-system +test-param-wait-system: Makefile.am test-own-name + @echo "#!/bin/sh" > $@ + @echo $(DBUS_RUNNER) --bus-type=system --task ls --task-bus=system --wait-for org.test.test --task $(builddir)/test-own-name --parameter --system --parameter org.test.test --ignore-return --task-bus=system >> $@ + @chmod +x $@ + TESTS += test-param-multi-wait test-param-multi-wait: Makefile.am @echo "#!/bin/sh" > $@
  19. Download patch libdbustest/watchdog.c

    --- 15.04.0~bzr87+repack1-2/libdbustest/watchdog.c 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/libdbustest/watchdog.c 2016-09-06 14:33:44.000000000 +0000 @@ -78,7 +78,7 @@ dbus_test_watchdog_add_pid (DbusTestWatc GError * error = NULL; - /* Spawn the watchdog, we now have 30 secs */ + /* Spawn the watchdog, we now have 60 secs */ g_spawn_async (NULL, /* cwd */ argv, NULL, /* env */
  20. Download patch debian/tests/with-bustle

    --- 15.04.0~bzr87+repack1-2/debian/tests/with-bustle 1970-01-01 00:00:00.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/tests/with-bustle 2016-09-21 21:07:57.000000000 +0000 @@ -0,0 +1,6 @@ +#!/bin/sh + +set -e + +./configure +make check VERBOSE=1
  21. Download patch debian/dbus-test-runner.manpages

    --- 15.04.0~bzr87+repack1-2/debian/dbus-test-runner.manpages 2015-01-20 13:45:22.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/dbus-test-runner.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/man/dbus-test-runner.1 \ No newline at end of file
  22. Download patch src/dbus-test-runner.c

    --- 15.04.0~bzr87+repack1-2/src/dbus-test-runner.c 2016-09-21 21:07:57.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/src/dbus-test-runner.c 2016-09-06 14:33:44.000000000 +0000 @@ -24,7 +24,7 @@ with this program. If not, see <http:// #include <libdbustest/dbus-test.h> static DbusTestServiceBus bus_type = DBUS_TEST_SERVICE_BUS_SESSION; -static gint max_wait = 30; +static gint max_wait = 60; static gboolean keep_env = FALSE; static DbusTestProcess * last_task = NULL; static DbusTestService * service = NULL; @@ -200,7 +200,7 @@ static gchar * bustle_cmd = NULL; static gchar * bustle_datafile = NULL; static GOptionEntry general_options[] = { - {"dbus-daemon", 0, 0, G_OPTION_ARG_FILENAME, &dbus_daemon, "Path to the DBus daemon to use. Defaults to 'dbus-daemon'.", "executable"}, + {"dbus-daemon", 0, 0, G_OPTION_ARG_FILENAME, &dbus_daemon, "Path to the DBus deamon to use. Defaults to 'dbus-daemon'.", "executable"}, {"dbus-config", 'd', 0, G_OPTION_ARG_FILENAME, &dbus_configfile, "Configuration file for newly created DBus server. Defaults to '" DEFAULT_SESSION_CONF "'.", "config_file"}, {"bustle-monitor", 0, 0, G_OPTION_ARG_FILENAME, &bustle_cmd, "Path to the Bustle DBus Monitor to use. Defaults to 'bustle-dbus-monitor'.", "executable"}, {"bustle-data", 'b', 0, G_OPTION_ARG_FILENAME, &bustle_datafile, "A file to write out data from the bustle logger to.", "data_file"},
  23. Download patch debian/man/dbus-test-runner.1

    --- 15.04.0~bzr87+repack1-2/debian/man/dbus-test-runner.1 2015-01-20 14:03:22.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/man/dbus-test-runner.1 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -'\" -*- coding: utf-8 -*- -.if \n(.g .ds T< \\FC -.if \n(.g .ds T> \\F[\n[.fam]] -.de URL -\\$2 \(la\\$1\(ra\\$3 -.. -.if \n(.g .mso www.tmac -.TH dbus-test-runner 1 "Jan 2015" "Version 15.04.20141209" "Development" -.SH NAME -dbus-test-runner \- run multiple tasks under an independent DBus session bus -.SH SYNOPSIS -'nh -.fi -.ad l -\fBdbus-test-runner\fR \kx -.if (\nx>(\n(.l/2)) .nr x (\n(.l/5) -'in \n(.iu+\nxu -[ -\fIoptions\fR -] -'in \n(.iu-\nxu -.ad b -'hy -.SH DESCRIPTION -\fBdbus-test-runner\fR is a simple little executable for running a couple of programs under a new DBus session. -.PP -Use this DBus tool for unit testing of code that accesses DBus at runtime. -.SH HELP OPTIONS -\fBdbus-test-runner\fR accepts the following help options on the command line: -.TP -\*(T<\fB\-h, \-\-help\fR\*(T> -Display a short help text with application and help command line options and exit. -.TP -\*(T<\fB\-\-help\-all\fR\*(T> -Display the full list of available command line options (help, task control, application) and exit. -.TP -\*(T<\fB\-\-help\-task\-control\fR\*(T> -Display options that are used to control how the task is handled by the test runner. - -.SH TASK CONTROL OPTIONS -\fBdbus-test-runner\fR accepts the following task control options on the command line: -.TP -\*(T<\fB\-t, \-\-task=<executable>\fR\*(T> -Defines a new task to run under our private DBus session. -.TP -\*(T<\fB\-n, \-\-task-name=<name>\fR\*(T> -A string to label output from the previously defined task. Defaults to taskN. -.TP -\*(T<\fB\-\-task-bus={session|system|both}\fR\*(T> -Configures which bus the task expects to connect to. Default: both -.TP -\*(T<\fB\-r, \-\-ignore\-return\fR\*(T> -Do not use the return value of the task to calculate whether the test passes or fails. -.TP -\*(T<\fB\-i, \-\-invert\return\fR\*(T> -Invert the return value of the task before calculating whether the test passes or fails. -.TP -\*(T<\fB\-p, \-\-parameter\fR\*(T> -Add a parameter to the call of this utility. May be called as many times as you'd like. -.TP -\*(T<\fB\-f, \-\-wait-for=<dbus-name>\fR\*(T> -A dbus-name that should appear on the bus before this task is started -.TP -\*(T<\fB\-c, \-\-wait\-until\-complete\fR\*(T> -Signal that we should wait until this task exits even if we don't need the return value - -.SH APPLICATION OPTIONS -\fBdbus-test-runner\fR accepts the following application options on the command line: -.TP -\*(T<\fB\-\-dbus\-daemon=<executable>\fR\*(T> -Path to the DBus daemon to use. Defaults to 'dbus-daemon'. -.TP -\*(T<\fB\-d, \-\-dbus\-config=<config_file>\fR\*(T> -Configuration file for newly created DBus server. Defaults to '/usr/share/dbus-test-runner/session.conf'. -.TP -\*(T<\fB\-\-bustle\-monitor=<executable>\fR\*(T> -Path to the Bustle DBus Monitor to use. Defaults to 'bustle-dbus-monitor'. -.TP -\*(T<\fB\-b, \-\-bustle\-data=<data_file>\fR\*(T> -A file to write out data from the bustle logger to. -.TP -\*(T<\fB\-m, \-\-max\-wait=<seconds>\fR\*(T> -The maximum amount of time the test runner will wait for the test to complete. Default is 30 seconds. -.TP -\*(T<\fB\-\-keep\-env\fR\*(T> -Whether to propagate the execution environment to the dbus-server and all the services activated by it. By default the environment is cleared. -.TP -\*(T<\fB\-\-bus\-type={session|system|both}\fR\*(T> -Configures which buses are represented by the tool to the tasks. Default: session - -.SH "SEE ALSO" -\fBhttp://launchpad.net/dbus-test-runner\fR -.SH AUTHOR -This manual has been written for the Debian project by -Mike Gabriel <mike.gabriel@das-netzwerkteam.de> and may be used by others.
  24. Download patch .pc/.quilt_patches

    --- 15.04.0~bzr87+repack1-2/.pc/.quilt_patches 2016-09-21 21:07:57.756027582 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/.pc/.quilt_patches 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -debian/patches
  25. Download patch libdbustest/task.c

    --- 15.04.0~bzr87+repack1-2/libdbustest/task.c 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/libdbustest/task.c 2016-09-06 14:33:36.000000000 +0000 @@ -28,6 +28,7 @@ struct _DbusTestTaskPrivate { DbusTestTaskReturn return_type; gchar * wait_for; + DbusTestServiceBus wait_for_bus; guint wait_task; gchar * name; @@ -93,6 +94,7 @@ dbus_test_task_init (DbusTestTask *self) self->priv->return_type = DBUS_TEST_TASK_RETURN_NORMAL; self->priv->wait_for = NULL; + self->priv->wait_for_bus = DBUS_TEST_SERVICE_BUS_BOTH; self->priv->wait_task = 0; self->priv->name = g_strdup_printf("task-%d", task_count++); @@ -187,15 +189,21 @@ dbus_test_task_set_name_spacing (DbusTes return; } - void dbus_test_task_set_wait_for (DbusTestTask * task, const gchar * dbus_name) { + return dbus_test_task_set_wait_for_bus(task, dbus_name, DBUS_TEST_SERVICE_BUS_BOTH); +} + +void +dbus_test_task_set_wait_for_bus (DbusTestTask * task, const gchar * dbus_name, DbusTestServiceBus bus) +{ g_return_if_fail(DBUS_TEST_IS_TASK(task)); if (task->priv->wait_for != NULL) { g_free(task->priv->wait_for); task->priv->wait_for = NULL; + task->priv->wait_for_bus = DBUS_TEST_SERVICE_BUS_BOTH; } if (dbus_name == NULL) { @@ -203,6 +211,7 @@ dbus_test_task_set_wait_for (DbusTestTas } task->priv->wait_for = g_strdup(dbus_name); + task->priv->wait_for_bus = bus; return; } @@ -293,7 +302,13 @@ dbus_test_task_run (DbusTestTask * task) /* We're going to process the waiting at this level if we've been asked to do so */ if (task->priv->wait_for != NULL) { - task->priv->wait_task = g_bus_watch_name(G_BUS_TYPE_SESSION, + GBusType bustype = G_BUS_TYPE_SESSION; + if (task->priv->wait_for_bus == DBUS_TEST_SERVICE_BUS_BOTH && + task->priv->preferred_bus == DBUS_TEST_SERVICE_BUS_SYSTEM) { + bustype = G_BUS_TYPE_SYSTEM; + } + + task->priv->wait_task = g_bus_watch_name(bustype, task->priv->wait_for, G_BUS_NAME_WATCHER_FLAGS_NONE, wait_for_found,
  26. Download patch libdbustest/dbus-mock.c

    --- 15.04.0~bzr87+repack1-2/libdbustest/dbus-mock.c 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/libdbustest/dbus-mock.c 2016-09-06 14:33:36.000000000 +0000 @@ -145,9 +145,6 @@ dbus_test_dbus_mock_init (DbusTestDbusMo static void constructed (GObject * object) { - DbusTestDbusMock * self = DBUS_TEST_DBUS_MOCK(object); - const gchar * paramval = NULL; - if (mock_cnt == 0) { dbus_test_task_set_name(DBUS_TEST_TASK(object), "DBusMock"); } else { @@ -157,27 +154,6 @@ constructed (GObject * object) } mock_cnt++; - /* Execute: python3 -m dbusmock $name / com.canonical.DbusTest.DbusMock */ - g_object_set(object, "executable", "python3", NULL); - - GArray * params = g_array_new(TRUE, TRUE, sizeof(gchar *)); - /* NOTE: No free func, none of the memory is managed by the array */ - - paramval = "-m"; g_array_append_val(params, paramval); - paramval = "dbusmock"; g_array_append_val(params, paramval); - - /* If we're set for system, go there, otherwise default to session */ - if (dbus_test_task_get_bus(DBUS_TEST_TASK(self)) == DBUS_TEST_SERVICE_BUS_SYSTEM) { - paramval = "-s"; g_array_append_val(params, paramval); - } - - g_array_append_val(params, self->priv->name); - paramval = "/"; g_array_append_val(params, paramval); - paramval = "com.canonical.DbusTest.DbusMock"; g_array_append_val(params, paramval); - - g_object_set(object, "parameters", params, NULL); - g_array_unref(params); - return; } @@ -446,6 +422,34 @@ got_name_owner (GObject * obj, G_GNUC_UN return; } +/* Configure the executable and parameters for the mock */ +static void +configure_process (DbusTestDbusMock * self) +{ + const gchar * paramval = NULL; + + /* Execute: python3 -m dbusmock $name / com.canonical.DbusTest.DbusMock */ + g_object_set(G_OBJECT(self), "executable", "python3", NULL); + + GArray * params = g_array_new(TRUE, TRUE, sizeof(gchar *)); + /* NOTE: No free func, none of the memory is managed by the array */ + + paramval = "-m"; g_array_append_val(params, paramval); + paramval = "dbusmock"; g_array_append_val(params, paramval); + + /* If we're set for system, go there, otherwise default to session */ + if (dbus_test_task_get_bus(DBUS_TEST_TASK(self)) == DBUS_TEST_SERVICE_BUS_SYSTEM) { + paramval = "--system"; g_array_append_val(params, paramval); + } + + g_array_append_val(params, self->priv->name); + paramval = "/"; g_array_append_val(params, paramval); + paramval = "com.canonical.DbusTest.DbusMock"; g_array_append_val(params, paramval); + + g_object_set(G_OBJECT(self), "parameters", params, NULL); + g_array_unref(params); +} + /* Run the mock */ static void run (DbusTestTask * task) @@ -454,9 +458,20 @@ run (DbusTestTask * task) DbusTestDbusMock * self = DBUS_TEST_DBUS_MOCK(task); /* Grab the new bus */ - self->priv->bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL); + if (dbus_test_task_get_bus(DBUS_TEST_TASK(self)) == DBUS_TEST_SERVICE_BUS_SYSTEM) { + self->priv->bus = g_bus_get_sync(G_BUS_TYPE_SYSTEM, NULL, &error); + } else { + self->priv->bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, &error); + } + + if (error != NULL) { + g_warning("Unable to get bus to start DBus Mock: %s", error->message); + g_error_free(error); + return; + } /* Use the process code to get the process running */ + configure_process(self); DBUS_TEST_TASK_CLASS (dbus_test_dbus_mock_parent_class)->run (task); /**** Initialize the DBus Mock instance ****/
  27. Download patch libdbustest/task.h

    --- 15.04.0~bzr87+repack1-2/libdbustest/task.h 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/libdbustest/task.h 2016-09-06 14:33:36.000000000 +0000 @@ -82,6 +82,7 @@ DbusTestTask * dbus_test_task_new (void) void dbus_test_task_set_name (DbusTestTask * task, const gchar * name); void dbus_test_task_set_name_spacing (DbusTestTask * task, glong chars); void dbus_test_task_set_wait_for (DbusTestTask * task, const gchar * dbus_name); +void dbus_test_task_set_wait_for_bus (DbusTestTask * task, const gchar * dbus_name, DbusTestServiceBus bus); void dbus_test_task_set_return (DbusTestTask * task, DbusTestTaskReturn ret); void dbus_test_task_set_wait_finished (DbusTestTask * task, gboolean wait_till_complete); void dbus_test_task_set_bus (DbusTestTask * task, DbusTestServiceBus bus);
  28. Download patch debian/source/format

    --- 15.04.0~bzr87+repack1-2/debian/source/format 2015-01-20 12:44:53.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt)
  29. Download patch debian/copyright
  30. Download patch ChangeLog.bzr

    --- 15.04.0~bzr87+repack1-2/ChangeLog.bzr 2015-01-20 14:29:44.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/ChangeLog.bzr 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -87: CI Train Bot 2014-12-09 {15.04.0+15.04.20141209-0ubuntu1} Releasing 15.04.0+15.04.20141209-0ubuntu1 -86: CI Train Bot 2014-12-09 Replaced 0replaceme with real versions. -85: Ted Gould 2014-12-09 [merge] Add ability to run as the system bus -84: CI bot 2014-09-08 {14.04.1+14.10.20140908-0ubuntu1} Releasing 14.04.1+14.10.20140908-0ubuntu1 -83: Ted Gould 2014-09-08 [merge] Drop gvfs-backends because no one can figure out why it is there. Fixes: 1296329 -82: Iain Lane 2014-06-11 [merge] Sync the archive uploads which were to fix the autopkgtests -81: CI bot 2014-03-20 {14.04.1+14.04.20140320-0ubuntu1} Releasing 14.04.1+14.04.20140320-0ubuntu1 -80: Ted Gould 2014-03-20 [merge] Emit properties changed when updating a property -79: Ted Gould 2014-03-20 [merge] Merge policy and manual test -78: CI bot 2014-02-26 {14.04.0+14.04.20140226-0ubuntu1} Releasing 14.04.0+14.04.20140226-0ubuntu1 -77: Ted Gould 2014-02-26 [merge] Grab the bus so we can ensure it closes before starting the next test -76: CI bot 2014-02-17 {14.04.0+14.04.20140217.1-0ubuntu1} Releasing 14.04.0+14.04.20140217.1-0ubuntu1 -75: Ted Gould 2014-02-17 [merge] Flushing trunk with a release -74: Ted Gould 2014-01-15 [merge] Support having objects with different interfaces on the same path. -73: Ken VanDine 2014-01-07 [merge] Sync packaging changes uploaded to the archive back to trunk -72: Charles Kerr 2013-12-20 [merge] fix leaks by always g_free()ing the return value of g_get_current_dir(). -71: Ted Gould 2013-12-18 [merge] Make sure to not clear the watcher if it fired. Fixes: https://bugs.launchpad.net/bugs/1260779. -70: Automatic PS uploader 2013-11-26 [merge] Releasing 14.04.0+14.04.20131126-0ubuntu1 (revision 69 from lp:dbus-test-runner). -69: Ted Gould 2013-11-18 [merge] Add a DBus Mock task. -68: Timo Jyrinki 2013-10-31 Sync with what was uploaded to archives: -67: Steve Langasek 2013-10-30 [merge] Add Multi-Arch and Vcs-* entries in debian/control. Fixes: https://bugs.launchpad.net/bugs/1246074. -66: Automatic PS uploader 2013-07-24 [merge] Releasing 12.10.2+13.10.20130724-0ubuntu1 (revision 65 from lp:dbus-test-runner). -65: Michal Hruby 2013-07-22 [merge] Watch created pipes for the G_IO_HUP event, as when a pipe closes, polling it will return this event. -64: Automatic PS uploader 2013-07-17 [merge] Releasing 12.10.2+13.10.20130717-0ubuntu1 (revision 63 from lp:dbus-test-runner). -63: Alberto Mardegan 2013-07-16 [merge] Propagate the current environment to activated services -62: Automatic PS uploader 2013-06-07 [merge] Releasing 12.10.2daily13.06.05-0ubuntu1 to ubuntu. -61: Automatic PS uploader 2013-05-03 [merge] Releasing 12.10.2daily13.05.03ubuntu.unity.next-0ubuntu1 to ubuntu. -60: Automatic PS uploader 2013-02-26 [merge] Releasing 12.10.2daily13.02.26-0ubuntu1 to ubuntu. -59: David Barth 2013-02-25 [merge] This ensures that dbus-test-runner still builds on 12.04, by wrapping the use of the new g_clear_pointer with a macro on older glibs. -58: Automatic PS uploader 2013-02-15 [merge] Releasing 12.10.2daily13.02.15.1-0ubuntu1 to ubuntu. -57: Mathieu Trudel-Lapierre 2013-02-14 [merge] Set dbus-daemon in a process group so we can kill all its children in the process tree (and itself) when we reach the task timeout. Fixes: https://bugs.launchpad.net/bugs/1122948. -56: Automatic PS uploader 2013-02-04 [merge] Releasing 12.10.2daily13.01.31-0ubuntu1 to ubuntu. -55: Ted Gould 2013-01-30 [merge] Don't include g_type_init() on newer GLib's. -54: Ted Gould 2013-01-29 [merge] Adding in a watchdog for the DBus daemon -53: Automatic PS uploader 2013-01-10 [merge] Releasing 12.10.2daily13.01.10-0ubuntu1 to ubuntu. -52: Mathieu Trudel-Lapierre 2013-01-08 [merge] Make bustle tests conditional. -51: Didier Roche 2013-01-08 [merge] Add bootstrap message. -50: Ted Gould 2013-01-07 [merge] Inline packaging. -49: Ted Gould 2012-12-17 [merge] Add support for bustle 0.4.x. -48: Charles Kerr 2012-10-03 {12.10.1} 12.10.1 -47: Charles Kerr 2012-10-03 [merge] merge lp:~ted/dbus-test-runner/distcheck-fix to fix 'make distcheck' -46: Ted Gould 2012-10-03 [merge] Add option to wait until task complete. Fixes: https://bugs.launchpad.net/bugs/1053168. Approved by jenkins, Charles Kerr. -45: Ted Gould 2012-10-03 [merge] Adding a clearing of the buffers to make tests pass on slow systems. Fixes: https://bugs.launchpad.net/bugs/1010739. Approved by jenkins, Charles Kerr. -44: Charles Kerr 2012-07-11 {12.10.0} 12.10.0 -43: Charles Kerr 2012-07-11 {12.10.11} 12.10.11 -42: Ted Gould 2012-06-22 [merge] Disabling test-output to unblock Jenkings. Tracked in LP: #1010739. Approved by . -41: Ted Gould 2012-04-23 [merge] Bringing coverage up to spec with other projects -40: Ted Gould 2012-04-23 [merge] Splitting out the internals into a testing library -39: Ted Gould 2012-02-20 {0.0.5} 0.0.5 -38: Ted Gould 2012-02-20 Make sure the session bus thinks it's a session bus -37: Ted Gould 2011-12-13 [merge] Increase the test coverage of the test suite -36: Ted Gould 2011-12-13 [merge] Adding in basic coverage support -35: Ted Gould 2011-11-28 {0.0.4} 0.0.4 -34: Ted Gould 2011-11-28 [merge] Support waiting for a name before starting up a new task -33: Ted Gould 2011-11-28 [merge] Fix a warning in the arguments of the test runner -32: Ted Gould 2011-11-28 [merge] Adding a maximum wait time for the test runner or it'll fail -31: Ted Gould 2011-01-28 {0.0.3} 0.0.3 -30: Ted Gould 2011-01-28 Launching the shell script from the right dir -29: Ted Gould 2011-01-28 Better handle tasks that can't be started -28: Ted Gould 2011-01-28 Adding debugging info when starting tasks. -27: Ted Gould 2011-01-28 Adding a little sleep before signaling to make the tests more reliable -26: Ken VanDine 2010-12-15 Added copyright/license header matching COPYING file -25: Ted Gould 2010-12-07 {0.0.2} 0.0.2 -24: Ted Gould 2009-12-09 [merge] Handling the cases where the bustle process sends out data without a loop. Fixes a bug. Add a test to recreate the bug. -23: Ted Gould 2009-12-08 [merge] Adding the ability to record the messages on the buss using bustle-dbus-monitor. -22: Ted Gould 2009-12-04 [merge] Add better tracking of referencing the tasks and freeing them better. -21: Ted Gould 2009-12-03 [merge] Explicitly killing dbus at the end of the run. -20: Ted Gould 2009-12-02 Ignoring our test scripts -19: Ted Gould 2009-12-02 Making the rm delay slightly for distcheck to pass. -18: Ted Gould 2009-12-02 Switching the tests to use autotest. Better output. -17: Ted Gould 2009-08-19 Using AM 1.11 silent mode -16: Ted Gould 2009-06-17 Now we have a parameter test -15: Ted Gould 2009-06-17 Adding in an option for parameters. -14: Ted Gould 2009-06-05 Switching around the environment handling to allow for env variables to go through to the called tasks. This is especially important for all the x variables. -13: Ted Gould 2009-04-27 Oops, should be the data dir. -12: Ted Gould 2009-04-27 Making the default session dictory part of the build system. -11: Ted Gould 2009-04-23 Version 0.0.2dev -10: Ted Gould 2009-04-23 {0.0.1} Woo hoo, now we can distcheck -9: Ted Gould 2009-04-23 Not sure why I need this, but it solves the problem. -8: Ted Gould 2009-04-23 Adding in translation, not quite sure why, but why not -7: Ted Gould 2009-04-23 Making the tests work better by getting automake involved -6: Ted Gould 2009-04-23 Fleshing out this build system real nice now. -5: Ted Gould 2009-04-23 Silly GNU files. -4: Ted Gould 2009-04-23 Building a build system, first start. -3: Ted Gould 2009-04-23 Making some directories. -2: Ted Gould 2009-04-23 Ignore it all -1: Ted Gould 2009-04-23 Getting into version control
  31. Download patch debian/copyright.in

    --- 15.04.0~bzr87+repack1-2/debian/copyright.in 2015-01-20 13:39:24.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/debian/copyright.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: FIXME -Upstream-Contact: FIXME -Source: FIXME -Disclaimer: Autogenerated by CDBS - -Files: libdbustest/bustle.c - libdbustest/bustle.h - libdbustest/dbus-mock.c - libdbustest/dbus-mock.h - libdbustest/dbus-test.h - libdbustest/glib-compat.h - libdbustest/leash.c - libdbustest/process.c - libdbustest/process.h - libdbustest/service.c - libdbustest/service.h - libdbustest/task.c - libdbustest/task.h - src/dbus-test-runner.c -Copyright: 2010, Canonical Ltd - 2012, Canonical Ltd - 2013, Canonical Ltd -License: GPL-3 - FIXME - -Files: autogen.sh - build.sh - libdbustest/watchdog.c - libdbustest/watchdog.h - tests/delayrm.sh - tests/test-bustle-data-check.0.4.sh - tests/test-bustle-data-check.sh - tests/test-bustle-list.sh - tests/test-check-name.c - tests/test-libdbustest-getname.c - tests/test-libdbustest-mock.c - tests/test-libdbustest.c - tests/test-own-name.c -Copyright: *No copyright* -License: UNKNOWN - FIXME -
  32. Download patch tests/test-own-name.c

    --- 15.04.0~bzr87+repack1-2/tests/test-own-name.c 2015-01-20 14:28:58.000000000 +0000 +++ 15.04.0+16.10.20160906-0ubuntu1/tests/test-own-name.c 2016-09-06 14:33:36.000000000 +0000 @@ -18,10 +18,27 @@ end_of_line (gpointer user_data) int main (int argc, char * argv[]) { + gboolean system_bus = FALSE; + GOptionContext *options; + GError *error = NULL; + + const GOptionEntry option_entries[] = { + { "system", 'y', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, &system_bus, "Own the name on the system bus", NULL }, + { NULL } + }; + #ifndef GLIB_VERSION_2_36 g_type_init(); #endif + options = g_option_context_new(NULL); + g_option_context_add_main_entries(options, option_entries, NULL); + if (!g_option_context_parse(options, &argc, &argv, &error)) { + g_printerr("%s", error->message); + g_error_free(error); + return 1; + } + if (argc != 2) { g_error("ARG, need a single argument"); return 1; @@ -29,7 +46,7 @@ main (int argc, char * argv[]) g_debug("Trying for name: %s", argv[1]); - g_bus_own_name(G_BUS_TYPE_SESSION, + g_bus_own_name(system_bus ? G_BUS_TYPE_SYSTEM : G_BUS_TYPE_SESSION, argv[1], G_BUS_NAME_OWNER_FLAGS_NONE, NULL, /* bus aquired */ @@ -43,7 +60,9 @@ main (int argc, char * argv[]) g_timeout_add_seconds(2, end_of_line, mainloop); g_main_loop_run(mainloop); + g_main_loop_unref(mainloop); + g_option_context_free(options); g_debug("Quitting");

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: golang-go-dbus

golang-go-dbus (1~bzr20150203-0ubuntu2) bionic; urgency=medium * Merge packaging changes from Debian: - Set XS-Go-Import-Path - Use a secure transport for the Vcs-Git and Vcs-Browser URL - debian/control: - Update Build-Depends on golang-check.v1-dev, instead of golang-gocheck-dev which is already non-active upstream. - Use cgit URL for Vcs-Browser. - debian/patches: - Add a patch to use golang-check.v1-dev (Closes: #857923). -- Steve Langasek <steve.langasek@ubuntu.com> Mon, 09 Apr 2018 01:21:31 -0700 golang-go-dbus (1~bzr20150203-0ubuntu1) vivid; urgency=medium * New upstream snapshot. -- Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Tue, 21 Apr 2015 21:31:27 -0300

Modifications :
  1. Download patch dbus.go

    --- 1~bzr20150122-3/dbus.go 2015-01-22 23:31:57.000000000 +0000 +++ 1~bzr20150203-0ubuntu2/dbus.go 2015-04-22 00:33:47.000000000 +0000 @@ -35,11 +35,13 @@ type MessageFilter struct { // Connection represents a connection to a message bus. type Connection struct { // The unique name of this connection on the message bus. - UniqueName string - conn net.Conn - writeLock sync.Mutex - busProxy BusDaemon - lastSerial uint32 + UniqueName string + conn net.Conn + writeLock sync.Mutex + busProxy BusDaemon + lastSerial uint32 + connOpen bool + connOpenLock sync.Mutex handlerMutex sync.Mutex // covers the next three messageFilters []*MessageFilter @@ -120,9 +122,10 @@ func Connect(busType StandardBus) (*Conn if bus.conn, err = trans.Dial(); err != nil { return nil, err } + bus.setConnOpen(true) if err = authenticate(bus.conn, nil); err != nil { - bus.conn.Close() + bus.Close() return nil, err } @@ -142,6 +145,18 @@ func Connect(busType StandardBus) (*Conn return bus, nil } +func (p *Connection) setConnOpen(o bool) { + p.connOpenLock.Lock() + defer p.connOpenLock.Unlock() + p.connOpen = o +} + +func (p *Connection) isConnOpen() bool { + p.connOpenLock.Lock() + defer p.connOpenLock.Unlock() + return p.connOpen +} + func (p *Connection) Authenticate() error { log.Println("dbus.Connection.Authenticate() is deprecated. This call can be removed") return nil @@ -151,7 +166,7 @@ func (p *Connection) receiveLoop() { for { msg, err := readMessage(p.conn) if err != nil { - if err != io.EOF { + if err != io.EOF && p.isConnOpen() { log.Println("Failed to read message:", err) } break @@ -245,6 +260,7 @@ func (p *Connection) dispatchMessage(msg } func (p *Connection) Close() error { + p.setConnOpen(false) return p.conn.Close() }
  2. Download patch signal.go

    --- 1~bzr20150122-3/signal.go 2015-01-22 23:31:57.000000000 +0000 +++ 1~bzr20150203-0ubuntu2/signal.go 2015-04-22 00:33:47.000000000 +0000 @@ -94,7 +94,7 @@ func (self signalWatchSet) FindMatches(m // handle receiving signals with callback type signalWatch struct { bus *Connection - rule MatchRule + rule *MatchRule cb func(*Message) cancelLock sync.Mutex @@ -107,7 +107,7 @@ func (p *Connection) watchSignal(rule *M } watch := &signalWatch{ bus: p, - rule: *rule, + rule: rule, cb: cb} p.handlerMutex.Lock()
  3. Download patch signal_test.go

    --- 1~bzr20150122-3/signal_test.go 2015-01-22 23:31:57.000000000 +0000 +++ 1~bzr20150203-0ubuntu2/signal_test.go 2015-04-22 00:33:47.000000000 +0000 @@ -91,7 +91,7 @@ func (s *S) TestConnectionWatchSignalWit func (s *S) TestSignalWatchSetAdd(c *C) { set := make(signalWatchSet) - watch := signalWatch{rule: MatchRule{ + watch := signalWatch{rule: &MatchRule{ Type: TypeSignal, Sender: ":1.42", Path: "/foo", @@ -110,14 +110,14 @@ func (s *S) TestSignalWatchSetAdd(c *C) func (s *S) TestSignalWatchSetRemove(c *C) { set := make(signalWatchSet) - watch1 := signalWatch{rule: MatchRule{ + watch1 := signalWatch{rule: &MatchRule{ Type: TypeSignal, Sender: ":1.42", Path: "/foo", Interface: "com.example.Foo", Member: "Bar"}} set.Add(&watch1) - watch2 := signalWatch{rule: MatchRule{ + watch2 := signalWatch{rule: &MatchRule{ Type: TypeSignal, Sender: ":1.43", Path: "/foo", @@ -137,7 +137,7 @@ func (s *S) TestSignalWatchSetFindMatche msg.Sender = ":1.42" set := make(signalWatchSet) - watch := signalWatch{rule: MatchRule{ + watch := signalWatch{rule: &MatchRule{ Type: TypeSignal, Sender: ":1.42", Path: "/foo",

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: kdbusaddons

kdbusaddons (5.50.0-0ubuntu1) cosmic; urgency=medium * New upstream release (5.50.0) -- Rik Mills <rikmills@kubuntu.org> Mon, 10 Sep 2018 22:12:18 +0100 kdbusaddons (5.49.0-0ubuntu1) cosmic; urgency=medium [ Rik Mills ] * New upstream release (5.48.0) * New upstream release (5.49.0) [ José Manuel Santamaría Lema ] * Move away from dhmk and set compat level to 11 in order to reduce delta with Debian -- Rik Mills <rikmills@kubuntu.org> Tue, 21 Aug 2018 20:29:27 +0100 kdbusaddons (5.47.0-0ubuntu1) cosmic; urgency=medium * New upstream release (5.47.0) [ José Manuel Santamaría Lema ] * Merge with debian, notes: - keep using dhmk and debhelper compat level = 9, see: https://phabricator.kde.org/w/kubuntu/black-operations/pyramid/ -- Rik Mills <rikmills@kubuntu.org> Thu, 14 Jun 2018 15:48:16 +0100

Modifications :
  1. Download patch debian/libkf5dbusaddons5.symbols

    --- 5.49.0-1/debian/libkf5dbusaddons5.symbols 2018-08-17 14:18:18.000000000 +0000 +++ 5.50.0-0ubuntu1/debian/libkf5dbusaddons5.symbols 2018-09-10 21:12:18.000000000 +0000 @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 5.35.0 amd64 +# SymbolsHelper-Confirmed: 5.33.0 amd64 arm64 armhf i386 ppc64el libKF5DBusAddons.so.5 libkf5dbusaddons5 #MINVER# _ZN10KDEDModule11qt_metacallEN11QMetaObject4CallEiPPv@Base 4.97.0 _ZN10KDEDModule11qt_metacastEPKc@Base 4.97.0 @@ -48,7 +48,7 @@ libKF5DBusAddons.so.5 libkf5dbusaddons5 _ZNK10KDEDModule10metaObjectEv@Base 4.97.0 _ZNK10KDEDModule10moduleNameEv@Base 4.97.0 _ZNK12KDBusService10metaObjectEv@Base 4.97.0 - _ZNK12KDBusService11serviceNameEv@Base 5.35.0 + _ZNK12KDBusService11serviceNameEv@Base 5.33.0 _ZNK12KDBusService12errorMessageEv@Base 4.97.0 _ZNK12KDBusService12isRegisteredEv@Base 4.97.0 _ZNK21KDBusInterProcessLock10metaObjectEv@Base 4.97.0
  2. Download patch po/zh_CN/kdbusaddons5_qt.po

    --- 5.49.0-1/po/zh_CN/kdbusaddons5_qt.po 2018-08-04 10:56:52.000000000 +0000 +++ 5.50.0-0ubuntu1/po/zh_CN/kdbusaddons5_qt.po 2018-09-02 19:16:12.000000000 +0000 @@ -2,8 +2,8 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2018-07-24 08:41\n" -"Last-Translator: guoyunhebrave <guoyunhebrave@gmail.com>\n" +"PO-Revision-Date: 2018-08-30 13:09\n" +"Last-Translator: guoyunhebrave <yunhe.guo@protonmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n"
  3. Download patch debian/control

    --- 5.49.0-1/debian/control 2018-08-17 14:18:18.000000000 +0000 +++ 5.50.0-0ubuntu1/debian/control 2018-09-10 21:12:18.000000000 +0000 @@ -7,18 +7,18 @@ Build-Depends: cmake (>= 3.0~), dbus-x11, debhelper (>= 11~), doxygen, - extra-cmake-modules (>= 5.49.0~), + extra-cmake-modules (>= 5.50.0~), graphviz, libqt5sql5-sqlite:native, libqt5x11extras5-dev (>= 5.8.0~), pkg-kde-tools (>= 0.15.15ubuntu1~), qtbase5-dev (>= 5.8.0~), - qttools5-dev (>= 5.4), - qttools5-dev-tools (>= 5.4), + qttools5-dev (>= 5.6.1~), + qttools5-dev-tools (>= 5.6.1~), Standards-Version: 4.1.4 Homepage: https://projects.kde.org/projects/frameworks/kdbusaddons -Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kdbusaddons -Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kdbusaddons.git +Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kdbusaddons +Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kdbusaddons Package: libkf5dbusaddons-bin Architecture: any @@ -44,12 +44,11 @@ Description: class library for qtdbus This package contains the translations. Package: libkf5dbusaddons-dev -Section: libdevel Architecture: any +Section: libdevel Depends: libkf5dbusaddons5 (= ${binary:Version}), qtbase5-dev (>= 5.8.0~), ${misc:Depends}, -Breaks: kded5-dev (<< 5.49), libkf5service-dev (<< 5.49) Recommends: libkf5dbusaddons-doc (= ${source:Version}) Description: development files for dbusaddons KDBusAddons provides convenience classes on top of QtDBus, @@ -58,13 +57,13 @@ Description: development files for dbusa Package: libkf5dbusaddons-doc Architecture: all Multi-Arch: foreign +Section: doc Depends: ${misc:Depends} Description: class library for qtdbus (documentation) KDBusAddons provides convenience classes on top of QtDBus, as well as an API to create KDED modules. . This package contains the qch documentation files. -Section: doc Package: libkf5dbusaddons5 Architecture: any @@ -72,15 +71,6 @@ Multi-Arch: same Depends: libkf5dbusaddons-data (= ${source:Version}), ${misc:Depends}, ${shlibs:Depends}, -Breaks: baloo-kf5 (<< 5.49), - kded5 (<< 5.49), - kio (<< 5.49), - libkf5globalaccel-bin (<< 5.49), - libkf5kdelibs4support5-bin (<< 5.49), - libkf5kiocore5 (<< 5.49), - libkf5service5 (<< 5.49), - libkf5wallet-bin (<< 5.49), - plasma-framework (<< 5.25), Recommends: libkf5dbusaddons-bin (= ${binary:Version}) Description: class library for qtdbus KDBusAddons provides convenience classes on top of QtDBus,
  4. Download patch debian/libkf5dbusaddons-dev.acc.in

    --- 5.49.0-1/debian/libkf5dbusaddons-dev.acc.in 2018-08-17 14:18:18.000000000 +0000 +++ 5.50.0-0ubuntu1/debian/libkf5dbusaddons-dev.acc.in 2018-09-10 21:12:18.000000000 +0000 @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version='1.0' encoding='utf-8'?> <descriptor> <version> @@ -15,6 +15,7 @@ <gcc_options> -fPIC + -fno-keep-inline-functions -std=c++11 </gcc_options>
  5. Download patch CMakeLists.txt

    --- 5.49.0-1/CMakeLists.txt 2018-08-04 10:56:52.000000000 +0000 +++ 5.50.0-0ubuntu1/CMakeLists.txt 2018-09-02 19:16:12.000000000 +0000 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.49.0") # handled by release scripts +set(KF5_VERSION "5.50.0") # handled by release scripts project(KDBusAddons VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.49.0 NO_MODULE) +find_package(ECM 5.50.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules") feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES)
  6. Download patch po/ar/kdbusaddons5_qt.po

    --- 5.49.0-1/po/ar/kdbusaddons5_qt.po 2018-08-04 10:56:52.000000000 +0000 +++ 5.50.0-0ubuntu1/po/ar/kdbusaddons5_qt.po 2018-09-02 19:16:12.000000000 +0000 @@ -1,10 +1,10 @@ -# Safa Alfulaij <safa1996alfulaij@gmail.com>, 2014, 2017. +# Safa Alfulaij <safa1996alfulaij@gmail.com>, 2014, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-06-28 15:38+0300\n" -"PO-Revision-Date: 2017-11-30 12:12+0300\n" +"PO-Revision-Date: 2018-06-08 23:55+0300\n" "Last-Translator: Safa Alfulaij <safa1996alfulaij@gmail.com>\n" "Language-Team: Arabic <doc@arabeyes.org>\n" "Language: ar\n" @@ -17,31 +17,30 @@ msgstr "" "X-Qt-Contexts: true\n" #: tools/kquitapp/kquitapp.cpp:31 -#, fuzzy msgctxt "main|" msgid "Quit a D-Bus enabled application easily" -msgstr "أنهِ تطبيق" +msgstr "أنهِ بسهولة التطبيقات التي تدعم D-Bus" #: tools/kquitapp/kquitapp.cpp:32 msgctxt "main|" msgid "Full service name, overrides application name provided" -msgstr "اسم الخدمة الكامل، يتجاهل اسم التّطبيق الموفّر" +msgstr "اسم الخدمة الكامل، يتجاهل اسم التطبيق الذي قدّمته" #: tools/kquitapp/kquitapp.cpp:33 msgctxt "main|" msgid "Path in the D-Bus interface to use" -msgstr "المسار في واجهة D-Bus لاستخدامه" +msgstr "المسار في واجهة D-Bus الذي سيُستخدم" #: tools/kquitapp/kquitapp.cpp:34 msgctxt "main|" msgid "The name of the application to quit" -msgstr "اسم التّطبيق لإنهائه" +msgstr "اسم التطبيق لإنهائه" #: tools/kquitapp/kquitapp.cpp:57 #, qt-format msgctxt "main|" msgid "Application %1 could not be found using service %2 and path %3." -msgstr "تعذّر العثور على التّطبيق %1 باستخدام الخدمة %2 والمسار %3." +msgstr "تعذر العثور على التطبيق %1 باستخدام الخدمة %2 والمسار %3." #: tools/kquitapp/kquitapp.cpp:63 #, qt-format @@ -51,6 +50,6 @@ msgid "" "\n" " %2 : %3" msgstr "" -"فشل إنهاء التّطبيق %1. الخطأ المبلّغ عنه كان:\n" +"فشل إنهاء التطبيق %1. الخطأ كان:\n" "\n" " %2 : %3"
  7. Download patch debian/copyright

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libdbusmenu

libdbusmenu (16.04.1+18.10.20180917-0ubuntu1) cosmic; urgency=medium * tests: don't use gtester for gtkdoc-check tests -- Marco Trevisan (Treviño) <mail@3v1n0.net> Mon, 17 Sep 2018 16:25:33 +0000 libdbusmenu (16.04.1+18.04.20171206-0ubuntu1) bionic; urgency=medium * Drop unneeded dependency from libdbusmenu-glib-dev to libgtk2.0-dev -- Jeremy Bicha <jbicha@ubuntu.com> Wed, 06 Dec 2017 15:59:26 +0000 libdbusmenu (16.04.1+17.04.20170109.1-0ubuntu1) zesty; urgency=medium [ Dmitry Shachnev ] * Fix build with --enable-massivedebugging [ Marco Trevisan (Treviño) ] * debian/control: add gnome-common as build dependency for autogen.sh" debian/control -- Marco Trevisan (Treviño) <mail@3v1n0.net> Mon, 09 Jan 2017 15:38:49 +0000 libdbusmenu (16.04.1+16.10.20160927.2-0ubuntu1) yakkety; urgency=medium [ Marco Trevisan (Treviño) ] * New upstream release [ Albert Astals Cid ] * genericmenuitem: Make accelerator text appear again (LP: #1628196) -- Marco Trevisan (Treviño) <mail@3v1n0.net> Tue, 27 Sep 2016 22:03:54 +0000 libdbusmenu (12.10.3+16.04.20160223.1-0ubuntu1) xenial; urgency=medium [ Dan Williams ] * gtk: look for GtkImages on regular GtkMenuItems too (LP: #1549021) -- Marco Trevisan (Treviño) <mail@3v1n0.net> Tue, 23 Feb 2016 23:20:43 +0000 libdbusmenu (12.10.3+15.04.20150410.2-0ubuntu2) xenial; urgency=high * Disable test-json-instruction, hangs on buildds, see launchpad bug 1429291. -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 07 Dec 2015 10:13:22 +0000 libdbusmenu (12.10.3+15.04.20150410.2-0ubuntu1) vivid; urgency=medium [ CI Train Bot ] * New rebuild forced. [ Marco Trevisan (Treviño) ] * Parser: don't override the label for stock items if a custom one is provided (LP: #1270486) -- CI Train Bot <ci-train-bot@canonical.com> Fri, 10 Apr 2015 21:56:13 +0000 libdbusmenu (12.10.3+15.04.20150409.1-0ubuntu1) vivid; urgency=medium [ Iain Lane ] * Use the configure-generated libtool script instead of /usr/bin/libtool, which might not match what we have. Also use gi's typelibdir pkgconfig variable and install into this directory, now that gi supports multiarch. -- CI Train Bot <ci-train-bot@canonical.com> Thu, 09 Apr 2015 17:36:00 +0000 libdbusmenu (12.10.3+14.10.20140610-0ubuntu1) utopic; urgency=low [ Marco Trevisan (Treviño) ] * Parser: make sure that the old dbus menuitem is detached from the widget before recreating When a dbus menuitem has to be recreated, we need to disconnect the widget from it, or the old one will be reused at next parsing cycle. (LP: #1086563) -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 10 Jun 2014 15:29:30 +0000 libdbusmenu (12.10.3+14.04.20140319-0ubuntu1) trusty; urgency=low [ Charles Kerr ] * Fix FTBFS caused by failing gtk-doc coverage test * when generating the script that runs gtester, use ${GTKDOC_CHECK_PATH} instead of ${GTKDOC_CHECK} to work with upstream changes https://bugzilla.gnome.org/show_bug.cgi?id=701638 * add gtk-doc markup to subclass structs' parent fields so that gtk-doc won't mark them as undocumented. (LP: #1294165) [ Colin Watson ] * Run tests with VERBOSE=1 so that Automake shows more detail. -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 19 Mar 2014 09:04:45 +0000 libdbusmenu (12.10.3+14.04.20140217.1-0ubuntu1) trusty; urgency=low [ Ted Gould ] * Don't depend on valgrind on ppc64el. (LP: #1262374) * Flushing trunk with a release [ Matthew Brush ] * Check to ensure the property isn't set to NULL. (LP: #907635) -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 17 Feb 2014 18:07:41 +0000 libdbusmenu (12.10.3+14.04.20131125-0ubuntu2) trusty; urgency=medium * Do not build-depend on valgrind on ppc64el (not yet available). -- Matthias Klose <doko@ubuntu.com> Wed, 18 Dec 2013 19:01:15 +0100 libdbusmenu (12.10.3+14.04.20131125-0ubuntu1) trusty; urgency=low [ Alistair Buxton ] * Use "insert" signal instead of "child-added" (LP: #1203888) In recent Gtk+2 versions, the "insert" signal has been backported from Gtk+3. This replaces the "child-added" signal, which was carried in an Ubuntu-specific patch and was dropped in Saucy. . (LP: #1203888) [ Ubuntu daily release ] * Automatic snapshot from revision 462 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 25 Nov 2013 03:55:53 +0000 libdbusmenu (12.10.3+13.10.20130913-0ubuntu2) saucy; urgency=low * Do not build-depend on valgrind on AArch64 (not yet available). -- Matthias Klose <doko@ubuntu.com> Mon, 14 Oct 2013 01:30:44 +0200 libdbusmenu (12.10.3+13.10.20130913-0ubuntu1) saucy; urgency=low [ Ted Gould ] * Extend timeouts for busy Jenkins ARM machines. * Protect client_new functions from bad dbus names and objects. [ Ubuntu daily release ] * Automatic snapshot from revision 458 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 13 Sep 2013 15:16:38 +0000 libdbusmenu (12.10.3+13.10.20130731-0ubuntu1) saucy; urgency=low [ Jeremy Bicha ] * Don't build-depend on gnome-doc-utils. [ Ubuntu daily release ] * Automatic snapshot from revision 455 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 31 Jul 2013 02:02:59 +0000 libdbusmenu (12.10.3+13.10.20130628-0ubuntu1) saucy; urgency=low [ Charles Kerr ] * Fix a bug caused by keeping signals connected to menuitems that we're not using anymore. (LP: #1154701) * Fix breakage when building with coverage scanning. [ Ted Gould ] * Increase test timeouts to ensure proper results on slower platforms (ARM). [ Jeremy Bicha ] * Build with default valac. [ Ubuntu daily release ] * Automatic snapshot from revision 453 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 28 Jun 2013 02:03:25 +0000 libdbusmenu (12.10.3daily13.06.19-0ubuntu1) saucy; urgency=low [ Jeremy Bicha ] * According to Debian's GObject introspection mini-policy: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gobject- introspection/debian/policy.txt?view=markup. [ Ubuntu daily release ] * Automatic snapshot from revision 448 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 19 Jun 2013 02:02:27 +0000 libdbusmenu (12.10.3daily13.06.07-0ubuntu1) saucy; urgency=low [ Mathieu Trudel-Lapierre ] * Fix gtkdoc-check tests, and move them to tests subdirectory. [ Chris Coulson ] * Fix the long-standing "nm-applet stops working after a few days / hours" issue; properly handle "unique" IDs for indicator menuitems. (LP: #1011073) [ Ubuntu daily release ] * Automatic snapshot from revision 446 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 07 Jun 2013 02:02:59 +0000 libdbusmenu (12.10.3daily13.05.15-0ubuntu1) saucy; urgency=low [ Charles Kerr ] * In gtkclient's destructor, balance client's earlier gtk_widget_add_accelerator() calls with gtk_widget_remove_accelerator() calls. (LP: #1173262) [ Mathieu Trudel-Lapierre ] * Remove stray g_message(). [ Ubuntu daily release ] * Automatic snapshot from revision 443 -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 15 May 2013 12:44:56 +0000 libdbusmenu (12.10.3daily13.02.01-0ubuntu1) raring; urgency=low [ Mathieu Trudel-Lapierre ] * debian/control: - Reorganize Build-Depends for clarity. - Update style to match other indicator stack packages. - Drop Build-Depends on cdbs. - Bump debhelper Build-Depends to (>= 9). - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. - Remove outdated Breaks:. - Add dbus-test-runner to Build-Depends. - Add xvfb to Build-Depends. * debian/rules: - Convert to dh9; some variables where kept but renamed to brevity. - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run configure. - Clean up unnecessary files we don't want to install, so that dh_install can complete. - Override dh_auto_test to make sure they can be run for both the gtk2 and gtk3 flavors. - Run dh_auto_test through xvfb-run. * debian/compat: bump to compat level 9. * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example. * debian/libdbusmenu-tools.install: install dbusmenu-* binaries from the multiarch triplet rather than usr/lib/libdbusmenu. * Update main sgml documentation files to remove the xml includes we don't generate anymore. (LP: #1102468) * Drop deprecated calls to g_type_init(). (LP: #1102471) [ Didier Roche ] * Automatic snapshot from revision 435 (bootstrap): - Confirm that icon_name is non-NULL before passing it to gtk_icon_theme_has_icon(). (LP: #1082516) - Do not reuse menu items if their type is different (LP: #1071321) - Fixes interaction with GtkRecentChooserMenu (LP: #752674) [ Mathieu Trudel-Lapierre ] * libdbusmenu uses deprecated calls to g_type_init() (LP: #1102471) * libdbusmenu fails to build due to missing xml documentation include files (LP: #1102468) [ Chris Coulson ] * Leaks GVariant's in multiple places (LP: #1104136) * Leak in method call handlers for calls that don't require a reply (LP: #1103050) [ Automatic PS uploader ] * Automatic snapshot from revision 440 -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Fri, 01 Feb 2013 02:01:01 +0000 libdbusmenu (12.10.2-0ubuntu1) quantal; urgency=low * New upstream release. -- Sebastien Bacher <seb128@ubuntu.com> Wed, 03 Oct 2012 21:23:18 +0200 libdbusmenu (12.10.1-0ubuntu2) quantal-proposed; urgency=low * Backport upstream fix for segfault issue (lp: #1053670) -- Sebastien Bacher <seb128@ubuntu.com> Mon, 24 Sep 2012 21:36:35 +0200 libdbusmenu (12.10.1-0ubuntu1) quantal; urgency=low * New upstream release. - Honor changes to GtkSettings' gtk-menu-images value (LP: #927236) - don't display an underscore on menuitimes containing a '&' (LP: #994564) - set the widget for the accelerator even if there isn't a mnemonic (LP: #982656) - Some platforms don't have valgrind, so treat those unit tests separately - make headers match independent of the build directory - constify some public API calls -- Didier Roche <didrocks@ubuntu.com> Thu, 20 Sep 2012 19:22:52 +0200 libdbusmenu (0.6.2-0ubuntu1) quantal; urgency=low * New upstream release. * Fixed duplicated underscores in menus (LP: #979301) * Fix for keybindings not showing in menus bug (LP: #982656) * DbusmenuServer leaks private string (LP: #981766) * Ensure menuitems with '&' show them properly (LP: #994564) -- Ted Gould <ted@ubuntu.com> Wed, 13 Jun 2012 14:44:52 -0500 libdbusmenu (0.6.1-0ubuntu3) precise-proposed; urgency=low * Backport fix for keybindings not showing in menus bug (lp: #982656) -- Sebastien Bacher <seb128@ubuntu.com> Mon, 16 Apr 2012 21:28:05 +0200 libdbusmenu (0.6.1-0ubuntu2) precise; urgency=low * libdbusmenu-gtk/genericmenuitem.c - Fixed duplicated underscores in menus (LP: #979301) -- Ken VanDine <ken.vandine@canonical.com> Thu, 12 Apr 2012 12:42:47 -0400 libdbusmenu (0.6.1-0ubuntu1) precise; urgency=low * New upstream release. * Fix mnemonics in wifi hotspot names. (LP: #903200) * Fix nautilus crash in dbusmenu_menuitem_property_remove() (LP: #959821) * Fix about-to-show grouping. * Fix visibility signal in the server. * Silence false positives in dbusmenu's signal smoke tests. -- Charles Kerr <charles.kerr@canonical.com> Wed, 11 Apr 2012 11:58:22 -0500 libdbusmenu (0.5.99-0ubuntu3) precise; urgency=low * libdbusmenu-gtk/parser.c - switch the smoke test to a g_debug statement (LP: #977803) -- Ken VanDine <ken.vandine@canonical.com> Tue, 10 Apr 2012 13:21:02 -0400 libdbusmenu (0.5.99-0ubuntu2) precise; urgency=low * libdbusmenu-glib/server.c - Cherry picked a fix for a regression in about-to-show grouping * libdbusmenu-gtk/genericmenuitem.c - Fixed: underscore on menu items change on switching focus (LP: #903200) * libdbusmenu-gtk/parser.c - Fixed: nautilus crashed with SIGSEGV in dbusmenu_menuitem_property_remove() (LP: #959821) -- Ken VanDine <ken.vandine@canonical.com> Mon, 09 Apr 2012 16:29:34 -0400 libdbusmenu (0.5.99-0ubuntu1) precise; urgency=low * New upstream release. * Reduce the number of messages hud-service sends. (LP: #957022) * Fix valgrind tests thanks to a little help from sewardj. * Add gcov targets to autotools build for code-coverage reporting. * Make private two impl functions that were accidentally public -- Charles Kerr <charles.kerr@canonical.com> Thu, 05 Apr 2012 14:22:33 -0500 libdbusmenu (0.5.96-0ubuntu2) precise; urgency=low * Cherry pick fix for FTBFS on arm -- Ken VanDine <ken.vandine@canonical.com> Tue, 03 Apr 2012 16:43:10 -0400 libdbusmenu (0.5.96-0ubuntu1) precise; urgency=low [ Charles Kerr ] * New upstream release. * Faster menuitem lookups (LP: #801699) * To reduce dbus traffic, only send event replies when the caller requests them * Added support for callgrind-based benchmarks * Minor code cleanup [ Ken VanDine ] * debian/control - added build depends on valgrind -- Ken VanDine <ken.vandine@canonical.com> Thu, 29 Mar 2012 16:35:00 -0400 libdbusmenu (0.5.95-0ubuntu1) precise; urgency=low * New upstream release. * Fix theme change bug (LP: #953509) * Don't request event responses if no one is listening * Fix a warning on custom menu items without labels -- Ted Gould <ted@ubuntu.com> Wed, 21 Mar 2012 14:33:32 -0500 libdbusmenu (0.5.94-0ubuntu1) precise; urgency=low * New upstream release. * Fixing setting name of ATK objects * Cleaning up a warning on shutdown (LP: #950762) -- Ted Gould <ted@ubuntu.com> Fri, 09 Mar 2012 14:35:38 -0600 libdbusmenu (0.5.93-0ubuntu1) precise; urgency=low * New upstream release. * Setting the ATK Role on menu items (LP: #878708) * Cleaning up code paths to avoid goto's (LP: #940651) * Fixing setting an icon multiple times (LP: #934574) -- Ted Gould <ted@ubuntu.com> Thu, 08 Mar 2012 10:08:10 -0600 libdbusmenu (0.5.92-0ubuntu1) precise; urgency=low * New upstream release. * Fix label leak and make it not have disposition (LP: #937829) -- Ted Gould <ted@ubuntu.com> Thu, 23 Feb 2012 00:10:04 -0600 libdbusmenu (0.5.91-0ubuntu2) precise; urgency=low * debian/control: restore gtk2 gir depends until that source is updated -- Sebastien Bacher <seb128@ubuntu.com> Wed, 15 Feb 2012 22:00:04 +0100 libdbusmenu (0.5.91-0ubuntu1) precise; urgency=low * debian/control: - drop git binaries, the libdev depends on it - set ubuntu vcs - use the current vala version [ Ted Gould ] * New upstream release. * Remove unused const on GStrv's * Only free when there is data to free * Ensure that we only return once even with error (LP: #929856) * Fix an error on a failure to send properties (LP: #929707) * Ensure the hash variant isn't NULL in the comparison (LP: #929710) * Fix some of the issues with throwing criticals * Ensure our tests fail if they throw criticals * Parse and handle a11y descriptions * Don't pass NULL to ATK * Non-srcdir build fixes -- Sebastien Bacher <seb128@ubuntu.com> Wed, 15 Feb 2012 21:38:35 +0100 libdbusmenu (0.5.90-0ubuntu1) precise; urgency=low [ Ted Gould ] * New upstream release. * Add property for accessible descriptions * Use insert/remove signals on GTK3 build * Change icon data to be a byte stream instead of base64 * Adjust GTK3 include path to match other libs * Don't get objects from boolean values (LP: #870742) * Fix depreactions on GTK3 (LP: #917115) [ Ken VanDine ] * debian/control - build depend on libatk1.0-dev * debian/*-dev.install - fixed paths for installed headers * debian/libdbusmenu-glib4.symbols - added new symbols -- Ken VanDine <ken.vandine@canonical.com> Thu, 02 Feb 2012 14:09:24 -0500 libdbusmenu (0.5.1-0ubuntu2) precise; urgency=low * libdbusmenu-gtk/parser.c - Don't try to get objects from boolean values. Handle the 'always show image' property by getting the image from the object and using that (LP: #870742) -- Ken VanDine <ken.vandine@canonical.com> Thu, 01 Dec 2011 11:07:36 -0500 libdbusmenu (0.5.1-0ubuntu1) precise; urgency=low * New upstream release. * Allow for an ID of 0 in about_to_show for indicators (LP: #862989) * Clear the image pointer when we take it * Ensure we drop all references to the GTK widget when a menuitem gets destroyed (LP: #835646) -- Ted Gould <ted@ubuntu.com> Fri, 28 Oct 2011 09:35:13 -0400 libdbusmenu (0.5.0-1ubuntu1) precise; urgency=low * Multiarch conversion (partial, gobject instrospection not touched) (LP: #859512) -- Riku Voipio <riku.voipio@linaro.org> Mon, 26 Sep 2011 12:13:07 +0300

Modifications :
  1. Download patch debian/patches/0002-gtkdoc-check-Move-over-gtkdoc-check-unit-tests-to-th.patch

    --- 16.04.1+18.04.20171206-1/debian/patches/0002-gtkdoc-check-Move-over-gtkdoc-check-unit-tests-to-th.patch 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/patches/0002-gtkdoc-check-Move-over-gtkdoc-check-unit-tests-to-th.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -From 761ae73c061f9be0ae8dcd97893e75d6e02fbf46 Mon Sep 17 00:00:00 2001 -From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> -Date: Fri, 6 Oct 2017 11:13:09 +0200 -Subject: [PATCH] gtkdoc-check: Move over gtkdoc-check unit tests to the docs/ - directory and use AM's unit testing API. (However, this seems to be broken - currently, so we disable those tests completely, for now (current solution - after hours of investigating). - ---- - docs/libdbusmenu-glib/reference/Makefile.am | 1 + - docs/libdbusmenu-gtk/reference/Makefile.am | 2 +- - tests/Makefile.am | 22 ---------------------- - 3 files changed, 2 insertions(+), 23 deletions(-) - -diff --git a/docs/libdbusmenu-glib/reference/Makefile.am b/docs/libdbusmenu-glib/reference/Makefile.am -index 9274c5c..924a795 100644 ---- a/docs/libdbusmenu-glib/reference/Makefile.am -+++ b/docs/libdbusmenu-glib/reference/Makefile.am -@@ -93,4 +93,5 @@ if ENABLE_GTK_DOC - TESTS_ENVIRONMENT = cd $(srcdir) && \ - DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) -+# TESTS = $(GTKDOC_CHECK) - endif -diff --git a/docs/libdbusmenu-gtk/reference/Makefile.am b/docs/libdbusmenu-gtk/reference/Makefile.am -index 8cc3d07..ce1e8ca 100644 ---- a/docs/libdbusmenu-gtk/reference/Makefile.am -+++ b/docs/libdbusmenu-gtk/reference/Makefile.am -@@ -93,5 +93,5 @@ if ENABLE_GTK_DOC - TESTS_ENVIRONMENT = cd $(srcdir) && \ - DOC_MODULE=$(DOC_MODULE) DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \ - SRCDIR=$(abs_srcdir) BUILDDIR=$(abs_builddir) -+# TESTS = $(GTKDOC_CHECK) - endif -- -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 64e3e75..98409d6 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -40,12 +40,6 @@ TESTS += \ - # test-gtk-submenu - endif - --if ENABLE_GTK_DOC --TESTS += \ -- test_libdbusmenu_glib_gtkdoc \ -- test_libdbusmenu_gtk_gtkdoc --endif -- - # The Python test only work on the system copy of - # dbusmenu, so while they can be usefule they're not - # good tests of what you're currently building. Handy -@@ -545,22 +539,6 @@ test-mago: test-gtk-label-client test-gtk-label-server $(srcdir)/dbusmenu-gtk/ma - @echo PYTHONPATH=$(abs_srcdir)/dbusmenu-gtk/mago_tests mago -f dbusmenu.xml -t $(abs_builddir)/mago.results --log-level=debug >> $@ - @chmod +x $@ - --######################### --# Other --######################### -- --test_libdbusmenu_glib_gtkdoc: -- @echo "#!/bin/bash" > $@ -- @echo cd $(abs_top_builddir)/docs/libdbusmenu-glib/reference >> $@ -- @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@ -- @chmod +x $@ -- --test_libdbusmenu_gtk_gtkdoc: -- @echo "#!/bin/bash" > $@ -- @echo cd $(abs_top_builddir)/docs/libdbusmenu-gtk/reference >> $@ -- @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@ -- @chmod +x $@ -- - examplesdir = $(docdir)/examples/ - - examples_DATA = \ --- -2.11.0 -
  2. Download patch debian/rules

    --- 16.04.1+18.04.20171206-1/debian/rules 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/rules 2018-09-18 10:38:09.000000000 +0000 @@ -1,9 +1,5 @@ #!/usr/bin/make -f -export DEB_BUILD_MAINT_OPTIONS = hardening=+all -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/buildflags.mk - FLAVORS = gtk2 gtk3 CONFIGURE_FLAGS_gtk2 = --with-gtk=2 @@ -11,8 +7,7 @@ CONFIGURE_FLAGS_gtk3 = --with-gtk=3 CONFIGURE_COMMON_FLAGS += --disable-scrollkeeper --enable-gtk-doc --enable-introspection --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) -INSTALL_COMMON_FLAGS = -MISSING_COMMON_FLAGS = --fail-missing +INSTALL_COMMON_FLAGS = --fail-missing LDFLAGS += -Wl,-z,defs -Wl,--as-needed @@ -35,14 +30,10 @@ dobuild-%: override_dh_auto_install: $(FLAVORS:%=doinstall-%) doinstall-%: - dh_auto_install --no-parallel --builddirectory=builddir/$* --destdir=debian/tmp/$* + dh_auto_install --builddirectory=builddir/$* --destdir=debian/tmp/$* override_dh_auto_test: $(FLAVORS:%=dotest-%) -override_dh_auto_clean: - dh_auto_clean - rm -Rvf builddir/ - dotest-%: ifeq ($(DEB_HOST_ARCH),ppc64el) : # ignore the test results on $(DEB_HOST_ARCH) @@ -51,22 +42,6 @@ else VERBOSE=1 xvfb-run -a dh_auto_test --builddirectory=builddir/$* endif -override_dh_missing: - dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk4 --sourcedir=debian/tmp/gtk2 - dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk-dev --sourcedir=debian/tmp/gtk2 - dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk-doc --sourcedir=debian/tmp/gtk2 - dh_missing $(MISSING_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk-0.4 --sourcedir=debian/tmp/gtk2 - dh_missing $(MISSING_COMMON_FLAGS) -pgir1.2-dbusmenu-glib-0.4 --sourcedir=debian/tmp/gtk3 - dh_missing $(MISSING_COMMON_FLAGS) -pgir1.2-dbusmenu-gtk3-0.4 --sourcedir=debian/tmp/gtk3 - dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-glib4 --sourcedir=debian/tmp/gtk3 - dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-glib-dev --sourcedir=debian/tmp/gtk3 - dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-glib-doc --sourcedir=debian/tmp/gtk3 - dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk3-4 --sourcedir=debian/tmp/gtk3 - dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-gtk3-dev --sourcedir=debian/tmp/gtk3 - dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-jsonloader4 --sourcedir=debian/tmp/gtk3 - dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-jsonloader-dev --sourcedir=debian/tmp/gtk3 - dh_missing $(MISSING_COMMON_FLAGS) -plibdbusmenu-tools --sourcedir=debian/tmp/gtk3 - override_dh_install: find debian/tmp -name \*.la -delete # Remove gtk2 copies of dbusmenu-tools (we use the gtk3 build) @@ -91,9 +66,4 @@ override_dh_install: override_dh_shlibdeps: dh_shlibdeps -plibdbusmenu-gtk4 -- -xlibgtk2.0-0 dh_shlibdeps -plibdbusmenu-gtk3-4 -- -xlibgtk-3-0 - dh_shlibdeps -plibdbusmenu-glib4 - dh_shlibdeps -plibdbusmenu-jsonloader4 - dh_shlibdeps -plibdbusmenu-tools -get-orig-source: - uscan --noconf --force-download --rename --download-current-version --destdir=..
  3. Download patch debian/libdbusmenu-gtk3-dev.install

    --- 16.04.1+18.04.20171206-1/debian/libdbusmenu-gtk3-dev.install 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/libdbusmenu-gtk3-dev.install 2018-09-18 10:38:09.000000000 +0000 @@ -1,6 +1,6 @@ usr/include/libdbusmenu-gtk3-0.4/libdbusmenu-gtk +usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc usr/lib/*/libdbusmenu-gtk3.a usr/lib/*/libdbusmenu-gtk3.so -usr/lib/*/pkgconfig/dbusmenu-gtk3-0.4.pc usr/share/gir-1.0/DbusmenuGtk3-0.4.gir usr/share/vala/vapi/DbusmenuGtk3-0.4.vapi
  4. Download patch debian/compat

    --- 16.04.1+18.04.20171206-1/debian/compat 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/compat 2018-09-18 10:38:09.000000000 +0000 @@ -1 +1 @@ -11 +9
  5. Download patch debian/libdbusmenu-gtk-dev.install

    --- 16.04.1+18.04.20171206-1/debian/libdbusmenu-gtk-dev.install 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/libdbusmenu-gtk-dev.install 2018-09-18 10:38:09.000000000 +0000 @@ -1,6 +1,6 @@ usr/include/libdbusmenu-gtk-0.4/libdbusmenu-gtk +usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc usr/lib/*/libdbusmenu-gtk.a usr/lib/*/libdbusmenu-gtk.so -usr/lib/*/pkgconfig/dbusmenu-gtk-0.4.pc usr/share/gir-1.0/DbusmenuGtk-0.4.gir usr/share/vala/vapi/DbusmenuGtk-0.4.vapi
  6. Download patch debian/patches/0001_no-deprecated-gnome-common-macros.patch

    --- 16.04.1+18.04.20171206-1/debian/patches/0001_no-deprecated-gnome-common-macros.patch 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/patches/0001_no-deprecated-gnome-common-macros.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,12 +0,0 @@ -Description: Drop deprecated gnome-common variables. -Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> - ---- a/autogen.sh -+++ b/autogen.sh -@@ -9,6 +9,4 @@ - - gtkdocize || exit 1 - --USE_GNOME2_MACROS=1 \ --USE_COMMON_DOC_BUILD=yes \ - gnome-autogen.sh --enable-gtk-doc $@
  7. Download patch debian/control
  8. Download patch debian/libdbusmenu-glib-dev.install

    --- 16.04.1+18.04.20171206-1/debian/libdbusmenu-glib-dev.install 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/libdbusmenu-glib-dev.install 2018-09-18 10:38:09.000000000 +0000 @@ -1,6 +1,6 @@ usr/include/libdbusmenu-glib-0.4/libdbusmenu-glib +usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc usr/lib/*/libdbusmenu-glib.a usr/lib/*/libdbusmenu-glib.so -usr/lib/*/pkgconfig/dbusmenu-glib-0.4.pc usr/share/gir-1.0/Dbusmenu-0.4.gir usr/share/vala/vapi/Dbusmenu-0.4.vapi
  9. Download patch INSTALL
  10. Download patch debian/watch

    --- 16.04.1+18.04.20171206-1/debian/watch 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/watch 2018-09-18 10:38:09.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu/libdbusmenu_([0-9.\+]+).orig.tar.gz +http://launchpad.net/dbusmenu/+download .*/libdbusmenu-([0-9.]+)\.tar\.gz
  11. Download patch debian/patches/README

    --- 16.04.1+18.04.20171206-1/debian/patches/README 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/patches/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -0xxx: Grabbed from upstream development. -1xxx: Possibly relevant for upstream adoption. -2xxx: Only relevant for official Debian release.
  12. Download patch debian/patches/series

    --- 16.04.1+18.04.20171206-1/debian/patches/series 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -0001_no-deprecated-gnome-common-macros.patch -0002-gtkdoc-check-Move-over-gtkdoc-check-unit-tests-to-th.patch
  13. Download patch tests/Makefile.am

    --- 16.04.1+18.04.20171206-1/tests/Makefile.am 2017-12-06 15:58:48.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/tests/Makefile.am 2018-09-17 16:25:07.000000000 +0000 @@ -552,13 +552,13 @@ test-mago: test-gtk-label-client test-gt test_libdbusmenu_glib_gtkdoc: @echo "#!/bin/bash" > $@ @echo cd $(abs_top_builddir)/docs/libdbusmenu-glib/reference >> $@ - @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@ + @echo $(GTKDOC_CHECK_PATH) >> $@ @chmod +x $@ test_libdbusmenu_gtk_gtkdoc: @echo "#!/bin/bash" > $@ @echo cd $(abs_top_builddir)/docs/libdbusmenu-gtk/reference >> $@ - @echo gtester --verbose -k $(GTKDOC_CHECK_PATH) >> $@ + @echo $(GTKDOC_CHECK_PATH) >> $@ @chmod +x $@ examplesdir = $(docdir)/examples/
  14. Download patch debian/libdbusmenu-gtk-doc.install

    --- 16.04.1+18.04.20171206-1/debian/libdbusmenu-gtk-doc.install 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/libdbusmenu-gtk-doc.install 2018-09-18 10:38:09.000000000 +0000 @@ -1,2 +1,2 @@ -usr/share/doc/libdbusmenu/examples/glib-server-nomenu.c usr/share/gtk-doc/html/libdbusmenu-gtk /usr/share/gtk-doc/html/ +usr/share/doc/libdbusmenu/examples/glib-server-nomenu.c
  15. Download patch debian/libdbusmenu-tools.install

    --- 16.04.1+18.04.20171206-1/debian/libdbusmenu-tools.install 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/libdbusmenu-tools.install 2018-09-18 10:38:09.000000000 +0000 @@ -1,3 +1,3 @@ usr/lib/*/dbusmenu-* -usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/ usr/share/libdbusmenu/* /usr/share/libdbusmenu-tools/ +usr/share/doc/libdbusmenu/README.dbusmenu-bench /usr/share/doc/libdbusmenu-tools/
  16. Download patch debian/source/format

    --- 16.04.1+18.04.20171206-1/debian/source/format 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/source/format 2018-09-18 10:38:09.000000000 +0000 @@ -1 +1 @@ -3.0 (quilt) +1.0
  17. Download patch debian/copyright
  18. Download patch debian/libdbusmenu-jsonloader-dev.install

    --- 16.04.1+18.04.20171206-1/debian/libdbusmenu-jsonloader-dev.install 2018-07-16 08:53:14.000000000 +0000 +++ 16.04.1+18.10.20180917-0ubuntu1/debian/libdbusmenu-jsonloader-dev.install 2018-09-18 10:38:09.000000000 +0000 @@ -1,4 +1,4 @@ usr/include/libdbusmenu-glib-0.4/libdbusmenu-jsonloader +usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc usr/lib/*/libdbusmenu-jsonloader.a usr/lib/*/libdbusmenu-jsonloader.so -usr/lib/*/pkgconfig/dbusmenu-jsonloader-0.4.pc

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libdbusmenu-qt

libdbusmenu-qt (0.9.3+16.04.20160218-1ubuntu1) bionic; urgency=medium * Breaks/Replaces on libdbusmenu-qt5 for libdbusmenu-qt5-2. libdbusmenu-qt5 exists in Ubuntu archive, but not debian history. Can be dropped after 18.04. -- Rik Mills <rikmills@kubuntu.org> Tue, 30 Jan 2018 12:58:55 +0000

Modifications :
  1. Download patch debian/control

    --- 0.9.3+16.04.20160218-1/debian/control 2016-03-28 11:21:12.000000000 +0000 +++ 0.9.3+16.04.20160218-1ubuntu1/debian/control 2018-01-30 11:11:11.000000000 +0000 @@ -36,6 +36,8 @@ Architecture: any Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} +Breaks: libdbusmenu-qt5 +Replaces: libdbusmenu-qt5 Multi-Arch: same Description: Qt implementation of the DBusMenu protocol This library provides a Qt implementation of the DBusMenu protocol.
  1. dbus
  2. dbus-test-runner
  3. golang-go-dbus
  4. kdbusaddons
  5. libdbusmenu
  6. libdbusmenu-qt