-
Committer:
Bazaar Package Importer
-
Author(s):
Andres Rodriguez
-
Date:
2009-06-06 15:53:28 UTC
-
mfrom:
(6.1.2 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090606155328-6pr6j08kk4rdf8rz
Tags: 1.4.22-1ubuntu1
* Merge from debian unstable (LP: #384367), remaining changes:
- debian/control: Depend on lsb (>= 3.2-14), which has the status_of_proc()
function; libgamin-dev rather than libfam-dev to fix startup warning.
- debian/init.d: Add the 'status' action, clean environment; Check syntax
during start/reload/restart/force-reload.
- debian/rules: set DEB_UPDATE_RCD_PARAMS to "defaults 91 09" to not start
lighty before apache2 but in the same runlevel with the same priority;
Make sure that upgrades succeed, even if we can't restart lighttpd.
- debian/index.html: s/Debian/Ubuntu/g branding on the default page.
- Added a UFW profile set:
+ debian/lighttpd.dirs: added etc/ufw/applications.d
+ debian/rules: install the ufw profile.
+ debian/control: Suggests on ufw.
* debian/patches/fix-conf-doc.patch: Update headers to match package version