diff options
| -rw-r--r-- | debian/changelog | 67 | ||||
| -rw-r--r-- | debian/copyright | 64 | ||||
| -rw-r--r-- | debian/dbus.init | 2 |
3 files changed, 67 insertions, 66 deletions
diff --git a/debian/changelog b/debian/changelog index 8db0beda..048c7dfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,6 +41,7 @@ dbus (1.1.4-1) UNRELEASED; urgency=low drop rc0 and rc6.d symlinks on upgrades. * Bump up dbus-x11 conflicts/replaces to << 1.1.2 to match the transition version in Ubuntu and reduce the delta. + * Cleanup trailing whitespace. -- Michael Biebl <biebl@debian.org> Tue, 04 Dec 2007 21:31:12 +0100 @@ -120,7 +121,7 @@ dbus (1.1.0-1) unstable; urgency=low + Fix small typo in the dbus-x11 package description. (Closes: #425132) + Replace Source-Version with binary:Version for libdbus-1-dev. * debian/dbus.init - + Suppress error messages about nonexistent or unreadable files. + + Suppress error messages about nonexistent or unreadable files. (Closes: #426296) + Do not abort on grep errors. (Closes: #423380) + Do not abort if starting a dependent service fails. @@ -188,7 +189,7 @@ dbus (1.0.2-2) unstable; urgency=low * debian/watch + Added. Allows to track upstream releases. * debian/dbus.init - + Add functionality to start/stop dbus dependent services based on their + + Add functionality to start/stop dbus dependent services based on their LSB header. Instead of installing an init script into /etc/dbus-1/event.d, services depending on dbus should from now on install a regular sysv init script @@ -267,10 +268,10 @@ dbus (0.94-2) unstable; urgency=medium [ Sjoerd Simons ] * patches/40_dbus_launch_get_uuid.patch + Added. Check if get_machine_uuid() returns NULL before proceeding any - further: we can't init the X atoms or create a session file name if there - is no machine ID. Solves a dbus-launch crash if there is no machine id. + further: we can't init the X atoms or create a session file name if there + is no machine ID. Solves a dbus-launch crash if there is no machine id. (Closes: 3395938) Patch from upstream CVS - * 2 important bugfixes, setting urgency to medium. + * 2 important bugfixes, setting urgency to medium. -- Sjoerd Simons <sjoerd@debian.org> Mon, 6 Nov 2006 22:02:19 +0100 @@ -322,7 +323,7 @@ dbus (0.92-2) unstable; urgency=low dbus (0.92-1) experimental; urgency=low - * New upstream release + * New upstream release -- Sjoerd Simons <sjoerd@debian.org> Sat, 19 Aug 2006 22:13:25 +0200 @@ -333,7 +334,7 @@ dbus (0.91-1) experimental; urgency=low packages now. * Bumped libdbus-1 soname * debian/control: Remove all build-depends and definitions for the bindings. - * debian/control: Update to use the official D-Bus spelling + * debian/control: Update to use the official D-Bus spelling * debian/rules: Remove everything that was needed to build the bindings. * Remove files not applicable to the D-Bus bus and core libraries: + debian/python-dbus.install @@ -378,9 +379,9 @@ dbus (0.62-4) unstable; urgency=low dbus (0.62-3) unstable; urgency=low - * Make the Qt4 bindings buid-depend on libqt4-dev (>= 4.1.3) + * Make the Qt4 bindings buid-depend on libqt4-dev (>= 4.1.3) (Closes: #374802) - * Ensure /etc/dbus-1/system.d is included in the dbus package + * Ensure /etc/dbus-1/system.d is included in the dbus package (Closes: #374930) -- Sjoerd Simons <sjoerd@debian.org> Thu, 22 Jun 2006 18:36:35 +0200 @@ -398,7 +399,7 @@ dbus (0.62-2) unstable; urgency=low * Let libdbus-1-2 recommend dbus. Almost all libdbus-1 using applications really need the dbus to be present so the recommends is justified. (Closes: #374726) - * debian/libdbus-qt-1-dev.install: Install all the needed header files. + * debian/libdbus-qt-1-dev.install: Install all the needed header files. Thanks to Michael Biebl for testing a KDE4 build against these bindings. -- Sjoerd Simons <sjoerd@debian.org> Wed, 21 Jun 2006 10:47:00 +0200 @@ -473,7 +474,7 @@ dbus (0.61-4) unstable; urgency=low dbus (0.61-3) unstable; urgency=low - * debian/patches/dbus-monoversion.patch + * debian/patches/dbus-monoversion.patch + Added. Dbus mono assembly version is synced with release version, but nothing actually changed. This patch changes the assembly version back to 0.60 to minimize breakage. New version will encode the assembly version @@ -484,7 +485,7 @@ dbus (0.61-3) unstable; urgency=low dbus (0.61-2) unstable; urgency=low * debian/patches/dbus-qt-endianness.patch - + Added. Fix FTBS on big-endian architectures + + Added. Fix FTBS on big-endian architectures -- Sjoerd Simons <sjoerd@debian.org> Tue, 28 Feb 2006 00:58:05 +0100 @@ -502,7 +503,7 @@ dbus (0.61-1) unstable; urgency=medium * Update cli-common depend to >= 0.2.0. Older versions have known bugs * Let binary-predeb/libdbus-1-cil:: depend on common-binary-post-install-arch, so dh_clideps can do it's work correctly. - * debian/patches/dbus-qt-buildfix.patch + * debian/patches/dbus-qt-buildfix.patch + Added. Fix compilation of the Qt bindings (from CVS) * debian/patches/dbus-update-automake.patch + Added. Do a new autogen run, because the qt patch patches autotools @@ -530,7 +531,7 @@ dbus (0.60-5) unstable; urgency=low dbus (0.60-4) unstable; urgency=low - * Upload to unstable + * Upload to unstable -- Sjoerd Simons <sjoerd@debian.org> Thu, 5 Jan 2006 21:55:49 +0100 @@ -572,7 +573,7 @@ dbus (0.60-1) experimental; urgency=low dbus (0.50-3) experimental; urgency=low * Also move dbus-launch and dbus-send manpages to the dbus package - * debian/dbus.init + * debian/dbus.init + Make force-reload an alias of reload instead of restart -- Sjoerd Simons <sjoerd@debian.org> Mon, 21 Nov 2005 11:17:57 +0100 @@ -598,14 +599,14 @@ dbus (0.50-2) experimental; urgency=low dbus (0.50-1) experimental; urgency=low - * New upstream release + * New upstream release -- Sjoerd Simons <sjoerd@debian.org> Thu, 8 Sep 2005 10:01:21 +0200 dbus (0.36.2-1) experimental; urgency=low * New upstream release - * Fix descriptions to refer to dbus rather than dbus-1. + * Fix descriptions to refer to dbus rather than dbus-1. * Make dbus-1-utils depend on dbus * debian/patches/dbus-sessionbus-checkuid.patch + Removed. Fixed upstream @@ -666,7 +667,7 @@ dbus (0.34-3) experimental; urgency=low dbus (0.34-2) experimental; urgency=low - * debian/dbus.init + * debian/dbus.init + The even.d dir is in /etc/dbus-1 not in /etc/dbus -- Sjoerd Simons <sjoerd@debian.org> Tue, 21 Jun 2005 16:16:43 +0200 @@ -733,13 +734,13 @@ dbus (0.23.4-1) unstable; urgency=low 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) + - 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 + * 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 @@ -751,35 +752,35 @@ dbus (0.23.2-1bindings0) experimental; urgency=low -- Sjoerd Simons <sjoerd@debian.org> Thu, 17 Feb 2005 13:24:22 +0100 dbus (0.23.2-1) unstable; urgency=low - * New upstream release + * 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 + * 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 + * 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 + * 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 + * 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 @@ -787,7 +788,7 @@ dbus (0.23-1) unstable; urgency=low dbus (0.22+cvs.20050104-1) experimental; urgency=low * CVS snapshot - * Package the dbus mono bindings for i386, powerpc and s390. Mostly based on + * 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 @@ -803,7 +804,7 @@ 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 + * 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 @@ -834,7 +835,7 @@ dbus (0.22-1.1) unstable; urgency=high dbus (0.22-1) unstable; urgency=high - * New upstream release. + * 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 @@ -863,7 +864,7 @@ dbus (0.21-5) unstable; urgency=low 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 @@ -913,7 +914,7 @@ dbus (0.20-6) unstable; urgency=low 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 @@ -1072,7 +1073,7 @@ dbus (0.11-1) unstable; urgency=low dbus (0.10+cvs20030503-2) unstable; urgency=low - * The "I've Got To Stop Taking Lives So Seriously" release. + * The "I've Got To Stop Taking Lives So Seriously" release. * debian/control: - Add Build-Depends on docbook-utils. @@ -1179,5 +1180,5 @@ dbus (0.5-2) unstable; urgency=low 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/copyright b/debian/copyright index 0224d689..ec4cd49a 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ 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 +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: @@ -26,15 +26,15 @@ Licensed under the Academic Free License version 2.0 world-wide, royalty-free, non-exclusive, perpetual, sublicenseable license to do the following: -a) to reproduce the Original Work in copies; +a) to reproduce the Original Work in copies; -b) to prepare derivative works ("Derivative Works") based upon the Original Work; +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; +c) to distribute copies of the Original Work and Derivative Works to the public; -d) to perform the Original Work publicly; and +d) to perform the Original Work publicly; and -e) to display the Original Work publicly. +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 @@ -70,7 +70,7 @@ 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. +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 @@ -177,37 +177,37 @@ 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 +-- +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 +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 + +* 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 + +* 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 + +* 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 + +* 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, + +* 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. +* 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.init b/debian/dbus.init index 6822c8ee..f04fc399 100644 --- a/debian/dbus.init +++ b/debian/dbus.init @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh ### BEGIN INIT INFO # Provides: dbus # Required-Start: $remote_fs $syslog |