Use dh_smf; fix scripts accordingly

7 files changed, 15 insertions, 36 deletions

diff --git a/debian/changelog b/debian/changelog
index 5f2ce1f2..67d030ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dbus (1.6.10-1+dyson2) UNRELEASED; urgency=low
+
+  * Use dh_smf; fix scripts accordingly
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 27 Jul 2013 22:21:51 +0400
+
 dbus (1.6.10-1+dyson1) unstable; urgency=low
 
   * Package for Dyson
diff --git a/debian/control b/debian/control
index 6b82e17b..47c7a22b 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Build-Depends: automake (>= 1:1.10),
                autotools-dev,
                debhelper (>= 9),
                dh-autoreconf,
+               dh-smf [illumos-any kopensolaris-any],
                doxygen,
                dpkg-dev (>= 1.16.1),
                libexpat-dev,
diff --git a/debian/dbus.postinst b/debian/dbus.postinst
index 8f845e7b..7d16d571 100644
--- a/debian/dbus.postinst
+++ b/debian/dbus.postinst
@@ -63,15 +63,4 @@ if [ "$1" = configure ] && [ -n "$2" ]; then
             / org.freedesktop.DBus.ReloadConfig > /dev/null || true
 fi
 
-if [ "$1" = configure ] && [ -z "$2" ]; then
-    # On new installs dbus SMF service may be offline
-    # if manifest-import is triggerred before configure
-    # (/etc/dbus-1/system.conf is not available)
-    if [ -x /usr/bin/svcstatus ]; then
-        if [ x`/usr/bin/svcstatus $SMF_FMRI` = xoffline ]; then
-            svcadm -v refresh $SMF_FMRI || true
-        fi
-    fi
-fi
-
 #DEBHELPER#
diff --git a/debian/dbus.prerm b/debian/dbus.prerm
deleted file mode 100644
index 90dc1a4d..00000000
--- a/debian/dbus.prerm
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-SMF_FMRI=svc:/system/dbus:default
-
-if [ -x "/usr/sbin/svcadm" ] && [ "$1" = remove ]; then
-    /usr/sbin/svcadm -v disable -s $SMF_FMRI || exit $?
-fi
-
-
-#DEBHELPER#
-
diff --git a/debian/dbus.xml b/debian/dbus.smf/manifest/system/dbus.xml
index fd05d91f..1057b3ee 100644
--- a/debian/dbus.xml
+++ b/debian/dbus.smf/manifest/system/dbus.xml
@@ -16,21 +16,22 @@
     <dependent name="dbus_multi-user" grouping="optional_all" restart_on="none">
       <service_fmri value="svc:/milestone/multi-user"/>
     </dependent>
-    <exec_method type="method" name="start" exec="/lib/svc/method/dbus.sh start" timeout_seconds="30"/>
+    <exec_method type="method" name="start" exec="/lib/svc/method/dbus start" timeout_seconds="30"/>
     <exec_method type="method" name="stop" exec=":kill" timeout_seconds="30"/>
-    <exec_method type="method" name="refresh" exec="/lib/svc/method/dbus.sh refresh" timeout_seconds="30"/>
+    <exec_method type="method" name="refresh" exec="/lib/svc/method/dbus refresh" timeout_seconds="30"/>
     <property_group name="startd" type="framework">
       <propval name="ignore_error" type="astring" value="core,signal"/>
     </property_group>
+    <property_group name="package" type="framework">
+      <propval name="upgrade" type="astring" value="none"/>
+    </property_group>
     <stability value="Unstable"/>
     <template>
       <common_name>
-        <loctext xml:lang="C">
-                        D-BUS system message bus
-                        </loctext>
+        <loctext xml:lang="C">D-BUS system message bus</loctext>
       </common_name>
       <documentation>
-        <manpage title="dbus-daemon" section="1" manpath="/usr/share/man"/>
+        <manpage title="dbus-daemon" section="1"/>
       </documentation>
     </template>
   </service>
diff --git a/debian/dbus.sh b/debian/dbus.smf/method/dbus
index f8eb14bc..dc0d5336 100644
--- a/debian/dbus.sh
+++ b/debian/dbus.smf/method/dbus
@@ -7,8 +7,6 @@ PIDDIR=/var/run/dbus
 UUIDGEN=/usr/bin/dbus-uuidgen
 DAEMONUSER=messagebus
 
-[ -r /etc/default/dbus ] && . /etc/default/dbus
-
 refresh () {
   dbus-send --print-reply --system --type=method_call \
             --dest=org.freedesktop.DBus \
@@ -31,7 +29,7 @@ start () {
         rm -f $PIDDIR/pid
     fi
 
-    $DAEMON --system $PARAMS
+    $DAEMON --system
 }
 
 
diff --git a/debian/rules b/debian/rules
index 64017f8b..fbd6b0e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -117,11 +117,6 @@ override_dh_install:
 	dh_install --remaining-packages --list-missing $(dh_install_options)
 	install -m 644 -D debian/dbus-Xsession debian/dbus-x11/etc/X11/Xsession.d/75dbus_dbus-launch
 ifeq (illumos,$(DEB_HOST_ARCH_OS))
-	dh_installdirs -pdbus \
-		/lib/svc/method \
-		/lib/svc/manifest/system
-	dh_install -pdbus debian/dbus.xml /lib/svc/manifest/system/
-	dh_install -pdbus debian/dbus.sh /lib/svc/method
 	rm -r debian/dbus/lib/systemd
 endif