Merge branch 'master' of git://anonscm.debian.org/pkg-utopia/dbus

Conflicts:
	debian/changelog
	debian/dbus.postinst

1 files changed, 37 insertions, 6 deletions

diff --git a/debian/control b/debian/control
index 47c7a22b..da3457af 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,9 @@ Uploaders: Sjoerd Simons <sjoerd@debian.org>,
            Simon McVittie <smcv@debian.org>
 # The following packages can be omitted for bootstrapping, but provide extra
 # features:
-#   libsystemd-daemon-dev (circular dependency)
-#   libsystemd-login-dev (circular dependency)
+#   libaudit-dev
+#   libcap-ng-dev
+#   libsystemd-dev (circular dependency)
 # The following packages can be omitted for bootstrapping, but provide extra
 # debugging support in /usr/lib/*/dbus-1.0/debug-build:
 #   valgrind
@@ -28,27 +29,30 @@ Build-Depends: automake (>= 1:1.10),
                dh-smf [illumos-any kopensolaris-any],
                doxygen,
                dpkg-dev (>= 1.16.1),
+               libaudit-dev [linux-any],
+               libcap-ng-dev [linux-any],
                libexpat-dev,
                libdbus-glib-1-dev,
                libglib2.0-dev,
                libbsm1-dev [illumos-any kopensolaris-any],
                libselinux1-dev [linux-any],
-               libsystemd-daemon-dev (>= 32) [linux-any],
-               libsystemd-login-dev (>= 32) [linux-any],
+               libsystemd-dev (>= 209) [linux-any],
                libx11-dev,
                python (>= 2.6),
                python-dbus,
                python-gobject,
-               valgrind [amd64 armel armhf i386 mips mipsel powerpc ppc64 s390x],
+               valgrind [amd64 armhf i386 mips mipsel powerpc ppc64 s390x],
                xmlto,
                xsltproc
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-utopia/dbus.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-utopia/dbus.git
 Homepage: http://dbus.freedesktop.org/
+XS-Testsuite: autopkgtest
 
 Package: dbus
 Architecture: any
+Priority: standard
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          adduser,
@@ -73,6 +77,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
@@ -116,6 +134,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