[Pkg-utopia-commits] r1908 - in /packages/unstable/dbus/debian: changelog dbus.default dbus.init

[biebl at users.alioth.debian.org]

Author: biebl
Date: Tue Dec  4 20:33:38 2007
New Revision: 1908

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1908
Log:
* Deprecate the ENABLED option and remove it from /etc/default/dbus. Print a
  warning message in the init script if this option is still used.

Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/dbus.default
    packages/unstable/dbus/debian/dbus.init

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=1908&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Tue Dec  4 20:33:38 2007
@@ -1,5 +1,6 @@
 dbus (1.1.2-2) UNRELEASED; urgency=low
 
+  [ Loic Minier ]
   * Merge patch from Ubuntu to build a devhelp file; thanks Martin Pitt;
     closes: #454142.
     - Build-dep on xsltproc.
@@ -12,7 +13,11 @@
       around; add a symlink from the gtk-doc dir.
   * Misc smallish whitespace cleanups.
 
- -- Loic Minier <lool at dooz.org>  Mon, 03 Dec 2007 15:46:05 +0100
+  [ Michael Biebl ]
+  * Deprecate the ENABLED option and remove it from /etc/default/dbus. Print a
+    warning message in the init script if this option is still used.
+
+ -- Michael Biebl <biebl at debian.org>  Tue, 04 Dec 2007 21:31:12 +0100
 
 dbus (1.1.2-1) unstable; urgency=low
 

Modified: packages/unstable/dbus/debian/dbus.default
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.default?rev=1908&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.default (original)
+++ packages/unstable/dbus/debian/dbus.default Tue Dec  4 20:33:38 2007
@@ -5,6 +5,3 @@
 
 # Parameters to pass to dbus.
 PARAMS=""
-
-# Whether or not to run the dbus system daemon; set to 0 to disable.
-ENABLED=1

Modified: packages/unstable/dbus/debian/dbus.init
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/dbus.init?rev=1908&op=diff
==============================================================================
--- packages/unstable/dbus/debian/dbus.init (original)
+++ packages/unstable/dbus/debian/dbus.init Tue Dec  4 20:33:38 2007
@@ -31,13 +31,16 @@
 . /lib/lsb/init-functions
 
 # Source defaults file; edit that file to configure this script.
-ENABLED=1
 PARAMS=""
 if [ -e /etc/default/dbus ]; then
   . /etc/default/dbus
 fi
 
-test "$ENABLED" != "0" || exit 0
+if [ -n "$ENABLED" ]; then
+    log_warning_msg "The ENABLED option in /etc/default/$NAME has been deprecated."
+    log_warning_msg "Please remove this setting from the configuration file."
+    log_warning_msg "To disable the service use a runlevel editor like sysv-rc-conf or bum instead."
+fi
 
 create_machineid() {
   # Create machine-id file