diff options
author | Sjoerd Simons <sjoerd@debian.org> | 2005-08-23 14:14:38 +0000 |
---|---|---|
committer | Sjoerd Simons <sjoerd@debian.org> | 2005-08-23 14:14:38 +0000 |
commit | 09d2c4c5d384cbfd6590778d399e67ff4c8edb83 (patch) | |
tree | d45dc40b4b2e3d80e05e62670da35f23a4f66174 | |
parent | b99280d63f1ed23712a7c5fbffafb96f3d297b1c (diff) | |
download | dbus-09d2c4c5d384cbfd6590778d399e67ff4c8edb83.tar.gz |
Import dbus package
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@275 ceb527fc-18e6-0310-9fe2-813c157c29e7
27 files changed, 1492 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 00000000..9f8a2bf1 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,514 @@ +dbus (0.23.4-6) unstable; urgency=low + + * debian/rules: Build mono on amd64 instead of s390 + + -- Sjoerd Simons <sjoerd@debian.org> Tue, 23 Aug 2005 11:12:14 +0200 + +dbus (0.23.4-5) unstable; urgency=low + + * C++ transition (Closes: #323998) + * Build-Depend on python-pyrex instead of python2.3-pyrex (Closes: #316683) + * monodoc-dbus-1-manual: Dbus CLI manual package + + -- Sjoerd Simons <sjoerd@debian.org> Mon, 22 Aug 2005 18:49:36 +0200 + +dbus (0.23.4-4) unstable; urgency=low + + * libdbus-cil improvements based on comments from Mirco Bauer + + call dh_clideps before dh_makeclilibs + + use CLI instead of .NET in the package description + * Build CLI bindings on amd64 (Closes: #31427) + + -- Sjoerd Simons <sjoerd@debian.org> Thu, 30 Jun 2005 22:43:12 +0200 + +dbus (0.23.4-3) unstable; urgency=low + + * Also depend on cli-common and use dh_clideps/dh_makeclilibs instead of + dh_netdeps/dh_makenetlibs + + -- Sjoerd Simons <sjoerd@debian.org> Thu, 9 Jun 2005 00:37:10 +0200 + +dbus (0.23.4-2) unstable; urgency=low + + * Upload version with QT and Mono bindings to unstable. (Closes: #271895) + (Closes: #271896) (Closes: #260044) (Closes: #290622) + * debian/patches/dbus_cmsgcred.patch + - Added. Fix syntax error on systems where HAVE_CMSGCRED is defined + (Thanks to Michael Banck) (Closes: #311726) + + -- Sjoerd Simons <sjoerd@debian.org> Mon, 6 Jun 2005 22:48:08 +0200 + +dbus (0.23.4-1bindings0) experimental; urgency=low + + * Enable Mono and QT bindings. + + -- Sjoerd Simons <sjoerd@debian.org> Tue, 5 Apr 2005 22:15:29 +0200 + +dbus (0.23.4-1) unstable; urgency=low + + * New upstream release + * debian/patches/dbus-abi-api.patch + - Removed, fixed upstream + * debian/patches/dbus-python-fix.patch + - Removed, fixed upstream + * debian/patches/fix-policy-group.patch + - Stop segfaulting at "<policy group="..."> tags (Closes: #297495) + * debian/patches/dbus-fixverbose.patch + - Fix inaccurate messages in the debug output of the uid/gid lookup code + (Thanks to Tom Parker) (Closes: #297497) + * debian/patches/dbus-getpwname.patch + * Add .la files in the -dev packages (Closes: #297936) + + -- Sjoerd Simons <sjoerd@debian.org> Wed, 30 Mar 2005 23:02:00 +0200 + +dbus (0.23.2-3) unstable; urgency=low + + * debian/patches/dbus-abi-api.patch + - Fix dbus api and abi breakage between 0.23.1 and 0.23.2 (Closes: #297020) + + -- Sjoerd Simons <sjoerd@debian.org> Mon, 28 Feb 2005 15:05:19 +0100 + +dbus (0.23.2-2) unstable; urgency=low + + * debian/patches/dbus-python-fix.patch + - Fix python bindings (Based on dbus CVS fix) + + -- Sjoerd Simons <sjoerd@debian.org> Thu, 24 Feb 2005 11:19:03 +0100 + +dbus (0.23.2-1bindings0) experimental; urgency=low + * debian/patches/dbus-monofixes.patch + + Removed. Fixed in this release + + - Sjoerd Simons <sjoerd@debian.org> Thu, 17 Feb 2005 13:24:22 +0100 + +dbus (0.23.2-1) unstable; urgency=low + * New upstream release + + -- Sjoerd Simons <sjoerd@debian.org> Wed, 23 Feb 2005 13:04:21 +0100 + +dbus (0.23.1-1bindings0) experimental; urgency=low + + * New upstream release + * debian/patches/dbus-monofixes.patch + + Added. Some mono fixes from dbus cvs + + -- Sjoerd Simons <sjoerd@debian.org> Thu, 17 Feb 2005 13:24:22 +0100 + +dbus (0.23-1mono1) experimental; urgency=low + + * Enable the qt bindings. Thanks to Kevin Ottens + (Closes: #271895) (Closes: #271896) (Closes: #290622) + + -- Sjoerd Simons <sjoerd@debian.org> Sat, 22 Jan 2005 13:53:27 +0100 + +dbus (0.23-1mono0) experimental; urgency=low + + * Enable the mono bindings + + -- Sjoerd Simons <sjoerd@debian.org> Fri, 14 Jan 2005 17:54:26 +0100 + +dbus (0.23-1) unstable; urgency=low + + * New upstream release + * Disable the mono bindings for the unstable packages untill mono goes into + testing. + + -- Sjoerd Simons <sjoerd@debian.org> Fri, 14 Jan 2005 15:22:20 +0100 + +dbus (0.22+cvs.20050104-1) experimental; urgency=low + + * CVS snapshot + * Package the dbus mono bindings for i386, powerpc and s390. Mostly based on + patches from Edd Dumbill. (Closes: #260044) + + -- Sjoerd Simons <sjoerd@debian.org> Wed, 5 Jan 2005 18:20:47 +0100 + +dbus (0.22-4) unstable; urgency=low + + * Let the initscript check if the pid in the pidfile actually corresponds + to a dbus daemon process (Closes: #285758) + + -- Sjoerd Simons <sjoerd@debian.org> Wed, 5 Jan 2005 16:55:45 +0100 + +dbus (0.22-3) unstable; urgency=medium + + * Actually ship the init script improvements mentioned in the previous + upload. (please pass the brown paper bag) + * Call run-parts --reverse on the event.d dir when stopping dbus + (Closes: #269283) + + -- Sjoerd Simons <sjoerd@debian.org> Sat, 6 Nov 2004 16:17:40 +0100 + +dbus (0.22-2) unstable; urgency=medium + + * debian/patches/dbus-monitor.patch + + Updated. Unbreak dbus-monitor when arguments are given. (From the ubuntu + dbus package) + * Use run-parts --arg instead of -a, which works with woody's run-parts + (Closes: #269708) (Closes: #274702) + * Use start-stop-daemon --retry when stopping to ensure the system bus + stopped. Prevents race conditions with the dbus pidfile (Closes: #277148) + * Add myself to Uploaders + * Acknowledge my own NMU (Closes: #272862) + + -- Sjoerd Simons <sjoerd@debian.org> Tue, 02 Nov 2004 12:19:47 +0100 + +dbus (0.22-1.1) unstable; urgency=high + + * Non-maintainer upload with maintainers permission + * debian/patches/dbus-python-64bit.patch + + Added. Taken from dbus cvs. Add support for int64 and uint64 to the + python bindings (Closes: #272862) + * Urgency high because the hal package depending on this fix fixes RC bugs. + + -- Sjoerd Simons <sjoerd@debian.org> Sat, 25 Sep 2004 17:45:33 +0200 + +dbus (0.22-1) unstable; urgency=high + + * New upstream release. + + Urgency high so it slips into sarge before the freeze. + + -- Daniel Stone <daniels@debian.org> Tue, 17 Aug 2004 00:42:56 +0100 + +dbus (0.21-7) unstable; urgency=low + + * Created /etc/dbus-1/event.d/ and added support to dbus' init script + to run the files in it on stop/start/restart + + -- Daniel Silverstone <dsilvers@debian.org> Thu, 22 Jul 2004 14:13:44 +0100 + +dbus (0.21-6) unstable; urgency=low + + * Add a chown,chgrp to the init script to make sure the pid dir is owned + by the messagebus user. + * Modify the dbus-1 init script to remove some arguments from the invocation + of start-stop-daemon so that it will work when being asked to stop a + dbus instance which has a different executable to that installed. + + -- Daniel Silverstone <dsilvers@debian.org> Mon, 12 Jul 2004 21:56:45 +0100 + +dbus (0.21-5) unstable; urgency=low + + * Change debian/control to indicate that dbus is group maintained. + * Build-depend on the version of python2.3-pyrex which theoretically has + the fixed patch for coping with unsigned long int vs. long unsigned int + * Removed the seddery introduced in 0.21-2 because the above build-depend + change should ensure we're safe. + + -- Daniel Silverstone <dsilvers@debian.org> Mon, 5 Jul 2004 17:44:06 +0100 + +dbus (0.21-4) unstable; urgency=low + + * Updated debian/copyright to the AFL 2.0 closes: #239332 + * Updated debian/dbus-1.init to create /var/run/dbus if it + doesn't already exist. closes: #242639 + + -- Daniel Silverstone <dsilvers@debian.org> Fri, 18 Jun 2004 00:20:27 +0100 + +dbus (0.21-3) unstable; urgency=low + + * Add the sed call to Makefile.in too. Damn my forgetfulness. + + -- Daniel Silverstone <dsilvers@debian.org> Wed, 16 Jun 2004 18:06:28 +0100 + +dbus (0.21-2) unstable; urgency=low + + * Add a sed -e's/long unsigned/unsigned long/g' to the python bindings + preparation line. This *should* solve the FTBFS on alpha, s390 and ia64 + * Also, fix an a-umlaut to 'ae' in the changelog to prevent nasty + debian-changelog-file-uses-obsolete-national-charset errors from lintian + + -- Daniel Silverstone <dsilvers@debian.org> Tue, 15 Jun 2004 19:26:12 +0100 + +dbus (0.21-1) unstable; urgency=low + + * New upstream version. + + Fixes varargs crap - cleaner patch from David Zeuthen applied. (closes: + #229274) + * Added provides/replaces/conflicts on dbus-1-utils << 0.20-4, per -4's + moving of manpages. + + -- Daniel Stone <daniels@debian.org> Sun, 21 Mar 2004 02:42:53 +1100 + +dbus (0.20-6) unstable; urgency=low + + * Add a touch of usage information to the top of the dbus Xsession.d file. + Also since we've had confirmation that this file does enough, this version + closes: #230835 + * Add an extra rm -f $PIDFILE to /etc/init.d/dbus-1 to help on restart. + closes: #229609 + * Temporarily quiesce error reports in system.d/*.conf files when loading. + This breaks the standard that the daemon shouldn't start with malformed + configuration files, but at least for now it seems sensible to do. + closes: #230231 + NOTE: this is likely to be removed in a future version of dbus after the + configuration file syntax stabilises. Please report bugs against packages + which have configs which fail to parse with the latest dbus package. + + -- Daniel Silverstone <dsilvers@debian.org> Tue, 10 Feb 2004 00:46:52 +0000 + +dbus (0.20-5) unstable; urgency=low + + * Add an /etc/X11/Xsession.d/ entry to launch a session bus. + You will need to add 'use-session-dbus' to your /etc/X11/Xsession.options + file to enable it. + + -- Daniel Silverstone <dsilvers@debian.org> Tue, 3 Feb 2004 18:15:48 +0000 + +dbus (0.20-4) unstable; urgency=low + + * Ensure the manpages are installed into the right package. + * Add /usr/lib/dbus-1.0/services to the dbus-1 package. (closes: #230413) + * dbus-glib-1-dev now depends on libglib2.0-dev which is kinda needed in order + to get glib-object.h + * Removed the dbus-qt-1 and dbus-qt-1-dev packages until upstream actually + do something with the binding (like putting some code into it) + + -- Daniel Silverstone <dsilvers@debian.org> Sun, 1 Feb 2004 22:22:59 +0000 + +dbus (0.20-3) unstable; urgency=high + + * Urgency high because the old package was virtually useless. + * debian/patches/fix-varargs-usage.diff: + + Merged patch from Michel Daenzer (thanks Michel!) to fix varargs usage, + so we don't segfault on --system anymore. (closes: #229274, #229005, + #229609) + + -- Daniel Stone <daniels@debian.org> Wed, 28 Jan 2004 06:51:07 +1100 + +dbus (0.20-2) unstable; urgency=low + + * The "gotta keep the ftpmaster cab^Whappy release". + + Hey, I need the overrides ... + * debian/python2.3-dbus.install: + + Stop installing .a and .la files (thanks Daniel Silverstone). + * debian/dbus-qt-1-dev.install: + + Install the .la file ... yep, Daniel Silverstone + * debian/patches/dbus-monitor.patch: + + Patch from Daniel Silverstone to add suport for filters to dbus-monitor: + only watch for certain events. + * debian/rules: + + Add --enable-verbose-mode to make debugging far more easier. + - Daniel Silverstone strikes again! + + -- Daniel Stone <daniels@debian.org> Wed, 21 Jan 2004 11:07:37 +1100 + +dbus (0.20-1) unstable; urgency=low + + * New upstream release (closes: #223400). + + This version includes Qt and Python support. + - New packages: dbus-1-qt, python2.3-dbus. + * debian/dbus-1.postinst: + + Call addgroup with --system so it doesn't get a userspace GID. + (closes: #222563) + * debian/control, debian/rules: + + Start building Qt and Python bindings. + * debian/patches/dbus-python-signals-dze.patch: + + Merged patch (already applied in HEAD) to enhance signal support in the + Python interface; available from + http://freedesktop.org/~david/dbus-python-signals-dze.patch. + + -- Daniel Stone <daniels@debian.org> Sat, 6 Dec 2003 00:17:50 +1100 + +dbus (0.13-1) unstable; urgency=low + + * New upstream release. + * debian/control: + + Update Maintainer address to debian.org. + + Add Recommends: dbus-glib-1 to dbus-1-utils, for the dbus-monitor + program. (closes: #213914) + + -- Daniel Stone <daniels@debian.org> Wed, 22 Oct 2003 13:54:53 +1000 + +dbus (0.12-4) unstable; urgency=low + + * debian/control: + + Taking over from Colin as maintainer. + + Bump debhelper Build-Dep to >=4.1.46, when dh_installlogcheck was first + introduced. + + Bump Standards-Version to 3.6.1. + + Add Replaces/Provides/Conflicts on earlier dbus-1 versions to + dbus-1-utils. + * debian/dbus-1.init: + + Clean up after the daemon's pidfile mess, ensuring smooth upgrades. + (closes: #209143) + + -- Daniel Stone <daniel@fooishbar.org> Mon, 22 Sep 2003 12:13:06 +1000 + +dbus (0.12-3) unstable; urgency=low + + * debian/control: + - Break out utilities into separate dbus-1-utils package. + + -- Colin Walters <walters@debian.org> Sat, 30 Aug 2003 20:07:28 -0400 + +dbus (0.12-2) unstable; urgency=low + + * debian/control: + - [dbus-1] Add Depends on adduser (Closes: #204871) + + -- Colin Walters <walters@debian.org> Sun, 10 Aug 2003 22:23:36 -0400 + +dbus (0.12-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Bump Standards-Version to 3.6.0, no changes required. + + -- Colin Walters <walters@debian.org> Wed, 6 Aug 2003 01:50:13 -0400 + +dbus (0.11+cvs200307017-1) unstable; urgency=low + + * New upstream CVS snapshot. + - Creates services directory (Closes: #198433) + + -- Colin Walters <walters@debian.org> Thu, 17 Jul 2003 19:05:37 -0400 + +dbus (0.11+cvs20030528-2) unstable; urgency=low + + * debian/rules: + - Include utils.mk. + + -- Colin Walters <walters@debian.org> Thu, 29 May 2003 02:14:29 -0400 + +dbus (0.11+cvs20030528-1) unstable; urgency=low + + * New upstream CVS snapshot. + * debian/control: + - Build-Depend on latest cdbs to get some minor fixes. + + -- Colin Walters <walters@debian.org> Wed, 28 May 2003 16:56:29 -0400 + +dbus (0.11-2) unstable; urgency=low + + * debian/control: + - Add Build-Depends on cdbs, just because it's so freaking sweet. + * debian/rules: + - Convert to CDBS. + * debian/rocks: + - Removed. + + -- Colin Walters <walters@debian.org> Mon, 19 May 2003 19:21:33 -0400 + +dbus (0.11-1) unstable; urgency=low + + * The "Bill Gates Grants Self 18 Dexterity, 20 Charisma" release. + * New upstream release. + * debian/control: + - Bump Standards-Version to 3.5.10, no changes required. + * debian/rocks: + - No need to create system.d anymore, upstream does it now. + + -- Colin Walters <walters@debian.org> Thu, 15 May 2003 22:01:23 -0400 + +dbus (0.10+cvs20030503-2) unstable; urgency=low + + * The "I've Got To Stop Taking Lives So Seriously" release. + * debian/control: + - Add Build-Depends on docbook-utils. + + -- Colin Walters <walters@debian.org> Sat, 3 May 2003 16:58:20 -0400 + +dbus (0.10+cvs20030503-1) unstable; urgency=low + + * The "Chimp Study On Human-Evasion Response To Feces-Hurling Nearly + Complete" release. + * New upstream snapshot. + - Includes some of my patches; this will among other things make + the system bus go again. + * debian/rocks: + - Add --enable-docs to DEB_CONFIGURE_EXTRA_FLAGS. + * debian/dbus-1-dev.install: + - Update to handle new upstream .pc name. + * debian/rules: + - Update to latest version of Colin's Build System. + + -- Colin Walters <walters@debian.org> Sat, 3 May 2003 03:58:53 -0400 + +dbus (0.10-1) unstable; urgency=low + + * The "West-Wing Tech-Support' Crew Be A Buncha Wack Bitches" release. + * New upstream release. + * debian/dbus-1.install: + - Install all binaries. + * debian/dbus-1-dev.install: + - Install headers from /usr/lib/dbus-1.0 too. + * debian/rocks: + - Create etc/dbus-1/system.d. + + -- Colin Walters <walters@debian.org> Mon, 28 Apr 2003 17:29:50 -0400 + +dbus (0.9-2) unstable; urgency=low + + * The "New Fox Reality Show To Determine Ruler Of Iraq" release. + * debian/rocks: + - Generate API docs via doxygen (Closes: #185470) + * debian/control: + - Build-Depend on doxygen. + * debian/dbus-1-doc.install: + - Install docs in correct place. + - Install newly generated doxygen docs. + * debian/rules: + - Update to latest version of Colin's Build System. + - Eagerly await ftpmaster installing build-common. + + -- Colin Walters <walters@debian.org> Wed, 23 Apr 2003 23:40:00 -0400 + +dbus (0.9-1) unstable; urgency=low + + * The "Starbucks To Begin Sinister 'Phase Two' Of Operation" release. + * New upstream release. + * debian/control: + - Drop "lib*" prefix from all packages, and change suffix from "0" to "-1". + D-BUS isn't technically just a shared library; it also includes a + daemon. This could really go either way; I could just put the daemon + in the libdbus0 package and be done with it, but I think that's more + confusing in the end, since people have been very conditioned to + expect libfoo -> just shared library. + - Add Conflicts: and Replaces: on older lib* packages. + - Remove Provides and Conflicts on libdbus-dev in new dbus-1-dev + package, since they are actually parallel installable. + - Ditto for libdbus-glib0-dev. + - Touch up descriptions. + - Update to Standards-Version: 3.5.9; no changes required. + - Add libexpat-dev to Build-Depends. + * debian/dbus0.init: + - New file; runs the D-BUS daemon. + * debian/dbus0.default: + - New file. + * debian/dbus0.postinst: + - New file; creates the messagebus user and stuff. + * debian/dbus0.install: + - Install configuration files. + * debian/rocks: + - Add --with-xml=expat. + - Update to correspond with changes to debian/control. + - Make dbus-glib-1 package be built after dbus-1 package. + - Add debian/dbus-1/usr/lib to DEB_SHLIBDEPS_INCLUDE_dbus-glib-1 so we + pick up the right shlibs. + * debian/rules: + - Update to latest version of Colin's Build System. + + -- Colin Walters <walters@debian.org> Sun, 13 Apr 2003 23:40:29 -0400 + +dbus (0.6-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - [libdbus0] Flesh out description somewhat. + + -- Colin Walters <walters@debian.org> Tue, 18 Mar 2003 10:50:42 -0500 + +dbus (0.5-2) unstable; urgency=low + + * debian/libdbus0-dev.install: + - Don't include dbus-glib-1.0.pc. + - Don't include dbus-glib-1.a or .so. + + -- Colin Walters <walters@debian.org> Thu, 6 Mar 2003 23:17:53 -0500 + +dbus (0.5-1) unstable; urgency=low + + * Initial version (Closes: #183739) + + -- Colin Walters <walters@debian.org> Thu, 6 Mar 2003 17:58:06 -0500 diff --git a/debian/compat b/debian/compat new file mode 100644 index 00000000..b8626c4c --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 00000000..888ed710 --- /dev/null +++ b/debian/control @@ -0,0 +1,169 @@ +Source: dbus +Section: devel +Priority: optional +Maintainer: D-Bus Maintainance Team <debian-dbus@fooishbar.org> +Uploaders: Daniel Stone <daniels@debian.org>, Daniel Silverstone <dsilvers@debian.org>, Sjoerd Simons <sjoerd@debian.org> +Build-Depends: cdbs (>= 0.4.5.1), debhelper (>= 4.1.46), libglib2.0-dev, libexpat-dev, doxygen, docbook-utils, python, libgtk2.0-dev, python-pyrex (>= 0.9.2.1-3), xmlto, python2.3-dev, kdelibs4-dev (>= 4:3.4.2-1), libqt3-mt-dev (>= 3:3.3.4-4), libmono-dev [i386 powerpc amd64], mono-mcs [i386 powerpc amd64] | c-sharp-compiler [i386 powerpc amd64], mono-gac [i386 powerpc amd64], monodoc-base [i386 powerpc amd64], libgtk-cil [i386 powerpc amd64], cli-common (>= 0.1.3) [i386 powerpc amd64] +Standards-Version: 3.6.1.0 + +Package: dbus-1 +Architecture: any +Depends: ${shlibs:Depends}, adduser, debianutils (>= 1.22.0) +Conflicts: libdbus0 +Replaces: libdbus0 +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 + and CORBA in terms of complexity. + . + D-BUS supports broadcast messages, asynchronous messages (thus + decreasing latency), authentication, and more. It is designed to be + low-overhead; messages are sent using a binary protocol, not using + XML. D-BUS also supports a method call mapping for its messages, but + it is not required; this makes using the system quite simple. + . + D-BUS is still under heavy development, but is expected to be widely + used. It comes with several interfaces, including GLib. See the + description of dbus-glib-1 for more information about those. + +Package: dbus-1-utils +Architecture: any +Section: utils +Depends: ${shlibs:Depends} +Replaces: dbus-1 (<< 0.20-4) +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 several D-BUS related utilities like + dbus-launch and dbus-send. + . + See the dbus-1 description for more information about D-BUS in general. + +Package: dbus-1-doc +Section: doc +Architecture: all +Suggests: dbus-1-dev +Conflicts: libdbus0-doc +Replaces: libdbus0-doc +Description: simple interprocess messaging system (documentation) + 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 API documentation for D-BUS, as well as + the protocol specification. + . + See the dbus-1 description for more information about D-BUS in general. + +Package: dbus-1-dev +Section: libdevel +Architecture: any +Depends: dbus-1 (= ${Source-Version}), pkg-config +Replaces: libdbus0-dev +Description: simple interprocess messaging system (development headers) + 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. + . + See the dbus-1 description for more information about D-BUS in general. + +Package: dbus-glib-1-dev +Section: libdevel +Architecture: any +Depends: dbus-glib-1 (= ${Source-Version}), dbus-1-dev (= ${Source-Version}), libglib2.0-dev +Conflicts: libdbus-glib-dev +Replaces: libdbus-glib0-dev +Description: simple interprocess messaging system (GLib interface) + 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 provides a GLib-style interface to D-BUS. + . + See the dbus-1 description for more information about D-BUS in general. + +Package: dbus-glib-1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: libdbus-glib0 +Replaces: libdbus-glib0 +Description: simple interprocess messaging system (GLib-based shared library) + 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 provides the GLib-based shared library for applications using the + GLib interface to D-BUS. + . + See the dbus-1 description for more information about D-BUS in general. + +Package: dbus-qt-1-dev +Section: libdevel +Architecture: any +Depends: dbus-qt-1c2 (= ${Source-Version}), dbus-1-dev (= ${Source-Version}), libqt3-headers +Description: simple interprocess messaging system (Qt interface) + 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 provides a Qt-style interface to D-BUS. + . + See the dbus-1 description for more information about D-BUS in general. + +Package: dbus-qt-1c2 +Conflicts: dbus-qt-1 +Replaces: dbus-qt-1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: simple interprocess messaging system (Qt-based shared library) + 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 provides the Qt-based shared library for applications using the + Qt interface to D-BUS. + . + See the dbus-1 description for more information about D-BUS in general. + +Package: python2.3-dbus +Section: python +Architecture: any +Depends: ${shlibs:Depends}, ${python:Depends} +Description: simple interprocess messaging system (Python interface) + 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 provides a Python interface to D-BUS. + . + See the dbus-1 description for more information about D-BUS in general. + +Package: libdbus-cil +Section: libs +Architecture: i386 powerpc amd64 +Depends: ${cli:Depends} +Description: CLI binding for D-BUS interprocess messaging system + 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 provides a CLI binding to D-BUS, for use with Mono or + other ECMA CLI implementations. + . + See the dbus-1 description for more information about D-BUS in general. + +Package: monodoc-dbus-1-manual +Section: doc +Depends: monodoc-manual +Architecture: i386 powerpc amd64 +Description: compiled XML documentation for the D-BUS CLI bindings + The MonoDoc Project is the documentation framework of the Mono project which + provides detailed API documentation for all Mono components and the Mono CLI + implementation. + . + This packages contains the compiled XML documentation for the D-BUS CLI + bindings diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 00000000..0224d689 --- /dev/null +++ b/debian/copyright @@ -0,0 +1,213 @@ +This package was debianized by Colin Walters <walters@debian.org> on +Thu, 6 Mar 2003 18:01:37 -0500 + +It was downloaded from http://www.freedesktop.org/software/dbus + +This package is dual-licensed under the Academic Free License, and the +GPL. For a description of the GPL, see /usr/share/common-licenses/GPL +on your Debian system. + +Portions of the package are only licensed under the GPL (notably +tools/dbus-cleanup-sockets.c and test/decode-gcov.c ). + +The Academic Free License follows: + + The Academic Free License + v. 2.0 + +This Academic Free License (the "License") applies to any original +work of authorship (the "Original Work") whose owner (the "Licensor") +has placed the following notice immediately following the copyright +notice for the Original Work: + +Licensed under the Academic Free License version 2.0 + +1) Grant of Copyright License. Licensor hereby grants You a +world-wide, royalty-free, non-exclusive, perpetual, sublicenseable +license to do the following: + +a) to reproduce the Original Work in copies; + +b) to prepare derivative works ("Derivative Works") based upon the Original Work; + +c) to distribute copies of the Original Work and Derivative Works to the public; + +d) to perform the Original Work publicly; and + +e) to display the Original Work publicly. + +2) Grant of Patent License. Licensor hereby grants You a world-wide, +royalty-free, non-exclusive, perpetual, sublicenseable license, under +patent claims owned or controlled by the Licensor that are embodied in +the Original Work as furnished by the Licensor, to make, use, sell and +offer for sale the Original Work and Derivative Works. + +3) Grant of Source Code License. The term "Source Code" means the +preferred form of the Original Work for making modifications to it and +all available documentation describing how to modify the Original +Work. Licensor hereby agrees to provide a machine-readable copy of +the Source Code of the Original Work along with each copy of the +Original Work that Licensor distributes. Licensor reserves the right +to satisfy this obligation by placing a machine-readable copy of the +Source Code in an information repository reasonably calculated to +permit inexpensive and convenient access by You for as long as +Licensor continues to distribute the Original Work, and by publishing +the address of that information repository in a notice immediately +following the copyright notice that applies to the Original Work. + +4) Exclusions From License Grant. Neither the names of Licensor, nor +the names of any contributors to the Original Work, nor any of their +trademarks or service marks, may be used to endorse or promote +products derived from this Original Work without express prior written +permission of the Licensor. Nothing in this License shall be deemed +to grant any rights to trademarks, copyrights, patents, trade secrets +or any other intellectual property of Licensor except as expressly +stated herein. No patent license is granted to make, use, sell or +offer to sell embodiments of any patent claims other than the licensed +claims defined in Section 2. No right is granted to the trademarks of +Licensor even if such marks are included in the Original Work. +Nothing in this License shall be interpreted to prohibit Licensor from +licensing under different terms from this License any Original Work +that Licensor otherwise would have a right to license. + +5) This section intentionally omitted. + +6) Attribution Rights. You must retain, in the Source Code of any +Derivative Works that You create, all copyright, patent or trademark +notices from the Source Code of the Original Work, as well as any +notices of licensing and any descriptive text identified therein as an +"Attribution Notice." You must cause the Source Code for any +Derivative Works that You create to carry a prominent Attribution +Notice reasonably calculated to inform recipients that You have +modified the Original Work. + +7) Warranty of Provenance and Disclaimer of Warranty. Licensor +warrants that the copyright in and to the Original Work and the patent +rights granted herein by Licensor are owned by the Licensor or are +sublicensed to You under the terms of this License with the permission +of the contributor(s) of those copyrights and patent rights. Except +as expressly stated in the immediately proceeding sentence, the +Original Work is provided under this License on an "AS IS" BASIS and +WITHOUT WARRANTY, either express or implied, including, without +limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY +OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY +constitutes an essential part of this License. No license to Original +Work is granted hereunder except under this disclaimer. + +8) Limitation of Liability. Under no circumstances and under no legal +theory, whether in tort (including negligence), contract, or +otherwise, shall the Licensor be liable to any person for any direct, +indirect, special, incidental, or consequential damages of any +character arising as a result of this License or the use of the +Original Work including, without limitation, damages for loss of +goodwill, work stoppage, computer failure or malfunction, or any and +all other commercial damages or losses. This limitation of liability +shall not apply to liability for death or personal injury resulting +from Licensor's negligence to the extent applicable law prohibits such +limitation. Some jurisdictions do not allow the exclusion or +limitation of incidental or consequential damages, so this exclusion +and limitation may not apply to You. + +9) Acceptance and Termination. If You distribute copies of the +Original Work or a Derivative Work, You must make a reasonable effort +under the circumstances to obtain the express assent of recipients to +the terms of this License. Nothing else but this License (or another +written agreement between Licensor and You) grants You permission to +create Derivative Works based upon the Original Work or to exercise +any of the rights granted in Section 1 herein, and any attempt to do +so except under the terms of this License (or another written +agreement between Licensor and You) is expressly prohibited by +U.S. copyright law, the equivalent laws of other countries, and by +international treaty. Therefore, by exercising any of the rights +granted to You in Section 1 herein, You indicate Your acceptance of +this License and all of its terms and conditions. + +10) Termination for Patent Action. This License shall terminate +automatically and You may no longer exercise any of the rights granted +to You by this License as of the date You commence an action, +including a cross-claim or counterclaim, for patent infringement (i) +against Licensor with respect to a patent applicable to software or +(ii) against any entity with respect to a patent applicable to the +Original Work (but excluding combinations of the Original Work with +other software or hardware). + +11) Jurisdiction, Venue and Governing Law. Any action or suit relating +to this License may be brought only in the courts of a jurisdiction +wherein the Licensor resides or in which Licensor conducts its primary +business, and under the laws of that jurisdiction excluding its +conflict-of-law provisions. The application of the United Nations +Convention on Contracts for the International Sale of Goods is +expressly excluded. Any use of the Original Work outside the scope of +this License or after its termination shall be subject to the +requirements and penalties of the U.S. Copyright Act, 17 U.S.C. \u00a4 +101 et seq., the equivalent laws of other countries, and international +treaty. This section shall survive the termination of this License. + +12) Attorneys Fees. In any action to enforce the terms of this License +or seeking damages relating thereto, the prevailing party shall be +entitled to recover its costs and expenses, including, without +limitation, reasonable attorneys' fees and costs incurred in +connection with such action, including any appeal of such action. +This section shall survive the termination of this License. + +13) Miscellaneous. This License represents the complete agreement +concerning the subject matter hereof. If any provision of this +License is held to be unenforceable, such provision shall be reformed +only to the extent necessary to make it enforceable. + +14) Definition of "You" in This License. "You" throughout this +License, whether in upper or lower case, means an individual or a +legal entity exercising rights under, and complying with all of the +terms of, this License. For legal entities, "You" includes any entity +that controls, is controlled by, or is under common control with you. +For purposes of this definition, "control" means (i) the power, direct +or indirect, to cause the direction or management of such entity, +whether by contract or otherwise, or (ii) ownership of fifty percent +(50%) or more of the outstanding shares, or (iii) beneficial ownership +of such entity. + +15) Right to Use. You may use the Original Work in all ways not +otherwise restricted or conditioned by this License or by law, and +Licensor promises not to interfere with or be responsible for such +uses by You. + +This license is Copyright (C) 2003 Lawrence E. Rosen. All rights +reserved. Permission is hereby granted to copy and distribute this +license without modification. This license may not be modified +without the express written permission of its copyright owner. + +-- +END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential +differences between the Academic Free License (AFL) version 1.0 and other +open source licenses: + +The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache +licenses in many respects but it is intended to solve a few problems with +those licenses. + +* The AFL is written so as to make it clear what software is being +licensed (by the inclusion of a statement following the copyright notice +in the software). This way, the license functions better than a template +license. The BSD, MIT and UoI/NCSA licenses apply to unidentified software. + +* The AFL contains a complete copyright grant to the software. The BSD +and Apache licenses are vague and incomplete in that respect. + +* The AFL contains a complete patent grant to the software. The BSD, MIT, +UoI/NCSA and Apache licenses rely on an implied patent license and contain +no explicit patent grant. + +* The AFL makes it clear that no trademark rights are granted to the +licensor's trademarks. The Apache license contains such a provision, but the +BSD, MIT and UoI/NCSA licenses do not. + +* The AFL includes the warranty by the licensor that it either owns the +copyright or that it is distributing the software under a license. None of +the other licenses contain that warranty. All other warranties are disclaimed, +as is the case for the other licenses. + +* The AFL is itself copyrighted (with the right granted to copy and distribute +without modification). This ensures that the owner of the copyright to the +license will control changes. The Apache license contains a copyright notice, +but the BSD, MIT and UoI/NCSA licenses do not. diff --git a/debian/dbus-1-dev.install b/debian/dbus-1-dev.install new file mode 100644 index 00000000..be969b56 --- /dev/null +++ b/debian/dbus-1-dev.install @@ -0,0 +1,6 @@ +debian/tmp/usr/include/dbus*/dbus/dbus*.h +debian/tmp/usr/lib/dbus*/include/dbus/dbus*.h +debian/tmp/usr/lib/pkgconfig/dbus-1.pc +debian/tmp/usr/lib/libdbus-1*.a +debian/tmp/usr/lib/libdbus-1*.so +debian/tmp/usr/lib/libdbus-1*.la diff --git a/debian/dbus-1-doc.install b/debian/dbus-1-doc.install new file mode 100644 index 00000000..56075c63 --- /dev/null +++ b/debian/dbus-1-doc.install @@ -0,0 +1,4 @@ +doc/dbus-specification.html usr/share/doc/dbus-1-doc +doc/dbus-test-plan.html usr/share/doc/dbus-1-doc +doc/dcop-howto.txt usr/share/doc/dbus-1-doc +doc/api/html usr/share/doc/dbus-1-doc/api/ diff --git a/debian/dbus-1-utils.install b/debian/dbus-1-utils.install new file mode 100644 index 00000000..6b2402d2 --- /dev/null +++ b/debian/dbus-1-utils.install @@ -0,0 +1,6 @@ +debian/tmp/usr/bin/dbus-launch +debian/tmp/usr/bin/dbus-monitor +debian/tmp/usr/bin/dbus-send +debian/tmp/usr/share/man/man1/dbus-launch.1 +debian/tmp/usr/share/man/man1/dbus-monitor.1 +debian/tmp/usr/share/man/man1/dbus-send.1 diff --git a/debian/dbus-1.default b/debian/dbus-1.default new file mode 100644 index 00000000..b901f8d6 --- /dev/null +++ b/debian/dbus-1.default @@ -0,0 +1,10 @@ +# This is a configuration file for /etc/init.d/dbus-1; it allows you to +# perform common modifications to the behavior of the dbus daemon +# startup without editing the init script (and thus getting prompted +# by dpkg on upgrades). We all love dpkg prompts. + +# Parameters to pass to dbus. +PARAMS="" + +# Whether or not to run the dbus system daemon; set to 0 to disable. +ENABLED=1 diff --git a/debian/dbus-1.init b/debian/dbus-1.init new file mode 100644 index 00000000..bd31b620 --- /dev/null +++ b/debian/dbus-1.init @@ -0,0 +1,86 @@ +#! /bin/sh +# -*- coding: utf-8 -*- +# Debian init.d script for D-BUS +# Copyright © 2003 Colin Walters <walters@debian.org> + +set -e + +DAEMON=/usr/bin/dbus-daemon-1 +NAME=dbus-1 +DAEMONUSER=messagebus +PIDDIR=/var/run/dbus +PIDFILE=$PIDDIR/pid +DESC="system message bus" +EVENTDIR=/etc/dbus-1/event.d + +test -x $DAEMON || exit 0 + +# Source defaults file; edit that file to configure this script. +ENABLED=1 +PARAMS="" +if [ -e /etc/default/dbus-1 ]; then + . /etc/default/dbus-1 +fi + +test "$ENABLED" != "0" || exit 0 + +start_it_up() +{ + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER $PIDDIR + chgrp $DAEMONUSER $PIDDIR + fi + if [ -e $PIDFILE ]; then + PIDDIR=/proc/$(cat $PIDFILE) + if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then + echo "$DESC already started; not starting." + else + echo "Removing stale PID file $PIDFILE." + rm -f $PIDFILE + fi + fi + echo -n "Starting $DESC: " + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $DAEMONUSER --exec $DAEMON -- --system $PARAMS + echo "$NAME." + if [ -d $EVENTDIR ]; then + run-parts --arg=start $EVENTDIR + fi +} + +shut_it_down() +{ + if [ -d $EVENTDIR ]; then + run-parts --reverse --arg=stop $EVENTDIR + fi + echo -n "Stopping $DESC: " + start-stop-daemon --stop --retry 60 --quiet --oknodo --pidfile $PIDFILE \ + --user $DAEMONUSER + # We no longer include these arguments so that start-stop-daemon + # can do its job even given that we may have been upgraded. + # We rely on the pidfile being sanely managed + # --exec $DAEMON -- --system $PARAMS + echo "$NAME." + rm -f $PIDFILE +} + +case "$1" in + start) + start_it_up + ;; + stop) + shut_it_down + ;; + restart|force-reload) + shut_it_down + sleep 1 + start_it_up + ;; + *) + echo "Usage: /etc/init.d/$NAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 diff --git a/debian/dbus-1.install b/debian/dbus-1.install new file mode 100644 index 00000000..a6ea8f82 --- /dev/null +++ b/debian/dbus-1.install @@ -0,0 +1,10 @@ +debian/tmp/var/run/dbus +debian/tmp/etc/dbus-1 +debian/tmp/usr/bin/dbus-daemon-1 +debian/tmp/usr/bin/dbus-cleanup-sockets +debian/tmp/usr/lib/libdbus-1*.so.* +debian/tmp/usr/share/man/man1/dbus-daemon-1.1 +debian/tmp/usr/share/man/man1/dbus-cleanup-sockets.1 +debian/tmp/usr/share/dbus-1/services +debian/tmp/usr/share/dbus-1/services/* + diff --git a/debian/dbus-1.postinst b/debian/dbus-1.postinst new file mode 100644 index 00000000..2206d51c --- /dev/null +++ b/debian/dbus-1.postinst @@ -0,0 +1,21 @@ +#!/bin/sh +# -*- coding: utf-8 -*- +# Post-installation script for D-BUS +# Copyright © 2003 Colin Walters <walters@debian.org> + +MESSAGEUSER=messagebus +MESSAGEHOME=/var/run/dbus + +chgrp "$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || addgroup --system "$MESSAGEUSER" +chown "$MESSAGEUSER"."$MESSAGEUSER" "$MESSAGEHOME" 2>/dev/null || \ + adduser --system --home "$MESSAGEHOME" --no-create-home --disabled-password --ingroup "$MESSAGEUSER" "$MESSAGEUSER" + +if [ -x "/etc/init.d/dbus-1" ] && [ "$1" = configure ] && [ "x$2" != "x" ]; then + if [ -x /usr/sbin/invoke-rc.d ]; then + /usr/sbin/invoke-rc.d dbus-1 stop + else + /etc/init.d/dbus-1 stop + fi +fi + +#DEBHELPER# diff --git a/debian/dbus-Xsession b/debian/dbus-Xsession new file mode 100644 index 00000000..95117656 --- /dev/null +++ b/debian/dbus-Xsession @@ -0,0 +1,17 @@ +# $Id:$ +# In order to activate the session bus at X session launch +# simply place use-session-dbus into your /etc/X11/Xsession.options file +# + +STARTDBUS= +DBUSLAUNCH=/usr/bin/dbus-launch + +if grep -qs ^use-session-dbus "$OPTIONFILE"; then + if [ -x "$DBUSLAUNCH" ]; then + STARTDBUS=yes + fi +fi + +if [ -n "$STARTDBUS" ]; then + STARTUP="$DBUSLAUNCH --exit-with-session $STARTUP" +fi diff --git a/debian/dbus-glib-1-dev.install b/debian/dbus-glib-1-dev.install new file mode 100644 index 00000000..59b9f856 --- /dev/null +++ b/debian/dbus-glib-1-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/include/dbus*/dbus/dbus-glib.h +debian/tmp/usr/lib/pkgconfig/dbus-glib-1.pc +debian/tmp/usr/lib/libdbus-glib-*.a +debian/tmp/usr/lib/libdbus-glib-*.so +debian/tmp/usr/lib/libdbus-glib-*.la diff --git a/debian/dbus-glib-1.install b/debian/dbus-glib-1.install new file mode 100644 index 00000000..31eb1f6b --- /dev/null +++ b/debian/dbus-glib-1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbus-glib*.so.* diff --git a/debian/dbus-qt-1-dev.install b/debian/dbus-qt-1-dev.install new file mode 100644 index 00000000..1570d8be --- /dev/null +++ b/debian/dbus-qt-1-dev.install @@ -0,0 +1,9 @@ +debian/tmp/usr/include/dbus*/dbus/dbus-qt.h +debian/tmp/usr/include/dbus*/dbus/connection.h +debian/tmp/usr/include/dbus*/dbus/integrator.h +debian/tmp/usr/include/dbus*/dbus/message.h +debian/tmp/usr/include/dbus*/dbus/server.h +debian/tmp/usr/lib/libdbus-qt-*.a +debian/tmp/usr/lib/libdbus-qt*.la +debian/tmp/usr/lib/libdbus-qt*.so + diff --git a/debian/dbus-qt-1c2.install b/debian/dbus-qt-1c2.install new file mode 100644 index 00000000..35158631 --- /dev/null +++ b/debian/dbus-qt-1c2.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libdbus-qt*.so.* diff --git a/debian/libdbus-cil.install b/debian/libdbus-cil.install new file mode 100644 index 00000000..c889355e --- /dev/null +++ b/debian/libdbus-cil.install @@ -0,0 +1,4 @@ +debian/tmp/usr/lib/pkgconfig/dbus-sharp.pc +debian/tmp/usr/lib/mono/* +debian/tmp/usr/share/dotnet/mono/* +debian/tmp/usr/share/dotnet/monodoc/* diff --git a/debian/monodoc-dbus-1-manual.install b/debian/monodoc-dbus-1-manual.install new file mode 100644 index 00000000..cc24bd38 --- /dev/null +++ b/debian/monodoc-dbus-1-manual.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/monodoc/sources/* diff --git a/debian/monodoc-dbus-1-manual.postinst b/debian/monodoc-dbus-1-manual.postinst new file mode 100644 index 00000000..5c8cf89f --- /dev/null +++ b/debian/monodoc-dbus-1-manual.postinst @@ -0,0 +1,9 @@ +#!/bin/sh +set -e + +if [ -x /usr/lib/monodoc/browser.exe ]; then + echo "generating monodoc search index..." + monodoc --make-index > /dev/null +fi + +#DEBHELPER# diff --git a/debian/patches/dbus-fixverbose.patch b/debian/patches/dbus-fixverbose.patch new file mode 100644 index 00000000..d05aa16c --- /dev/null +++ b/debian/patches/dbus-fixverbose.patch @@ -0,0 +1,50 @@ +--- dbus-0.23.2/dbus/dbus-userdb.c Tue Mar 1 03:33:20 2005 ++++ dbus-0.23.2.old/dbus/dbus-userdb.c Tue Mar 1 03:32:25 2005 +@@ -78,20 +78,23 @@ + + if (uid != DBUS_UID_UNSET) + info = _dbus_hash_table_lookup_ulong (db->users, uid); +- else ++ else + info = _dbus_hash_table_lookup_string (db->users_by_name, _dbus_string_get_const_data (username)); + + if (info) + { +- _dbus_verbose ("Using cache for UID "DBUS_UID_FORMAT" information\n", +- uid); ++ _dbus_verbose ("Using cache for UID "DBUS_UID_FORMAT" information\n", info->uid); + return info; + } + else + { ++ if (uid != DBUS_UID_UNSET) + _dbus_verbose ("No cache for UID "DBUS_UID_FORMAT"\n", + uid); +- ++ else ++ _dbus_verbose ("No cache for user \"%s\"\n", ++ _dbus_string_get_const_data(username)); ++ + info = dbus_new0 (DBusUserInfo, 1); + if (info == NULL) + { +@@ -161,13 +164,17 @@ + if (info) + { + _dbus_verbose ("Using cache for GID "DBUS_GID_FORMAT" information\n", +- gid); ++ info->gid); + return info; + } + else + { +- _dbus_verbose ("No cache for GID "DBUS_GID_FORMAT"\n", ++ if (gid != DBUS_GID_UNSET) ++ _dbus_verbose ("No cache for GID "DBUS_GID_FORMAT"\n", + gid); ++ else ++ _dbus_verbose ("No cache for group \"%s\"\n", ++ _dbus_string_get_const_data(groupname)); + + info = dbus_new0 (DBusGroupInfo, 1); + if (info == NULL) diff --git a/debian/patches/dbus-getpwname.patch b/debian/patches/dbus-getpwname.patch new file mode 100644 index 00000000..effccd23 --- /dev/null +++ b/debian/patches/dbus-getpwname.patch @@ -0,0 +1,60 @@ +diff -ur dbus-0.23.2/dbus/dbus-sysdeps.c dbus-0.23.2.old/dbus/dbus-sysdeps.c +--- dbus-0.23.2/dbus/dbus-sysdeps.c Wed Jan 12 00:07:52 2005 ++++ dbus-0.23.2.old/dbus/dbus-sysdeps.c Tue Mar 1 03:25:02 2005 +@@ -1422,7 +1422,7 @@ + * checks + */ + +-#if defined (HAVE_POSIX_GETPWNAME_R) || defined (HAVE_NONPOSIX_GETPWNAME_R) ++#if defined (HAVE_POSIX_GETPWNAM_R) || defined (HAVE_NONPOSIX_GETPWNAM_R) + { + struct passwd *p; + int result; +@@ -1430,8 +1430,8 @@ + struct passwd p_str; + + p = NULL; +-#ifdef HAVE_POSIX_GETPWNAME_R +- if (uid >= 0) ++#ifdef HAVE_POSIX_GETPWNAM_R ++ if (uid != DBUS_UID_UNSET) + result = getpwuid_r (uid, &p_str, buf, sizeof (buf), + &p); + else +@@ -1443,7 +1443,7 @@ + else + p = getpwnam_r (username_c, &p_str, buf, sizeof (buf)); + result = 0; +-#endif /* !HAVE_POSIX_GETPWNAME_R */ ++#endif /* !HAVE_POSIX_GETPWNAM_R */ + if (result == 0 && p == &p_str) + { + if (!fill_user_info_from_passwd (p, info, error)) +@@ -1658,7 +1658,7 @@ + * to add more configure checks. + */ + +-#if defined (HAVE_POSIX_GETPWNAME_R) || defined (HAVE_NONPOSIX_GETPWNAME_R) ++#if defined (HAVE_POSIX_GETPWNAM_R) || defined (HAVE_NONPOSIX_GETPWNAM_R) + { + struct group *g; + int result; +@@ -1666,7 +1666,7 @@ + struct group g_str; + + g = NULL; +-#ifdef HAVE_POSIX_GETPWNAME_R ++#ifdef HAVE_POSIX_GETPWNAM_R + + if (group_c_str) + result = getgrnam_r (group_c_str, &g_str, buf, sizeof (buf), +@@ -1677,7 +1677,7 @@ + #else + p = getgrnam_r (group_c_str, &g_str, buf, sizeof (buf)); + result = 0; +-#endif /* !HAVE_POSIX_GETPWNAME_R */ ++#endif /* !HAVE_POSIX_GETPWNAM_R */ + if (result == 0 && g == &g_str) + { + return fill_user_info_from_group (g, info, error); + diff --git a/debian/patches/dbus-monitor.patch b/debian/patches/dbus-monitor.patch new file mode 100644 index 00000000..c2f90c88 --- /dev/null +++ b/debian/patches/dbus-monitor.patch @@ -0,0 +1,150 @@ +diff -urN dbus-0.22.orig/tools/dbus-monitor.1 dbus-0.22/tools/dbus-monitor.1 +--- dbus-0.22.orig/tools/dbus-monitor.1 2004-10-10 20:47:19.906823680 +1000 ++++ dbus-0.22/tools/dbus-monitor.1 2004-10-10 20:47:27.791625008 +1000 +@@ -9,6 +9,7 @@ + .PP + .B dbus-monitor + [\-\-system | \-\-session] ++[watch expressions] + + .SH DESCRIPTION + +@@ -25,6 +26,11 @@ + monitor the system or session buses respectively. If neither is + specified, \fIdbus-monitor\fP monitors the session bus. + ++.PP ++In order to get \fIdbus-monitor\fP to see the messages you are interested ++in, you should specify a set of watch expressions as you would expect to ++be passed to the \fIdbus_bus_add_watch\fP function. ++ + .PP + The message bus configuration may keep \fIdbus-monitor\fP from seeing + all messages, especially if you run the monitor as a non-root user. +@@ -37,6 +43,15 @@ + .I "--session" + Monitor the session message bus. (This is the default.) + ++.SH EXAMPLE ++Here is an example of using dbus-monitor to watch for the gnome typing ++monitor to say things ++.nf ++ ++ dbus-monitor "type='signal',sender='org.gnome.TypingMonitor',interface='org.gnome.TypingMonitor'" ++ ++.fi ++ + .SH AUTHOR + dbus-monitor was written by Philip Blundell. + +--- dbus-0.22-1ubuntu1/tools/dbus-monitor.c 2004-08-10 13:03:37.000000000 +1000 ++++ dbus-0.22/tools/dbus-monitor.c 2004-10-10 21:38:08.532362152 +1000 +@@ -45,7 +45,7 @@ + static void + usage (char *name, int ecode) + { +- fprintf (stderr, "Usage: %s [--system | --session]\n", name); ++ fprintf (stderr, "Usage: %s [--system | --session] [watch expressions]\n", name); + exit (ecode); + } + +@@ -56,8 +56,8 @@ + DBusError error; + DBusBusType type = DBUS_BUS_SESSION; + GMainLoop *loop; +- int i; +- ++ int i = 0, j = 0, numFilters = 0; ++ char **filters = NULL; + for (i = 1; i < argc; i++) + { + char *arg = argv[i]; +@@ -69,14 +69,18 @@ + else if (!strcmp (arg, "--help")) + usage (argv[0], 0); + else if (!strcmp (arg, "--")) +- break; ++ continue; + else if (arg[0] == '-') + usage (argv[0], 1); ++ else { ++ numFilters++; ++ filters = (char **)realloc(filters, numFilters * sizeof(char *)); ++ filters[j] = (char *)malloc((strlen(arg) + 1) * sizeof(char *)); ++ snprintf(filters[j], strlen(arg) + 1, "%s", arg); ++ j++; ++ } + } + +- if (argc > 2) +- usage (argv[0], 1); +- + loop = g_main_loop_new (NULL, FALSE); + + dbus_error_init (&error); +@@ -92,26 +102,45 @@ + + dbus_connection_setup_with_g_main (connection, NULL); + +- dbus_bus_add_match (connection, +- "type='signal'", +- &error); +- if (dbus_error_is_set (&error)) +- goto lose; +- dbus_bus_add_match (connection, +- "type='method_call'", +- &error); +- if (dbus_error_is_set (&error)) +- goto lose; +- dbus_bus_add_match (connection, +- "type='method_return'", +- &error); +- if (dbus_error_is_set (&error)) +- goto lose; +- dbus_bus_add_match (connection, +- "type='error'", +- &error); +- if (dbus_error_is_set (&error)) +- goto lose; ++ if (numFilters) ++ { ++ for (i = 0; i < j; i++) ++ { ++ dbus_bus_add_match (connection, filters[i], &error); ++ if (dbus_error_is_set (&error)) ++ { ++ fprintf (stderr, "Failed to setup match \"%s\": %s\n", ++ filters[i], error.message); ++ dbus_error_free (&error); ++ exit (1); ++ } ++ free(filters[i]); ++ } ++ } ++ else ++ { ++ dbus_bus_add_match (connection, ++ "type='signal'", ++ &error); ++ if (dbus_error_is_set (&error)) ++ goto lose; ++ dbus_bus_add_match (connection, ++ "type='method_call'", ++ &error); ++ if (dbus_error_is_set (&error)) ++ goto lose; ++ dbus_bus_add_match (connection, ++ "type='method_return'", ++ &error); ++ if (dbus_error_is_set (&error)) ++ goto lose; ++ dbus_bus_add_match (connection, ++ "type='error'", ++ &error); ++ if (dbus_error_is_set (&error)) ++ goto lose; ++ } ++ + if (!dbus_connection_add_filter (connection, filter_func, NULL, NULL)) { + fprintf (stderr, "Couldn't add filter!\n"); + exit (1); diff --git a/debian/patches/dbus-quiesce-startup-errors.patch b/debian/patches/dbus-quiesce-startup-errors.patch new file mode 100644 index 00000000..ba5142af --- /dev/null +++ b/debian/patches/dbus-quiesce-startup-errors.patch @@ -0,0 +1,23 @@ +--- dbus-0.20-virgin-patches/bus/config-parser.c 2003-10-14 21:30:21.000000000 +0100 ++++ dbus-0.20/bus/config-parser.c 2004-02-10 00:40:05.000000000 +0000 +@@ -1710,8 +1710,18 @@ + { + if (!include_file (parser, &full_path, TRUE, error)) + { +- _dbus_string_free (&full_path); +- goto failed; ++ /* Debian patch to skip malformed /etc/dbus-1/system.d entries */ ++ /* ++ * _dbus_string_free (&full_path); ++ * goto failed; ++ */ ++ if (dbus_error_is_set (error)) ++ { ++ _dbus_warn("\nEncountered error '%s' while parsing '%s'\n", ++ error->message, ++ _dbus_string_get_const_data(&full_path)); ++ dbus_error_free (error); ++ } + } + } + diff --git a/debian/patches/dbus_cmsgcred.patch b/debian/patches/dbus_cmsgcred.patch new file mode 100644 index 00000000..72e01977 --- /dev/null +++ b/debian/patches/dbus_cmsgcred.patch @@ -0,0 +1,13 @@ +--- dbus-0.23.4/dbus/dbus-sysdeps.c.orig 2005-06-02 20:00:58.000000000 +0200 ++++ dbus-0.23.4/dbus/dbus-sysdeps.c 2005-06-02 20:01:37.000000000 +0200 +@@ -862,8 +862,8 @@ + #ifdef HAVE_CMSGCRED + if (cmsg->cmsg_len < sizeof (cmsgmem) || cmsg->cmsg_type != SCM_CREDS) + { +- dbus_set_error (error, DBUS_ERROR_FAILED); +- _dbus_verbose ("Message from recvmsg() was not SCM_CREDS\n"); ++ dbus_set_error (error, DBUS_ERROR_FAILED, ++ "Message from recvmsg() was not SCM_CREDS"); + return FALSE; + } + #endif diff --git a/debian/patches/fix-policy-group.patch b/debian/patches/fix-policy-group.patch new file mode 100644 index 00000000..7dbf626c --- /dev/null +++ b/debian/patches/fix-policy-group.patch @@ -0,0 +1,32 @@ +diff -Nur dbus-0.23/dbus/dbus-userdb.c dbus-0.23.new/dbus/dbus-userdb.c +--- dbus-0.23/dbus/dbus-userdb.c 2004-08-29 04:14:52.000000000 +0200 ++++ dbus-0.23.new/dbus/dbus-userdb.c 2005-02-14 13:45:03.779521400 +0100 +@@ -176,11 +176,24 @@ + return NULL; + } + +- if (!_dbus_group_info_fill_gid (info, gid, error)) ++ ++ if (gid != DBUS_GID_UNSET) + { +- _DBUS_ASSERT_ERROR_IS_SET (error); +- free_group_info (info); +- return NULL; ++ if (!_dbus_group_info_fill_gid (info, gid, error)) ++ { ++ _DBUS_ASSERT_ERROR_IS_SET (error); ++ free_group_info (info); ++ return NULL; ++ } ++ } ++ else ++ { ++ if (!_dbus_group_info_fill (info, groupname, error)) ++ { ++ _DBUS_ASSERT_ERROR_IS_SET (error); ++ free_group_info (info); ++ return NULL; ++ } + } + + if (!_dbus_hash_table_insert_ulong (db->groups, info->gid, info)) diff --git a/debian/python2.3-dbus.install b/debian/python2.3-dbus.install new file mode 100644 index 00000000..6627f357 --- /dev/null +++ b/debian/python2.3-dbus.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/python2.3/site-packages/dbus.py +debian/tmp/usr/lib/python2.3/site-packages/dbus_bindings.so diff --git a/debian/rules b/debian/rules new file mode 100755 index 00000000..45adb08d --- /dev/null +++ b/debian/rules @@ -0,0 +1,75 @@ +#!/usr/bin/make -f +# Copyright © 2002,2003 Colin Walters <walters@verbum.org> +# Copyright © 2003 Daniel Stone <daniels@debian.org> + +binary/dbus-glib-1:: binary/dbus-1 +binary/dbus-qt-1:: binary/dbus-1 +binary/dbus-1-utils:: binary/dbus-glib-1 +binary/python2.3-dbus:: + dh_python -ppython2.3-dbus + +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + +ifeq ($(DEB_BUILD_ARCH),powerpc) + MONO_FLAGS=--enable-mono --enable-mono-docs +endif +ifeq ($(DEB_BUILD_ARCH),amd64) + MONO_FLAGS=--enable-mono --enable-mono-docs +endif +ifeq ($(DEB_BUILD_ARCH),i386) + MONO_FLAGS=--enable-mono --enable-mono-docs +endif + + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-glib --enable-qt --enable-gtk \ + --enable-python --with-xml=expat --enable-docs \ + --enable-xml-docs --enable-doxygen-docs \ + --enable-verbose-mode \ + $(MONO_FLAGS) + +DEB_SHLIBDEPS_INCLUDE_dbus-glib-1 := debian/dbus-1/usr/lib/ +DEB_SHLIBDEPS_INCLUDE_dbus-1-utils := debian/dbus-1/usr/lib/ debian/dbus-glib-1/usr/lib/ +DEB_SHLIBDEPS_INCLUDE_dbus-qt-1 := debian/dbus-1/usr/lib/ +DEB_SHLIBDEPS_INCLUDE_python2.3-dbus := debian/dbus-1/usr/lib/ + +DEB_DH_INSTALLINIT_ARGS := -r + +# Strict library versioning +DEB_DH_MAKESHLIBS_ARGS_ALL := -V + +export MONO_SHARED_DIR=$(CURDIR) + +binary-predeb/libdbus-cil:: + dh_makeclilibs -V + dh_clideps + +common-configure-indep:: + mkdir -p $(MONO_SHARED_DIR)/.wapi + +common-configure-impl:: + chmod +x py-compile + +binary-post-install/dbus-1-dev:: + rm -f debian/dbus-1-dev/usr/include/dbus*/dbus/dbus-glib.h + rm -f debian/dbus-1-dev/usr/include/dbus*/dbus/dbus-qt.h + +binary-post-install/dbus-1-utils:: + mkdir -p debian/dbus-1-utils/etc/X11/Xsession.d + cp debian/dbus-Xsession debian/dbus-1-utils/etc/X11/Xsession.d/75dbus-1-utils_dbus-launch + +binary-post-install/dbus-1:: + mkdir -p debian/dbus-1/etc/dbus-1/event.d + +binary-post-install/libdbus-cil:: + cd $(CURDIR)/debian/libdbus-cil && \ + find -type f -name "*.dll" -exec chmod -x {} \; + +build/dbus-1-doc:: + doxygen Doxyfile + +clean:: + rm -rf doc/api + rm -rf $(MONO_SHARED_DIR)/.wapi |