-
Committer:
Bazaar Package Importer
-
Author(s):
Andres Rodriguez
-
Date:
2010-03-27 15:53:32 UTC
-
mfrom:
(6.1.8 sid)
-
Revision ID:
james.westby@ubuntu.com-20100327155332-fmp9cpnys8skidbq
Tags: 1.4.26-1.1ubuntu1
* Merge from debian unstable (LP: #407722). Remaining changes:
- debian/control: libgamin-dev rather than libfam-dev to fix startup
warning.
- debian/init.d: clean environment; Check syntax during start/reload
restart/force-reload.
- 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.
- Add lighttpd-dev package:
+ debian/control: Added lighttpd-dev package; Build-depends on
automake, libtool
+ debian/lighttpd-dev.install: Added.
* debian/control: debhelper Build-depends bumped to (>= 7.0.50) for
overrides in rules file.
* debian/rules:
- Add override_dh_installinit to set "defaults 91 09" to not start
before apache2 but in the same runlevel with the same priority.
* debian/patches/build-dev-package.patch: Updated
* Also closes: (LP: #521659, LP: #523682)