From 43119ab759b4a22cca255f31bcdd9db265d687d8 Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Sun, 22 Dec 2013 14:04:22 +0400
Subject: lighttpd (1.4.33-2+dyson1) unstable; urgency=low
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  [ Arno T�ll ]
  * Make the init script wait until lighttpd really terminates.

  [ Igor Pashev ]
  * Package for Dyson
  * Renamed SMF service to application/web/lighttpd
---
 debian/changelog                                   |  9 ++++--
 debian/lighttpd.preinst                            |  7 +++++
 .../manifest/application/web/lighttpd.xml          | 34 ++++++++++++++++++++++
 debian/lighttpd.smf/manifest/network/lighttpd.xml  | 34 ----------------------
 4 files changed, 48 insertions(+), 36 deletions(-)
 create mode 100644 debian/lighttpd.smf/manifest/application/web/lighttpd.xml
 delete mode 100644 debian/lighttpd.smf/manifest/network/lighttpd.xml

diff --git a/debian/changelog b/debian/changelog
index 171917e..bb366be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-lighttpd (1.4.33-2) UNRELEASED; urgency=low
+lighttpd (1.4.33-2+dyson1) unstable; urgency=low
 
+  [ Arno Töll ]
   * Make the init script wait until lighttpd really terminates.
 
- -- Arno Töll <arno@debian.org>  Wed, 30 Oct 2013 12:15:29 +0100
+  [ Igor Pashev ]
+  * Package for Dyson
+  * Renamed SMF service to application/web/lighttpd
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 22 Dec 2013 13:37:38 +0400
 
 lighttpd (1.4.32-1+dyson2) unstable; urgency=low
 
diff --git a/debian/lighttpd.preinst b/debian/lighttpd.preinst
index 8d0580f..23cac28 100644
--- a/debian/lighttpd.preinst
+++ b/debian/lighttpd.preinst
@@ -29,6 +29,13 @@ case "$1" in
 		fi
 
 	fi
+
+	if dpkg --compare-versions "$2" le 1.4.32-1+dyson2; then
+		# Renaming SMF service:
+		if [ -x /usr/bin/smf_present ] && /usr/bin/smf_present ; then
+			svcadm -v disable -s svc:/network/lighttpd || true
+		fi
+	fi
 	;;
 
 	abort-upgrade)
diff --git a/debian/lighttpd.smf/manifest/application/web/lighttpd.xml b/debian/lighttpd.smf/manifest/application/web/lighttpd.xml
new file mode 100644
index 0000000..862c4a3
--- /dev/null
+++ b/debian/lighttpd.smf/manifest/application/web/lighttpd.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!DOCTYPE service_bundle SYSTEM "/usr/share/xml/schema/smf/service_bundle.dtd.1">
+<service_bundle type="manifest" name="lighttpd">
+  <service name="application/web/lighttpd" type="service" version="1">
+    <create_default_instance enabled="true"/>
+    <dependency name="loopback" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/network/loopback:default"/>
+    </dependency>
+    <dependency name="lighttpd_conf" grouping="require_all" restart_on="restart" type="path">
+        <service_fmri value="file://localhost/etc/lighttpd/lighttpd.conf"/>
+    </dependency>
+    <dependency name="physical" grouping="optional_all" restart_on="error" type="service">
+      <service_fmri value="svc:/network/physical:default"/>
+    </dependency>
+    <dependency name="multiuser-server" grouping="require_all" restart_on="error" type="service">
+      <service_fmri value="svc:/milestone/multi-user-server:default"/>
+    </dependency>
+    <exec_method type="method" name="start" exec="/lib/svc/method/lighttpd start" timeout_seconds="60"/>
+    <exec_method type="method" name="stop" exec=":kill -INT" timeout_seconds="60"/>
+    <exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60"/>
+    <property_group name="startd" type="framework">
+      <propval name="ignore_error" type="astring" value="core,signal"/>
+    </property_group>
+    <template>
+      <common_name>
+        <loctext xml:lang="C">Lighttpd HTTP server</loctext>
+      </common_name>
+      <documentation>
+        <manpage title="lighttpd" section="8"/>
+        <manpage title="lighty-enable-mod" section="1"/>
+      </documentation>
+    </template>
+  </service>
+</service_bundle>
diff --git a/debian/lighttpd.smf/manifest/network/lighttpd.xml b/debian/lighttpd.smf/manifest/network/lighttpd.xml
deleted file mode 100644
index 1cdc4db..0000000
--- a/debian/lighttpd.smf/manifest/network/lighttpd.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE service_bundle SYSTEM "/usr/share/xml/schema/smf/service_bundle.dtd.1">
-<service_bundle type="manifest" name="lighttpd">
-  <service name="network/lighttpd" type="service" version="1">
-    <create_default_instance enabled="true"/>
-    <dependency name="loopback" grouping="require_all" restart_on="error" type="service">
-      <service_fmri value="svc:/network/loopback:default"/>
-    </dependency>
-    <dependency name="lighttpd_conf" grouping="require_all" restart_on="restart" type="path">
-        <service_fmri value="file://localhost/etc/lighttpd/lighttpd.conf"/>
-    </dependency>
-    <dependency name="physical" grouping="optional_all" restart_on="error" type="service">
-      <service_fmri value="svc:/network/physical:default"/>
-    </dependency>
-    <dependency name="multiuser-server" grouping="require_all" restart_on="error" type="service">
-      <service_fmri value="svc:/milestone/multi-user-server:default"/>
-    </dependency>
-    <exec_method type="method" name="start" exec="/lib/svc/method/lighttpd start" timeout_seconds="60"/>
-    <exec_method type="method" name="stop" exec=":kill -INT" timeout_seconds="60"/>
-    <exec_method type="method" name="refresh" exec=":kill -HUP" timeout_seconds="60"/>
-    <property_group name="startd" type="framework">
-      <propval name="ignore_error" type="astring" value="core,signal"/>
-    </property_group>
-    <template>
-      <common_name>
-        <loctext xml:lang="C">Lighttpd HTTP server</loctext>
-      </common_name>
-      <documentation>
-        <manpage title="lighttpd" section="8"/>
-        <manpage title="lighty-enable-mod" section="1"/>
-      </documentation>
-    </template>
-  </service>
-</service_bundle>
-- 
cgit v1.2.3