diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2013-12-22 14:04:22 +0400 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2013-12-22 14:04:22 +0400 |
commit | 43119ab759b4a22cca255f31bcdd9db265d687d8 (patch) | |
tree | df49248b00d990e9474c1950edeeef0ac695cff0 | |
parent | b966ec346bebe34e1f50fb9cc46b9adf111ea73d (diff) | |
download | lighttpd-43119ab759b4a22cca255f31bcdd9db265d687d8.tar.gz |
lighttpd (1.4.33-2+dyson1) unstable; urgency=lowHEADdyson/1.4.33-2+dyson1master
[ Arno T�ll ]
* Make the init script wait until lighttpd really terminates.
[ Igor Pashev ]
* Package for Dyson
* Renamed SMF service to application/web/lighttpd
-rw-r--r-- | debian/changelog | 9 | ||||
-rw-r--r-- | debian/lighttpd.preinst | 7 | ||||
-rw-r--r-- | debian/lighttpd.smf/manifest/application/web/lighttpd.xml (renamed from debian/lighttpd.smf/manifest/network/lighttpd.xml) | 2 |
3 files changed, 15 insertions, 3 deletions
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/network/lighttpd.xml b/debian/lighttpd.smf/manifest/application/web/lighttpd.xml index 1cdc4db..862c4a3 100644 --- a/debian/lighttpd.smf/manifest/network/lighttpd.xml +++ b/debian/lighttpd.smf/manifest/application/web/lighttpd.xml @@ -1,7 +1,7 @@ <?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"> + <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"/> |