[Pkg-utopia-commits] r1433 - in /packages/unstable/dbus/debian: changelog control dbus-1-utils.install dbus-x11.install dbus.dirs dbus.install rules

biebl at users.alioth.debian.org biebl at users.alioth.debian.org
Tue Apr 24 06:56:38 UTC 2007 

Author: biebl
Date: Tue Apr 24 06:56:36 2007
New Revision: 1433

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1433
Log:
- 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

Added:
    packages/unstable/dbus/debian/dbus-x11.install
Removed:
    packages/unstable/dbus/debian/dbus-1-utils.install
Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/control
    packages/unstable/dbus/debian/dbus.dirs
    packages/unstable/dbus/debian/dbus.install
    packages/unstable/dbus/debian/rules

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=1433&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Tue Apr 24 06:56:36 2007
@@ -2,10 +2,16 @@
 
   * 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 at 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 at debian.org>  Tue, 24 Apr 2007 08:42:40 +0200
 
 dbus (1.0.2-4) unstable; urgency=low
 

Modified: packages/unstable/dbus/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/control?rev=1433&op=diff
==============================================================================
--- packages/unstable/dbus/debian/control (original)
+++ packages/unstable/dbus/debian/control Tue Apr 24 06:56:36 2007
@@ -10,9 +10,10 @@
 
 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 @@
  .
  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
@@ -50,19 +68,6 @@
  It comes with several bindings, including GLib, Python, Qt and Java.
  .
  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

Added: packages/unstable/dbus/debian/dbus-x11.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus-x11.install?rev=1433&op=file
==============================================================================
--- packages/unstable/dbus/debian/dbus-x11.install (added)
+++ packages/unstable/dbus/debian/dbus-x11.install Tue Apr 24 06:56:36 2007
@@ -1,0 +1,2 @@
+debian/tmp/usr/bin/dbus-launch
+debian/tmp/usr/share/man/man1/dbus-launch.1

Modified: packages/unstable/dbus/debian/dbus.dirs
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.dirs?rev=1433&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.dirs (original)
+++ packages/unstable/dbus/debian/dbus.dirs Tue Apr 24 06:56:36 2007
@@ -1,1 +1,2 @@
 /var/lib/dbus
+/etc/dbus-1/event.d

Modified: packages/unstable/dbus/debian/dbus.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.install?rev=1433&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.install (original)
+++ packages/unstable/dbus/debian/dbus.install Tue Apr 24 06:56:36 2007
@@ -2,12 +2,12 @@
 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

Modified: packages/unstable/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/rules?rev=1433&op=diff
==============================================================================
--- packages/unstable/dbus/debian/rules (original)
+++ packages/unstable/dbus/debian/rules Tue Apr 24 06:56:36 2007
@@ -15,10 +15,9 @@
 
 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

More information about the Pkg-utopia-commits mailing list