-
Committer:
Bazaar Package Importer
-
Author(s):
Lorenzo De Liso
-
Date:
2010-10-15 21:01:50 UTC
-
mfrom:
(6.1.11 sid)
-
Revision ID:
james.westby@ubuntu.com-20101015210150-edjmolu35qt56evm
Tags: 1.4.28-1ubuntu1
* Merge from debian unstable, remaining changes:
- debian/control:
+ libgamin-dev rather than libfam-dev to fix startup warning.
+ debhelper Build-depends bumped to (>= 7.0.50) for
overrides in rules file.
- 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/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
- debian/lighttpd.conf: Comment 'use-ipv6.pl' by default, which causes
failure to bind port in ipv4 (LP: #551211)
* debian/patches/build-dev-package.patch: updated
* Dropped changes:
- debian/lighttpd.init: clean environment; Check syntax during start/reload:
this change has been applied in the debian package
- syntax_check function defined in init script. (LP: #600767): this change
has been applied in the debian package
- debian/patches/build-dev-package.patch: Updated: patch updated newly