- move dbus-monitor into dbus package

- drop dbus-1-utils package
- add dbus-x11 package
- move dbus-launch and Xsession start script from dbus into dbus-x11
- add dependency on dbus-x11 to dbus to not break packages which depend 
  on dbus but should be updated to depend on dbus-x11


git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@1433 ceb527fc-18e6-0310-9fe2-813c157c29e7

7 files changed, 42 insertions, 31 deletions

diff --git a/debian/changelog b/debian/changelog
index f35510b9..d1f4fd13 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,10 +2,16 @@ dbus (1.0.2-5) unstable; urgency=low
 
   * debian/dbus.init
     + Add some safety checks and support for file-rc. (Closes: #419984)
-  * debian/control
-    + Revise package description of dbus-1-utils. (Closes: #404981)
-
- -- Michael Biebl <biebl@debian.org>  Mon, 23 Apr 2007 00:15:42 +0200
+  * Drop dbus-1-utils package and move dbus-monitor into the dbus package.
+    (Closes: #404981)
+  * Create dbus-x11 package and move dbus-launch and the Xsession start script
+    from dbus into this package. This removes the X11 dependency from the dbus
+    package.
+    Add a dependency on dbus-x11 to the dbus package, to not break packages
+    which still depend on dbus but should be updated to depend on dbus-x11
+    instead if they require a D-Bus session bus.
+
+ -- Michael Biebl <biebl@debian.org>  Tue, 24 Apr 2007 08:42:40 +0200
 
 dbus (1.0.2-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0b408485..38162c0d 100644
--- a/debian/control
+++ b/debian/control
@@ -10,9 +10,10 @@ XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus
 
 Package: dbus
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.22.0), lsb-base (>= 3.1)
-Conflicts: libdbus0, dbus-1, dbus-1-utils (<< 0.50-2), libdbus-1-1
-Replaces: libdbus0, dbus-1
+Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.22.0), lsb-base (>= 3.1), dbus-x11
+Conflicts: libdbus0, dbus-1, dbus-1-utils (<< 1.0.2-5), libdbus-1-1
+Replaces: libdbus0, dbus-1, dbus-1-utils (<< 1.0.2-5)
+Provides: dbus-1-utils
 Description: simple interprocess messaging system
  D-Bus is a message bus, used for sending messages between
  applications.  Conceptually, it fits somewhere in between raw sockets
@@ -26,9 +27,26 @@ Description: simple interprocess messaging system
  .
  It comes with several bindings, including GLib, Python, Qt and Java.
  .
- This package contains the D-Bus daemon; the client-side library can
- be found in the libdbus-1-3 package, as it is no longer contained in
- this package.
+ This package contains the D-Bus daemon and related 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-x11
+Architecture: any
+Section: x11
+Depends: ${shlibs:Depends}, dbus
+Conflicts: dbus (<< 1.0.2-5)
+Replaces: dbus (<< 1.0.2-5)
+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 terms of complexity.
+ .
+ This package contains the dbus-lauch utitility which is necessary for
+ packages using a D-Bus session bus.
+ .
+ See the dbus description for more information about D-Bus in general.
 
 Package: libdbus-1-3
 Architecture: any
@@ -51,19 +69,6 @@ Description: simple interprocess messaging system
  .
  The daemon can be found in the dbus package.
 
-Package: dbus-1-utils
-Architecture: any
-Section: utils
-Depends: ${shlibs:Depends}, dbus
-Description: simple interprocess messaging system (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.
- .
- This package contains D-Bus related utilities like dbus-monitor.
- .
- See the dbus description for more information about D-Bus in general.
-
 Package: dbus-1-doc
 Section: doc
 Architecture: all
diff --git a/debian/dbus-1-utils.install b/debian/dbus-1-utils.install
deleted file mode 100644
index e365c9bb..00000000
--- a/debian/dbus-1-utils.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/tmp/usr/bin/dbus-monitor
-debian/tmp/usr/share/man/man1/dbus-monitor.1
diff --git a/debian/dbus-x11.install b/debian/dbus-x11.install
new file mode 100644
index 00000000..38907c95
--- /dev/null
+++ b/debian/dbus-x11.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/dbus-launch
+debian/tmp/usr/share/man/man1/dbus-launch.1
diff --git a/debian/dbus.dirs b/debian/dbus.dirs
index 51d7f17a..765ca0fa 100644
--- a/debian/dbus.dirs
+++ b/debian/dbus.dirs
@@ -1 +1,2 @@
 /var/lib/dbus
+/etc/dbus-1/event.d
diff --git a/debian/dbus.install b/debian/dbus.install
index 31ff05ce..754d942e 100644
--- a/debian/dbus.install
+++ b/debian/dbus.install
@@ -2,12 +2,12 @@ debian/tmp/var/run/dbus
 debian/tmp/etc/dbus-1/
 debian/tmp/usr/bin/dbus-daemon
 debian/tmp/usr/bin/dbus-cleanup-sockets
-debian/tmp/usr/bin/dbus-launch
 debian/tmp/usr/bin/dbus-send
 debian/tmp/usr/bin/dbus-uuidgen
+debian/tmp/usr/bin/dbus-monitor
 debian/tmp/usr/share/man/man1/dbus-daemon.1
 debian/tmp/usr/share/man/man1/dbus-cleanup-sockets.1
 debian/tmp/usr/share/dbus-1/services
-debian/tmp/usr/share/man/man1/dbus-launch.1
 debian/tmp/usr/share/man/man1/dbus-send.1
 debian/tmp/usr/share/man/man1/dbus-uuidgen.1
+debian/tmp/usr/share/man/man1/dbus-monitor.1
diff --git a/debian/rules b/debian/rules
index 4d89d501..df96ea3b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,10 +15,9 @@ DEB_CONFIGURE_EXTRA_FLAGS := --enable-xml-docs --enable-doxygen-docs
 
 DEB_SHLIBDEPS_INCLUDE_dbus-1-utils := debian/libdbus-1-3/usr/lib/ 
 
-binary-post-install/dbus::
-	mkdir -p debian/dbus/etc/dbus-1/event.d
-	mkdir -p debian/dbus/etc/X11/Xsession.d
-	cp debian/dbus-Xsession debian/dbus/etc/X11/Xsession.d/75dbus_dbus-launch
+binary-post-install/dbus-x11::
+	mkdir -p debian/dbus-x11/etc/X11/Xsession.d
+	cp debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/75dbus_dbus-launch
 
 build/dbus-1-doc::
 	doxygen Doxyfile