Commit 944be896 authored by Simon McVittie's avatar Simon McVittie

Merge from unstable

parents 1ee24523 055ca667
dbus (1.5.2-3) UNRELEASED; urgency=low
* Merge from unstable
* Revert some of the changes merged from Ubuntu, which look as though
they shouldn't be needed on either distribution:
- there's no need to create/chown messagebus' home directory, the sysvinit
......@@ -14,6 +15,16 @@ dbus (1.5.2-3) UNRELEASED; urgency=low
-- Simon McVittie <smcv@debian.org> Thu, 09 Jun 2011 13:59:31 +0100
dbus (1.4.12-1) unstable; urgency=medium
* New upstream release fixes local DoS (Closes: #629938, no CVE number yet)
* Don't delete jquery.js, no longer installed by recent Doxygen
* Build-depend on libglib2.0-dev, libdbus-glib-1-dev for better regression
test coverage (dbus-glib is a circular dependency, but both of these
dependencies can be dropped if bootstrapping new architectures)
-- Simon McVittie <smcv@debian.org> Fri, 10 Jun 2011 22:39:14 +0100
dbus (1.5.2-2) experimental; urgency=low
* Merge from unstable
......
......@@ -7,6 +7,8 @@ Uploaders: Sjoerd Simons <sjoerd@debian.org>,
Michael Biebl <biebl@debian.org>,
Loic Minier <lool@dooz.org>,
Simon McVittie <smcv@debian.org>
# libdbus-glib-1-dev and libglib2.0-dev can be omitted for bootstrapping,
# but if you have them in Build-Depends, more tests can be run
Build-Depends: autotools-dev,
debhelper (>= 8.1.3),
dh-autoreconf,
......@@ -14,6 +16,8 @@ Build-Depends: autotools-dev,
dpkg-dev (>= 1.16.0~ubuntu4),
hardening-includes,
libexpat-dev,
libdbus-glib-1-dev,
libglib2.0-dev,
libselinux1-dev [linux-any],
libx11-dev,
xmlto,
......
debian/tmp/usr/lib/*/dbus-1.0/test
debian/tmp/usr/lib/*/dbus-1.0/debug-build/bin
debian/tmp/usr/lib/*/dbus-1.0/debug-build/lib
......@@ -23,6 +23,7 @@ common_configure_flags := \
--disable-gc-sections \
--disable-silent-rules \
--disable-libaudit \
--enable-installed-tests \
--libexecdir=\$${prefix}/lib/dbus-1.0 \
--htmldir=\$${prefix}/share/doc/dbus \
--with-systemdsystemunitdir=/lib/systemd/system \
......@@ -53,8 +54,10 @@ override_dh_auto_build:
# work around fd.o #36156
xsltproc -o build/doc/dbus.devhelp doc/doxygen_to_devhelp.xsl build/doc/api/xml/index.xml
# tests in the debug build need more environmental setup at the moment, so
# only run the smaller set of tests from the normal build
override_dh_auto_test:
: # tests need more environmental setup at the moment
dh_auto_test
override_dh_auto_install:
dh_auto_install
......@@ -64,7 +67,11 @@ override_dh_link:
dh_link -plibdbus-1-dev lib/$(DEB_HOST_MULTIARCH)/$$(basename $$(readlink debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-1.so)) usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-1.so
dh_link --remaining-packages
# if bootstrapping (without dbus-glib), no tests will get installed - create
# the directory in case that's happened, so the .install file doesn't need
# modification
override_dh_install:
install -d debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/dbus-1.0/test
rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libdbus-1.la
dh_install -p$(libdbusN) \
usr/lib/$(DEB_HOST_MULTIARCH)/$(libdbus_soname)* \
......
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