Commit cdfbca4f authored by Simon McVittie's avatar Simon McVittie

Add udeb packages, so the graphical installer can use AT-SPI (Closes: #723952)

parent 26934354
......@@ -2,6 +2,8 @@ dbus (1.6.16-1) UNRELEASED; urgency=low
* New upstream stable release 1.6.16
* Backport the new dbus-run-session tool from D-Bus 1.7
* Add udeb packages, so the graphical installer can use AT-SPI
(Closes: #723952)
-- Simon McVittie <smcv@debian.org> Tue, 08 Oct 2013 14:54:24 +0100
......
......@@ -71,6 +71,20 @@ Description: simple interprocess messaging system (daemon and utilities)
The client-side library can be found in the libdbus-1-3 package, as it is no
longer contained in this package.
Package: dbus-udeb
Section: debian-installer
Priority: extra
Package-Type: udeb
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Description: simple interprocess messaging system (minimal runtime)
D-Bus is a message bus, used for sending messages between applications.
.
This package is a minimal version of the dbus and dbus-x11 packages,
for use in the Debian installer. It can run a session bus, but is not
suitable for use as a system bus.
Package: dbus-x11
Architecture: any
Section: x11
......@@ -114,6 +128,19 @@ Description: simple interprocess messaging system (library)
.
The daemon can be found in the dbus package.
Package: libdbus-1-3-udeb
Section: debian-installer
Priority: extra
Package-Type: udeb
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
Description: simple interprocess messaging system (minimal library)
D-Bus is a message bus, used for sending messages between applications.
.
This package is a minimal version of the libdbus-1-3 package,
for use in the Debian installer.
Package: dbus-1-doc
Section: doc
Architecture: all
......
debian/tmp/etc/dbus-1/session.conf etc/dbus-1
debian/tmp/etc/dbus-1/session.d etc/dbus-1
debian/tmp-udeb/usr/bin/dbus-daemon usr/bin
debian/tmp-udeb/usr/bin/dbus-run-session usr/bin
debian/tmp-udeb/usr/bin/dbus-uuidgen usr/bin
debian/tmp-udeb/usr/bin/dbus-launch usr/bin
#!/bin/sh
set -e
dbus-uuidgen --ensure
#DEBHELPER#
......@@ -42,6 +42,20 @@ debug_configure_flags := \
--libdir='$${prefix}/lib' \
$(NULL)
udeb_configure_flags := \
$(normal_configure_flags) \
--disable-asserts \
--disable-checks \
--disable-doxygen-docs \
--disable-libaudit \
--disable-selinux \
--disable-systemd \
--disable-tests \
--disable-verbose-mode \
--disable-xml-docs \
CFLAGS='$(CFLAGS) -Os' \
$(NULL)
ifeq ($(filter nodocs,$(DEB_BUILD_OPTIONS))$(filter stage1,$(DEB_BUILD_PROFILE)),)
# documentation enabled
normal_configure_flags += \
......@@ -87,10 +101,17 @@ override_dh_auto_configure:
$(common_configure_flags) \
$(debug_configure_flags) \
$(NULL)
dh_auto_configure \
--builddirectory=build-udeb \
-- \
$(common_configure_flags) \
$(udeb_configure_flags) \
$(NULL)
override_dh_auto_build:
dh_auto_build
dh_auto_build --builddirectory=build-debug
dh_auto_build --builddirectory=build-udeb
# tests need more environmental setup at the moment
override_dh_auto_test:
......@@ -99,6 +120,7 @@ override_dh_auto_test:
override_dh_auto_install:
dh_auto_install
make -C build-debug install-exec DESTDIR=$(CURDIR)/debian/tmp
make -C build-udeb install-exec DESTDIR=$(CURDIR)/debian/tmp-udeb
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
......@@ -114,6 +136,11 @@ override_dh_install:
dh_install -p$(libdbusN) \
"usr/lib/$(DEB_HOST_MULTIARCH)/$(libdbus_soname)*" \
lib/$(DEB_HOST_MULTIARCH)
dh_install -pdbus-udeb
dh_install -p$(libdbusN)-udeb \
--sourcedir=debian/tmp-udeb \
"usr/lib/$(DEB_HOST_MULTIARCH)/$(libdbus_soname)*" \
lib/$(DEB_HOST_MULTIARCH)
dh_install --remaining-packages --list-missing $(dh_install_options)
install -m 644 -D debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/75dbus_dbus-launch
......@@ -123,13 +150,14 @@ override_dh_installinit:
# we don't want docs for the debug symbols, just symlink to the library docs
override_dh_installdocs:
dh_installdocs -pdbus-1-dbg --link-doc=$(libdbusN)
dh_installdocs -pdbus-udeb -p$(libdbusN)-udeb --no-act
dh_installdocs --remaining-packages --all AUTHORS NEWS README
override_dh_strip:
dh_strip --dbg-package=dbus-1-dbg
override_dh_makeshlibs:
dh_makeshlibs -V -Ndbus-1-dbg
dh_makeshlibs -V -Ndbus-1-dbg --add-udeb=$(libdbusN)-udeb
override_dh_autoreconf:
cp INSTALL INSTALL.orig
......@@ -144,6 +172,7 @@ override_dh_autoreconf_clean:
override_dh_auto_clean:
dh_auto_clean
dh_auto_clean --builddirectory=build-debug
dh_auto_clean --builddirectory=build-udeb
rm -f build/test/data/valid-config-files/session.conf
rm -f build/test/data/valid-config-files/system.conf
rm -f build-debug/test/data/valid-config-files/session.conf
......
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