diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 0ac3ab1f..5e1351f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,9 @@ dbus (1.2.24-1) UNRELEASED; urgency=low - Use new "has_option" function from x11-common instead of grepping the option file, to avoid calling an external program. (Closes: #570480) Thanks to Martin Pitt for the patch. + * debian/control + - Add Breaks: x11-common (<< 1:7.5+4) to dbus-x11 to ensure we have a + recent enough version with "has_option" support. -- Michael Biebl <biebl@debian.org> Tue, 23 Mar 2010 22:28:20 +0100 diff --git a/debian/control b/debian/control index 21408413..9415dbcd 100644 --- a/debian/control +++ b/debian/control @@ -57,6 +57,7 @@ Depends: ${shlibs:Depends}, dbus Conflicts: dbus (<< 1.1.2) Replaces: dbus (<< 1.1.2) +Breaks: x11-common (<< 1:7.5+4) Description: simple interprocess messaging system (X11 deps) D-Bus is a message bus, used for sending messages between applications. Conceptually, it fits somewhere in between raw sockets and CORBA in |