Commit 78b72650 authored by Simon McVittie's avatar Simon McVittie

Merge from unstable

* Merge from unstable
* libdbus-1-3 Breaks versions of kdebase-workspace-bin and kde-window-manager
  that suffer from #623492, so partial upgrades don't make KDE unusable
  (Closes: #624333)
* Policy 3.9.2 (no changes required)
* De-duplicate short descriptions
* Add DEP-3 metadata to 01_no-fatal-warnings.patch
* Remove jquery.js at the right location
* Re-upload with non-broken .changes file
parents e05b37ee 4d172a43
dbus (1.5.0-2) experimental; urgency=low
* Merge from unstable
-- Simon McVittie <smcv@debian.org> Wed, 27 Apr 2011 16:41:52 +0100
dbus (1.4.8-3) unstable; urgency=low
* libdbus-1-3 Breaks versions of kdebase-workspace-bin and kde-window-manager
that suffer from #623492, so partial upgrades don't make KDE unusable
(Closes: #624333)
* Policy 3.9.2 (no changes required)
* De-duplicate short descriptions
* Add DEP-3 metadata to 01_no-fatal-warnings.patch
-- Simon McVittie <smcv@debian.org> Wed, 27 Apr 2011 16:11:18 +0100
dbus (1.4.8-2) unstable; urgency=low
* Remove jquery.js at the right location
* Re-upload with non-broken .changes file
-- Simon McVittie <smcv@debian.org> Tue, 19 Apr 2011 09:15:04 +0100
dbus (1.5.0-1) experimental; urgency=low
* New upstream development version (targeting experimental)
......
......@@ -15,7 +15,7 @@ Build-Depends: debhelper (>= 8),
xsltproc,
libx11-dev,
libselinux1-dev [linux-any]
Standards-Version: 3.9.1
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/pkg-utopia/dbus.git
Vcs-Browser: http://git.debian.org/?p=pkg-utopia/dbus.git
Homepage: http://dbus.freedesktop.org/
......@@ -28,7 +28,7 @@ Depends: ${shlibs:Depends},
lsb-base (>= 3.2-14)
Suggests: dbus-x11
Multi-Arch: foreign
Description: simple interprocess messaging system
Description: simple interprocess messaging system (daemon and utilities)
D-Bus is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
......@@ -68,9 +68,11 @@ Package: libdbus-1-3
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Breaks: kdebase-workspace-bin (<< 4:4.4.5-9),
kde-window-manager (<< 4:4.4.5-9)
Recommends: dbus
Section: libs
Description: simple interprocess messaging system
Description: simple interprocess messaging system (library)
D-Bus is a message bus, used for sending messages between applications.
Conceptually, it fits somewhere in between raw sockets and CORBA in
terms of complexity.
......
From: Sebastian Dröge <slomo@ubuntu.com>
Subject: Don't abort on fatal warnings by default
Date: 2006-11-14 15:35:00 +0100
This behaviour can be controlled by the DBUS_FATAL_WARNINGS enviroment
variable. This will be set to upstream default again at some point so
if you have an application that prints a DBus warning get it fixed.
Origin: vendor, Debian
Forwarded: no
Index: b/dbus/dbus-internals.c
===================================================================
--- a/dbus/dbus-internals.c 2010-07-14 00:43:38.000000000 +0200
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment